Xin Li
b7cf79b50d
[automerger skipped] Merge Android U (ab/10368041) am: d1c9942792
-s ours
...
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703
Change-Id: I261bdf7ef23cfabc3ed6a0fe67b2044509d108cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:25 +00:00
Florian Mayer
9c8f7cff7b
Add aosp_felix_hwasan am: c2556c4c61
am: 50889ad4db
...
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295
Change-Id: Idac8aa35d09e6eeaa92a9125ee39ce2421ca1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:42:54 +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
Treehugger Robot
4935f7c831
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184
Change-Id: I57a146163061e0fc6f596972f809485a1e1dd543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:11:11 +00:00
Treehugger Robot
4de7df1c5e
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev
2023-08-21 21:20:40 +00:00
Lokesh Kumar Goel
c2ee41a877
Update felix SVN to 25 am: f538f8e771
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880
Change-Id: I73ce1d8dd4bc99d5dbb1022b941a4b09e492a197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:56:27 +00:00
Lokesh Kumar Goel
e5cfad4616
Update felix SVN to 24 am: 0368e3e821
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24426027
Change-Id: I4441d987204814cc9cb093693dc54cfdc9c12014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:20:13 +00:00
Lokesh Kumar Goel
f538f8e771
Update felix SVN to 25
...
Bug: 295937899
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-16 05:39:45 +00:00
Lokesh Kumar Goel
0368e3e821
Update felix SVN to 24
...
Bug: 295937899
Change-Id: I64164674d19b1e7d49094fed2175ec7c63f9ad82
2023-08-15 00:11:52 +00: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
Bassem Khalife
3dd8086a92
Update felix SVN to 23 am: 4ecf2187a2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24394073
Change-Id: I4663a5f7a4f5503ed6a9a2c4bf8bf5c2b5e582e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 04:57:56 +00:00
Bassem Khalife
4ecf2187a2
Update felix SVN to 23
...
Bug: 289414927
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-10 19:58:11 +00:00
Bassem Khalife
e07c0cc9f4
Update felix SVN to 22 am: 64da307f5f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24374051
Change-Id: I5aa534202eba0ac46817cb6154b5101d85fd6cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 06:09:42 +00:00
Bassem Khalife
64da307f5f
Update felix SVN to 22
...
Bug: 289414927
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-09 18:11:30 +00:00
Treehugger Robot
abc08b5f71
Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev am: ccf9987230
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24338862
Change-Id: I1ff146bba46330b77a958677c9943c51d4a02766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-06 23:34:39 +00:00
Treehugger Robot
ccf9987230
Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev
2023-08-06 22:50:33 +00:00
Neha Jain
5ee36bd203
Revert "Revert "Update felix SVN to 21""
...
This reverts commit b6fc908043
.
Reason for revert: Need the SVN for F10 KDDI build
Bug: 289414927
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
2023-08-06 22:07:17 +00:00
Treehugger Robot
a7c821840c
Merge "Revert "Update felix SVN to 21"" into udc-dev am: 9e3aa97625
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24288899
Change-Id: I9d41f856c0559055866bf4b3a3e7fafd228e6a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 03:13:55 +00:00
Treehugger Robot
9e3aa97625
Merge "Revert "Update felix SVN to 21"" into udc-dev
2023-08-02 02:22:31 +00:00
Neha Jain
b6fc908043
Revert "Update felix SVN to 21"
...
This reverts commit 29203a354d
.
Reason for revert: b/289414927
Bug: 289414927
Change-Id: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8
2023-08-02 02:22:17 +00:00
Shawn Lin
28ea5128bf
Fix layout issue of pattern set up page in F10 am: 84485a4bde
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24257623
Change-Id: Iedb1bc1581a521deee3b09524fa45b9915d71af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 19:11:58 +00:00
Shawn Lin
84485a4bde
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
Change-Id: I0bd45ad6f793afdec96ffd4a538539d040ad4993
(cherry picked from commit f3e62f0321
)
2023-07-31 04:22:11 +00:00
Edwin Tung
c9015ef36b
gps: Disable Vzw SUPL OTDOA
...
Bug: 293213801
Test: OTDOA disabled
Change-Id: I402e5c6e0cb54eb0596cf846483b63d356992b65
2023-07-27 13:45:18 +08:00
Bassem Khalife
45700268d1
Update felix SVN to 21 am: 29203a354d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24185697
Change-Id: I3f8e85be6c67f86e4a75b35c7f09c1002e8017c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 16:21:17 +00:00
Bassem Khalife
29203a354d
Update felix SVN to 21
...
Bug: 289414927
Change-Id: Ib78cdb211e25b1ae28d120a974514de4c6db8d43
2023-07-25 04:05:02 +00:00
Treehugger Robot
2a7e2c018c
Merge "thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN" into udc-dev am: bb1fe7d3fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24151204
Change-Id: If9acd6bba7e22823047a43d7e3156fce89be66ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 03:48:56 +00:00
Treehugger Robot
bb1fe7d3fe
Merge "thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN" into udc-dev
2023-07-25 03:12:18 +00:00
Victor Liu
2fab744b44
uwb calibration: fix distance range bias am: ebd32fad38
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23901307
Change-Id: I56d54828062b067082bdbb31da2877ccdd690c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 01:34:52 +00:00
TeYuan Wang
be8156e83f
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
Change-Id: I1327be31f164a9e4263fb9c5381adc09378b19c5
Merged-In: I1327be31f164a9e4263fb9c5381adc09378b19c5
(cherry picked from commit 3a0c866fa5
)
2023-07-23 16:57:29 +00:00
Victor Liu
ebd32fad38
uwb calibration: fix distance range bias
...
Bug: 289884022
Signed-of-by: Victor Liu <victorliu@google.com>
Change-Id: Ieda9b4b866026632fdcf798ca7a871319cb47647
2023-07-21 11:03:40 -07:00
Nick Lee
34230a5c9c
Merge "thermal: Update VSKIN equation V06.2" into udc-dev am: 5d53d59375
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24116711
Change-Id: I0e1b01020d9bb8304dd1490392dd35fa919d0186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 05:28:48 +00:00
TeYuan Wang
4080f37ea5
thermal: modify emergency and shutdown threshold am: b486f5a3ee
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24116684
Change-Id: Ie7c31e79c5797a8c5d91901f717b1a7faf22aec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 05:28:31 +00:00
Nick Lee
5d53d59375
Merge "thermal: Update VSKIN equation V06.2" into udc-dev
2023-07-19 04:00:06 +00:00
TeYuan Wang
b486f5a3ee
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
Change-Id: I619fd5a5ee4e668430b4002c58123525e9b14812
2023-07-18 15:59:57 +00:00
TeYuan Wang
6a3ea3d37c
thermal: Update VSKIN equation V06.2
...
Bug: 289752109
Test: adb shell dumpsys android.hardware.thermal.IThermal/default
Change-Id: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5
(cherry picked from commit 68182cb0cbe267f6162b33b37f09ee80e314010e)
2023-07-18 15:59:16 +00:00
Zoey Hsieh
426b7a76e4
Update felix SVN to 20 am: 06f834e2a8
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24018523
Change-Id: Iaaf54d6eef1347cfafe8266dabb498e5f534607d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 07:07:26 +00:00
Zoey Hsieh
06f834e2a8
Update felix SVN to 20
...
Bug: 289414927
Change-Id: I82a61ec7c74690f30af32ff2e48f69fb91d0062c
2023-07-11 03:54:01 +00:00
Cyan_Hsieh
68d2fbf7ea
Update Felix SVN to 19 am: 47a0e2a142
am: 11c5bd61ef
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23722150
Change-Id: Ia3a2f4de2e03aa83db838029ce62332e4dcabc06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 07:11:29 +00:00
Cyan_Hsieh
40c19d7dad
Update Felix SVN to 19 am: 47a0e2a142
am: eacf159996
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23722150
Change-Id: I102ff7d326e421d2513d79a28c8b8e27955ed085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 07:06:54 +00:00
Cyan_Hsieh
11c5bd61ef
Update Felix SVN to 19 am: 47a0e2a142
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23722150
Change-Id: I44dc0fce4b1d3bb88ea6c9deba2a426b18dd1f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 06:26:10 +00:00
Cyan_Hsieh
eacf159996
Update Felix SVN to 19 am: 47a0e2a142
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23722150
Change-Id: Ifccf735759364567205dd9cda0d50a59f6e9fdc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 06:25:28 +00:00
Treehugger Robot
aa91fcfe68
Merge "hall_sensor: Disable hall sensor input when bootmode is unknown" into udc-dev am: c6ddc93821
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23844651
Change-Id: I2bd1f56a0c45841157a6a68484f3a27e06141ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 14:54:14 +00:00
Treehugger Robot
c6ddc93821
Merge "hall_sensor: Disable hall sensor input when bootmode is unknown" into udc-dev
2023-07-08 14:22:58 +00:00
Lokesh Kumar Goel
f935c98ab7
Update felix SVN to 19 am: f3a64b8eb7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23857560
Change-Id: Iee6c28241df4db3ac09003030af81e77b42fad59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 02:24:03 +00:00
Lokesh Kumar Goel
f3a64b8eb7
Update felix SVN to 19
...
Bug: 289414927
Change-Id: I9419048ef2456f8edc5ddf7adcde1f532857a1e1
2023-06-29 20:57:20 +00:00
Rick Chen
508fa1bcb4
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.
Change-Id: Id9f93b4687898cf23601516cf69d0338df14e2aa
Signed-off-by: Rick Chen <rickctchen@google.com>
2023-06-29 15:10:50 +08: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