Commit graph

1691 commits

Author SHA1 Message Date
Xin Li
12032b942f Merge UP1A.230905.019
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I6a61ab7455e00e60b4944f19a6d84bf859c642a9
2023-08-31 12:12:38 -07:00
Xin Li
66e687a2a4 Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:12:23 +00:00
Florian Mayer
50889ad4db Add aosp_felix_hwasan am: c2556c4c61
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I29e672a12cd2cec8bcb880c19f99dbd03fe2aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:11:26 +00:00
Florian Mayer
c2556c4c61 Add aosp_felix_hwasan
Bug: 297918380
Change-Id: I934dc696c9066bdc337a4279296b91744d0b0382
2023-08-28 13:11:01 -07:00
Xin Li
d1c9942792 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Ia11da7d008b96baf8aa7b2aa057ae87164b36052
Change-Id: I2299d73a593a5ee839ee41e0f74c45853c982748
2023-08-14 15:33:18 -07:00
Android Build Coastguard Worker
4524578ecb [coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L31700000962567991 into udc-release.
COASTGUARD_SKIP: I3f4936d26b869ca400be05386fc009d95cf003c2
COASTGUARD_SKIP: I4890e0ed2191993887aa550053a827c2aca3aafe
COASTGUARD_SKIP: I55c06c262882796cad667783991b383f5f59ae43

Change-Id: I4ac3fea43215f49134e224a787b61d40bfc44cbd
2023-08-14 22:22:06 +00:00
Android Build Coastguard Worker
3de616da53 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051', 'googleplex-android-review.googlesource.com/24394073'] into sparse-10656238-L31700000962567991.
SPARSE_CHANGE: I4890e0ed2191993887aa550053a827c2aca3aafe
SPARSE_CHANGE: I3f4936d26b869ca400be05386fc009d95cf003c2

Change-Id: I55c06c262882796cad667783991b383f5f59ae43
2023-08-14 22:16:17 +00:00
Bassem Khalife
8a804d7012 Update felix SVN to 23
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ecf2187a2dc4a314562289ed2528d787eb28e74)
Merged-In: I3f4936d26b869ca400be05386fc009d95cf003c2
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-14 22:12:46 +00:00
Bassem Khalife
da7b440231 Update felix SVN to 22
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d)
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-14 22:12:24 +00:00
Android Build Coastguard Worker
a9fba5449d [coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L18400000962566963 into udc-release.
COASTGUARD_SKIP: I4890e0ed2191993887aa550053a827c2aca3aafe
COASTGUARD_SKIP: I4c0e07a3ca782c1d86741b1b94205f6d2112e246

Change-Id: Ic9f3ccb1c716b9dc4f3af954e2a36c99177f00a4
2023-08-14 21:31:37 +00:00
Android Build Coastguard Worker
b956719bb2 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24374051'] into sparse-10656238-L18400000962566963.
SPARSE_CHANGE: I4890e0ed2191993887aa550053a827c2aca3aafe

Change-Id: I4c0e07a3ca782c1d86741b1b94205f6d2112e246
2023-08-14 21:23:41 +00:00
Bassem Khalife
3eca26b6a7 Update felix SVN to 22
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d)
Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-14 21:21:51 +00:00
Android Build Coastguard Worker
e795b84ba7 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24185697'] into udc-release.
Change-Id: I03e003cea0dd8878ffcb75861f9ff705f185e154
2023-08-14 19:53:03 +00:00
Bassem Khalife
5c1deed09f Update felix SVN to 21
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29203a354d62370c5bd4e6e92592a00eead176e6)
Merged-In: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
Change-Id: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
2023-08-14 19:51:24 +00:00
Android Build Coastguard Worker
ae5ae75b14 [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L16700000962543246 into udc-release.
COASTGUARD_SKIP: I09e8877ac2325a0056c931ce01602fffb7e68c35
COASTGUARD_SKIP: I1cf8decc7bbd6b7f2316dbae4f165f09dde1d37f

Change-Id: I97d7c785fa95d373cd2caa7f32fb220f2cffda6d
2023-08-12 00:33:32 +00:00
Android Build Coastguard Worker
cd08a16c9f Merge cherrypicks of ['googleplex-android-review.googlesource.com/24338862'] into sparse-10644925-L16700000962543246.
SPARSE_CHANGE: I09e8877ac2325a0056c931ce01602fffb7e68c35

Change-Id: I1cf8decc7bbd6b7f2316dbae4f165f09dde1d37f
2023-08-12 00:27:09 +00:00
Neha Jain
1bcf28495a Revert "Revert "Update felix SVN to 21""
This reverts commit b6fc908043.

Reason for revert: Need the SVN for F10 KDDI build

Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ee36bd203f098b21b90e43ae9967a93f493ddb9)
Merged-In: I09e8877ac2325a0056c931ce01602fffb7e68c35
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
2023-08-12 00:26:01 +00:00
Android Build Coastguard Worker
0df82ab980 [coastguard skipped] Merge sparse cherrypicks from sparse-10616066-L90100000962413158 into udc-release.
COASTGUARD_SKIP: I09e8877ac2325a0056c931ce01602fffb7e68c35
COASTGUARD_SKIP: Id94cf42880f2d65d98fb9c06b3eb6ac1a0921ceb

Change-Id: I1c42c57a382e2d2596f1c18b1bdad3c6a357de14
2023-08-06 22:59:16 +00:00
Android Build Coastguard Worker
c83580a8c5 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24338862'] into sparse-10616066-L90100000962413158.
SPARSE_CHANGE: I09e8877ac2325a0056c931ce01602fffb7e68c35

Change-Id: Id94cf42880f2d65d98fb9c06b3eb6ac1a0921ceb
2023-08-06 22:54:56 +00:00
Neha Jain
b96cf63bba Revert "Revert "Update felix SVN to 21""
This reverts commit b6fc908043.

Reason for revert: Need the SVN for F10 KDDI build

Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ee36bd203f098b21b90e43ae9967a93f493ddb9)
Merged-In: I09e8877ac2325a0056c931ce01602fffb7e68c35
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
2023-08-06 22:54:49 +00:00
Android Build Coastguard Worker
a66144697e Merge cherrypicks of ['googleplex-android-review.googlesource.com/24288899'] into udc-release.
Change-Id: Ia9b1d78899766f1dbc22c64a91873f6e68b6cf74
2023-08-03 01:47:42 +00:00
Neha Jain
9407daa064 Revert "Update felix SVN to 21"
This reverts commit 29203a354d.

Reason for revert: b/289414927
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6fc908043b39da2ab21fe95ff9b4899dc323449)
Merged-In: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8
Change-Id: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8
2023-08-03 01:46:30 +00:00
Android Build Coastguard Worker
bf8b107751 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24257623'] into udc-release.
Change-Id: I9ccf275ed07251d797187748e88acfae8fa3c321
2023-08-01 01:09:53 +00:00
Shawn Lin
227e1a2bf7 Fix layout issue of pattern set up page in F10
Set the pattern view size to 290dp for F10

Bug: 285290323
Bug: 290721507
Test: manual
Test: Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
      SetupChooseLockPatternTest
(cherry picked from commit f3e62f0321)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:84485a4bded56ebfa94fd95120820cec40048854)
Merged-In: I0bd45ad6f793afdec96ffd4a538539d040ad4993
Change-Id: I0bd45ad6f793afdec96ffd4a538539d040ad4993
2023-08-01 01:09:20 +00:00
Android Build Coastguard Worker
c0d906538e Merge cherrypicks of ['googleplex-android-review.googlesource.com/24185697'] into udc-release.
Change-Id: I4c3d2ba905b9e8944b4821c444a29d2c86f2c440
2023-07-29 06:36:30 +00:00
Bassem Khalife
35d0c6ce8f Update felix SVN to 21
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29203a354d62370c5bd4e6e92592a00eead176e6)
Merged-In: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
Change-Id: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
2023-07-29 06:35:19 +00:00
Android Build Coastguard Worker
93f7fee8fa Merge cherrypicks of ['googleplex-android-review.googlesource.com/24151204'] into udc-release.
Change-Id: Ic8a9fa621803605d974ee1fee976d1f659f4728d
2023-07-26 00:57:22 +00:00
TeYuan Wang
8b62cc5ed8 thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN
Bug: 289752109
Test: adb shell dumpsys android.hardware.thermal.IThermal/default | grep VIRTUAL-SKIN | grep hotThrottlingThreshold
(cherry picked from commit 3a0c866fa5)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be8156e83f9c002df8fe8f17dbd62fb6533737f7)
Merged-In: I1327be31f164a9e4263fb9c5381adc09378b19c5
Change-Id: I1327be31f164a9e4263fb9c5381adc09378b19c5
2023-07-26 00:56:31 +00:00
Android Build Coastguard Worker
a342a06a65 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23901307'] into udc-release.
Change-Id: Ibb03880b9fddb1776f0f9dedb257a8c7ea6f89f2
2023-07-25 02:10:40 +00:00
Victor Liu
e98accf2e3 uwb calibration: fix distance range bias
Bug: 289884022
Signed-of-by: Victor Liu <victorliu@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ebd32fad386de9ae8b9a581109210a9e54cf6b4a)
Merged-In: Ieda9b4b866026632fdcf798ca7a871319cb47647
Change-Id: Ieda9b4b866026632fdcf798ca7a871319cb47647
2023-07-25 02:08:47 +00:00
Android Build Coastguard Worker
659d62f018 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24116684', 'googleplex-android-review.googlesource.com/24116711'] into udc-release.
Change-Id: I3ade7f4303edfca833138fddffdb627d3b9f31ae
2023-07-19 03:06:23 +00:00
TeYuan Wang
6c2cd58841 thermal: Update VSKIN equation V06.2
Bug: 289752109
Test: adb shell dumpsys android.hardware.thermal.IThermal/default
(cherry picked from commit 68182cb0cbe267f6162b33b37f09ee80e314010e)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6a3ea3d37c70c8d3b47310c70c1c1d5dbc64e1f8)
Merged-In: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5
Change-Id: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5
2023-07-19 03:05:39 +00:00
TeYuan Wang
fbe1205310 thermal: modify emergency and shutdown threshold
Bug: 289752109
Test: adb shell cat /dev/thermal/tz-by-name/skin_therm/trip_point_*_temp
Test: adb shell dumpsys android.hardware.thermal.IThermal/default
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b486f5a3ee3fc3c7ac98e8a51377dce7cbb22a6b)
Merged-In: I619fd5a5ee4e668430b4002c58123525e9b14812
Change-Id: I619fd5a5ee4e668430b4002c58123525e9b14812
2023-07-19 03:05:33 +00:00
Android Build Coastguard Worker
0f041b0dbf Merge cherrypicks of ['googleplex-android-review.googlesource.com/24018523'] into udc-release.
Change-Id: Ic49630da1bf687d2465d673c99c9aa05a82ea785
2023-07-12 02:05:49 +00:00
Zoey Hsieh
a38c59118f Update felix SVN to 20
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:06f834e2a8850e2463cf468e9b9c3a137d81ad0c)
Merged-In: I82a61ec7c74690f30af32ff2e48f69fb91d0062c
Change-Id: I82a61ec7c74690f30af32ff2e48f69fb91d0062c
2023-07-12 01:59:17 +00:00
Android Build Coastguard Worker
7abd0ca3f8 Merge cherrypicks of ['googleplex-android-review.googlesource.com/23844651'] into udc-release.
Change-Id: I099a245a3a3ed852ff1c2fffa19a74536d5d4a04
2023-07-09 10:04:06 +00:00
Rick Chen
cda49c53f5 hall_sensor: Disable hall sensor input when bootmode is unknown
Bug: 284431215
Test: 1. No hall sensor in getevent.
      2. Inner/outer screen can be switched in offmode charging,
      recovery, fastboot mode.
Signed-off-by: Rick Chen <rickctchen@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:508fa1bcb45f6f5b75fc9e5475f2e8658588809e)
Merged-In: Id9f93b4687898cf23601516cf69d0338df14e2aa
Change-Id: Id9f93b4687898cf23601516cf69d0338df14e2aa
2023-07-09 10:02:55 +00:00
Android Build Coastguard Worker
449a085ddb Merge cherrypicks of ['googleplex-android-review.googlesource.com/23857560'] into udc-release.
Change-Id: Id79654e640898344bd761847a9751098efd49cad
2023-06-30 03:19:49 +00:00
Lokesh Kumar Goel
c6c9da6c90 Update felix SVN to 19
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3a64b8eb7fbcdaeda0c6b49f782051fae885115)
Merged-In: I9419048ef2456f8edc5ddf7adcde1f532857a1e1
Change-Id: I9419048ef2456f8edc5ddf7adcde1f532857a1e1
2023-06-30 03:14:13 +00:00
Android Build Coastguard Worker
9bce7fa027 Snap for 10344143 from d084976efc to udc-release
Change-Id: Ibd3998cf785df62b86e61ab8ffa697ec8d274e87
2023-06-18 21:02:06 +00:00
Cyan_Hsieh
b689a2a0ae Update Felix SVN to 18 am: b3193d2db4 am: 61a53b3477
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23722149

Change-Id: Ia11da7d008b96baf8aa7b2aa057ae87164b36052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:45:13 +00:00
Cyan_Hsieh
3a395606b6 Update Felix SVN to 17 am: 9396d4ee78 am: 71880bc07f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657640

Change-Id: I1b0cef8aac055d60f3c7ef0e777d1317f4ea1882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:45:11 +00:00
Cyan_Hsieh
12f1572c4b Update Felix SVN to 16 am: 2da83e6b0e am: 2b796826bd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657639

Change-Id: Idff28c0c5dd138dda9dcdc7f2ed211f5da7b619b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:45:10 +00:00
Cyan_Hsieh
05253d4bbb Update Felix SVN to 15 am: ff9588d01a am: 1ad1ac94dd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657638

Change-Id: I9fe3ae4f2a94582ffb0b1c05527fbb1a8c52660d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:45:08 +00:00
Cyan_Hsieh
0e4432ae16 Update Felix SVN to 14 am: 2e4c1aff3e am: 3e3525b128
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657637

Change-Id: I4d9deb890cd4ecd7c1442c8a622c8cf27c269a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:45:07 +00:00
Cyan_Hsieh
32bae3e886 Update Felix SVN to 18 am: b3193d2db4 am: d084976efc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23722149

Change-Id: I9526cfaebfb59559dcc7ffa896f4571505b9b518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:41:08 +00:00
Cyan_Hsieh
94d31e9c5e Update Felix SVN to 17 am: 9396d4ee78 am: 0ad0a38cc1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657640

Change-Id: Ib546b7090f8452246f3766dd05fdc897d1cc72b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:41:06 +00:00
Cyan_Hsieh
591f6b4c2a Update Felix SVN to 16 am: 2da83e6b0e am: b162a6b183
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657639

Change-Id: I299464db1d0ee0ad76167abc107cd27c887d3fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:41:03 +00:00
Cyan_Hsieh
c03651ddb8 Update Felix SVN to 15 am: ff9588d01a am: a56a5289a3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657638

Change-Id: Ie10295ce8ea31ab93dd80da4e0a52ec710d1669d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:41:00 +00:00
Cyan_Hsieh
cab29ef9bc Update Felix SVN to 14 am: 2e4c1aff3e am: 60ab1b1275
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23657637

Change-Id: I20f233b1b521c84be4111a0fdebb74e0b8e3c78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-18 07:40:57 +00:00