Xin Li
b4a0b0a94b
[automerger skipped] Merge Android 13 QPR3 am: 4abcb959ad
-s ours am: 7c320a42bc
-s ours
...
am skip reason: Merged-In I3b2c20a25ee0e8f261a77ba5a32b85b8bedfa6d9 with SHA-1 4ad89f99bc
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2635350
Change-Id: Iabb5f8e94563b997d4676b9b83bcffc4508e0c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 23:10:42 +00:00
Xin Li
7c320a42bc
[automerger skipped] Merge Android 13 QPR3 am: 4abcb959ad
-s ours
...
am skip reason: Merged-In I3b2c20a25ee0e8f261a77ba5a32b85b8bedfa6d9 with SHA-1 4ad89f99bc
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2635350
Change-Id: I6f037cd167cb9b6c1c712578febae5284963a434
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:57:58 +00:00
Xin Li
4abcb959ad
Merge Android 13 QPR3
...
Bug: 275386652
Merged-In: I3b2c20a25ee0e8f261a77ba5a32b85b8bedfa6d9
Change-Id: I1e4d06f43e84f3885385c9a8d75af987aade67bf
2023-06-21 15:14:53 -07:00
Renato Grottesi
c8792e3001
Revert "Revert "Update ArmNN"" am: d667bc7a99
am: 4ad89f99bc
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2581590
Change-Id: Ib6c02f6508c41f37347cb0e1ab5c60d728f6a3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 07:19:18 +00:00
Renato Grottesi
4ad89f99bc
Revert "Revert "Update ArmNN"" am: d667bc7a99
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2581590
Change-Id: I3b2c20a25ee0e8f261a77ba5a32b85b8bedfa6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 06:39:42 +00:00
Renato Grottesi
d667bc7a99
Revert "Revert "Update ArmNN""
...
This reverts commit 2186eb4115
.
Rename the ArmNN variables
Bug: 278832962
Test: Local CtsNNAPI CTS
Change-Id: Iebe5809c772f6df86a0b8f37a54d07ae8629b856
2023-05-08 12:52:35 +00:00
Renato Grottesi
5e58d830ce
Revert "Update ArmNN" am: 2186eb4115
am: 38a878104d
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2580033
Change-Id: I5c6cccbf6116e4c1b31ca7fe2ffd1292c4f7bbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 10:13:57 +00:00
Renato Grottesi
38a878104d
Revert "Update ArmNN" am: 2186eb4115
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2580033
Change-Id: I7664405f4c4ceb0a7bef4762aea7f26a7025f2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 09:35:06 +00:00
Renato Grottesi
e91d249097
Update ArmNN am: a22a996fd8
am: b48980404c
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2578490
Change-Id: I9f218646d377dbbf53e7bf2812a5ca4b0189111a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:05:34 +00:00
Renato Grottesi
2186eb4115
Revert "Update ArmNN"
...
Revert submission 2563157-armn_nn_update_278832962
Reason for revert: The change breaks aosp_x86-eng compilation.
Reverted changes: /q/submissionid:2563157-armn_nn_update_278832962
Change-Id: I5485163c8e5481fe3afdaaf45ca62cda15c624bd
2023-05-08 06:58:49 +00:00
Renato Grottesi
b48980404c
Update ArmNN am: a22a996fd8
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2578490
Change-Id: Iab0d3c6df1fab719b2ce425bdf3ec2764ae8d2c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:26:03 +00:00
Renato Grottesi
a22a996fd8
Update ArmNN
...
Bug: 278832962
Test: Local CtsNNAPI CTS
Change-Id: I2c3aa8ffe0519bf3ef80860b77d263f43d9e1d9b
2023-05-03 13:08:11 +00:00
Xin Li
6346b71e91
Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: 2bb0ac716a
...
Original change: undetermined
Change-Id: I29fa71e3463b6b2ae96331e4724a590728458ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:55 +00:00
Xin Li
2bb0ac716a
Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master
2023-04-21 17:36:20 +00:00
Pierre-Clément Tosi
3a1143cc41
gs201: Cover pvmfw.img in vbmeta_system.img am: 8a6e7a8dfb
am: fb75d93227
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2510264
Change-Id: I6b21b2ef2a81de0c1e61a4fb536a1b5c322c7c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 14:07:25 +00:00
Pierre-Clément Tosi
fb75d93227
gs201: Cover pvmfw.img in vbmeta_system.img am: 8a6e7a8dfb
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2510264
Change-Id: Ie3dfa63f34de5859abbab097a57439ad8af57c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 13:27:06 +00:00
Xin Li
1b38342817
Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
...
Bug: 275386652
Merged-In: I79e5648af4525d236c38b07ca91a52b71b2ddf5e
Change-Id: I7e190c2d6329c95c9780da700420469c585b4b5e
2023-04-18 16:32:09 -07:00
Pierre-Clément Tosi
8a6e7a8dfb
gs201: Cover pvmfw.img in vbmeta_system.img
...
The pvmfw partition is expected to be kept in sync with the system
partition so, instead of having it as a standalone partition (covered by
vbmeta.img), add it to vbmeta_system.
Bug: 275497314
Test: TH
Change-Id: I2ff0fc14b9c9f8cf09907369a82f16d22a8c8297
2023-04-18 11:28:07 +01:00
Treehugger Robot
0988c51596
Merge "Add BOARD_WLAN_CHIP to soong config" am: 651503ca0c
am: a52217ff5a
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2510556
Change-Id: I8de6d238fa22215b288e9b123db6fed305122113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 14:56:05 +00:00
Treehugger Robot
a52217ff5a
Merge "Add BOARD_WLAN_CHIP to soong config" am: 651503ca0c
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2510556
Change-Id: I34d5ffce57ad981fc6b6d9d8ecdb58a6f4698ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-17 14:27:29 +00:00
Treehugger Robot
651503ca0c
Merge "Add BOARD_WLAN_CHIP to soong config"
2023-04-17 13:56:53 +00:00
Xin Li
ab4545674f
[automerger skipped] Merge TQ2A.230405.003 am: 5f4db85425
am: f05813b13a
-s ours
...
am skip reason: Merged-In Iceaade6ed0060e4006405a29a81af3c5a1ab1b8b with SHA-1 bf79debcb2
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2530227
Change-Id: Ia8e2eed236fbd95fc9ebea93e0af081d740ae2b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 20:22:55 +00:00
Xin Li
f05813b13a
Merge TQ2A.230405.003 am: 5f4db85425
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2530227
Change-Id: Ia018a79cdb80fdc54d17265869a4993ac8df906b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 19:00:56 +00:00
Xin Li
5f4db85425
Merge TQ2A.230405.003
...
Bug: 271343657
Merged-In: Iceaade6ed0060e4006405a29a81af3c5a1ab1b8b
Change-Id: Id7ba254c0eaf0060c08c96d1f0f14b6aadf83c07
2023-04-10 23:55:29 -07:00
Jooyung Han
b97e826b28
Add BOARD_WLAN_CHIP to soong config
...
wcn6740 uses a new implementation for libwifi-hal-qcom. We need a soong
config variable for BOARD_WLAN_CHIP to switch the implementation.
Bug: 273376293
Test: m libwifi-hal (with gs201 target)
Merged-In: Iddeb4e76be213fde2d1bb4dbd614a1213bc35e89
Change-Id: Iddeb4e76be213fde2d1bb4dbd614a1213bc35e89
2023-04-11 04:20:42 +00:00
Edwin Tung
572b67c6da
DO NOT MERGE gps: update gps driver 147.20.23.567385 am: 55613900fe
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22520855
Change-Id: Ia46e12622999ef4e1473b17d8a3dcd3b66c39bb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11 03:22:01 +00:00
Edwin Tung
55613900fe
DO NOT MERGE gps: update gps driver 147.20.23.567385
...
- Modify E911 SUPL over wifi dummy mac address
Bug: 277139165
Verify test: b/277291116
Test: Supl over wifi pass
VtsHalGnssTargetTest pass
CtsLocationGnssTestCases pass
PtsChreTestCases pass
Change-Id: I79e5648af4525d236c38b07ca91a52b71b2ddf5e
2023-04-11 02:35:18 +00:00
Edwin Tung
03dd759ae2
DO NOT MERGE gps: update gps driver 147.20.23.567384 am: ea09993d6e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22520854
Change-Id: I56f94e73202e6af05136939bbf9be5c47308e682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 18:09:57 +00:00
Edwin Tung
ea09993d6e
DO NOT MERGE gps: update gps driver 147.20.23.567384
...
- Modify E911 SUPL over wifi dummy mac address
Bug: 277139165
Verify test: b/277291116
Test: Supl over wifi pass
VtsHalGnssTargetTest pass
CtsLocationGnssTestCases pass
PtsChreTestCases pass
Change-Id: Ie0d68082e7103ad03a1028beab3f5d93d19cce10
2023-04-07 07:02:33 +00:00
Jack Wu
b8c492f73a
init: add permission for first_usage_date access am: 3d6a5583f2
am: d9ac7ac603
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2514126
Change-Id: I270d9ea895d7d7b0b7cad8ed4eb52bfe99a1ddc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 13:53:10 +00:00
Jack Wu
d9ac7ac603
init: add permission for first_usage_date access am: 3d6a5583f2
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2514126
Change-Id: I8869ccc9352a397a1445f255a06e7657209a013c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 13:25:29 +00:00
Jack Wu
5b1a37707a
[automerger skipped] gs201: update AIDL IGoogleBattery manifest version to 2 am: 732562ab9c
-s ours
...
am skip reason: Merged-In I1ea5ff7669cebff79944263fbc842f6b60fd547e with SHA-1 88992a6bb7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22219072
Change-Id: I44ac8b63668d5d0896f5dba08e36948b58bd0da5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:49:31 +00:00
Jack Wu
3d6a5583f2
init: add permission for first_usage_date access
...
Bug: 275441997
Test: write first_usage_date sysfs node successfully
Change-Id: Ic82fd8b367af6199d5a157a9e7d131cf4b8afd16
Signed-off-by: Jack Wu <wjack@google.com>
2023-03-30 20:04:10 +08:00
Jack Wu
732562ab9c
gs201: update AIDL IGoogleBattery manifest version to 2
...
Bug: 274701302
Test: TH
Change-Id: I1ea5ff7669cebff79944263fbc842f6b60fd547e
Merged-In: I1ea5ff7669cebff79944263fbc842f6b60fd547e
Signed-off-by: Jack Wu <wjack@google.com>
(cherry picked from commit 5505ecb127
)
2023-03-28 01:02:41 +00:00
Jack Wu
88992a6bb7
gs201: update AIDL IGoogleBattery manifest version to 2
...
Bug: 274701302
Test: TH
Change-Id: I1ea5ff7669cebff79944263fbc842f6b60fd547e
Merged-In: I1ea5ff7669cebff79944263fbc842f6b60fd547e
Signed-off-by: Jack Wu <wjack@google.com>
(cherry picked from commit 5505ecb127
)
2023-03-24 14:44:44 +08:00
chengfeitao
d34a3683f4
DO NOT MERGE Force slowJpegMode on certain camera1 apps am: d3dc89c215
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21963232
Change-Id: I874c52ea60792f5638613851d64cbd677e827826
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 21:36:56 +00:00
chengfeitao
d3dc89c215
DO NOT MERGE Force slowJpegMode on certain camera1 apps
...
Turn off the large JPEG stream on camera1 apps
that experience high power consumption during
video call
Bug: 254350466
Test: Manual testing with Messenger app video call
Change-Id: Ib5012a39caffc1a135b9e2a7a2ef9ed2df064b2e
2023-03-23 21:30:03 +00:00
Wayne Lin
9a07711966
DO NOT MERGE gps: update gps driver 147.20.23.565105 am: 7929423816
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22159882
Change-Id: I86bf8de10bc900581edfdb2e43621ef653db31fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23 10:35:09 +00:00
Wayne Lin
7929423816
DO NOT MERGE gps: update gps driver 147.20.23.565105
...
- fix issues in SUPL over WiFi test
- fix incorrect measurement reporting interval issue
- fix optimistic speed accuracy issue
Bug: 264216987
Bug: 270094312
Bug: 262351380
Verify test: b/274396195
Test: VtsHalGnssTargetTest pass
CtsLocationGnssTestCases pass
PtsChreTestCases pass
Change-Id: I8c21af3fe8e7e1f0e1e3eba50ca4e1b4eddffb15
2023-03-22 10:32:55 +00:00
Edwin Tung
a5fc529921
DO NOT MERGE gps: update gps driver 147.20.23.565112 am: 6286f63b55
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/22120481
Change-Id: I415cdf5dfab6827da1ce07beabb31f1cf0fa04d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 08:07:07 +00:00
Edwin Tung
6286f63b55
DO NOT MERGE gps: update gps driver 147.20.23.565112
...
- Fix E911 SUPL over wifi issue
Bug: 270273494
Verify test: b/274084913
Test: Supl over wifi pass
VtsHalGnssTargetTest pass
CtsLocationGnssTestCases pass
PtsChreTestCases pass
Change-Id: Iedc1def99f610e3a88eb70cc2cbb713a6f78a01e
Change-Id: Ib9d8d53d8dfc81f51c3682875a7c00d819b3c507
2023-03-21 04:25:15 +00:00
Xin Li
ed43919518
[automerger skipped] Merge Android 13 QPR2 am: ea44a65d91
-s ours am: bd13781eae
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 5cab7ffe1b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2487095
Change-Id: I2ee8739ff847cf0c36f4a8c8ac1b1fef95c5eaf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 23:06:16 +00:00
Xin Li
bd13781eae
[automerger skipped] Merge Android 13 QPR2 am: ea44a65d91
-s ours
...
am skip reason: Merged-In I46ec45354ae72a6a758aba2c2a31af92f1da4038 with SHA-1 5cab7ffe1b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2487095
Change-Id: I66a2dad6e2ef57f703c13cdd0f3918cf85e99b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 22:32:26 +00:00
Nicole Lee
2791a43df1
Update pixel stability logging mask am: 0708effa67
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21982885
Change-Id: I536e7ce99c130f3e5d452cbdd93c05970f779316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 12:55:46 +00:00
Xin Li
ea44a65d91
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: I46ec45354ae72a6a758aba2c2a31af92f1da4038
Change-Id: Ief06203089197952217dcc1eec43a5b060d1110b
2023-03-13 23:09:33 -07:00
Nicole Lee
0708effa67
Update pixel stability logging mask
...
- Enable RSM_Warning, RSM_Essential, RSM_Normal, RSM_Detail of GP_SMPF_MSF
- Enable SRL1RC_COMMON
Bug: 270638212
Change-Id: If02fe52cb64868a24f5c759b24400924993764f9
(cherry picked from commit 5caec1cab9
)
2023-03-13 09:20:18 +00:00
Woody Lin
d1a237a574
DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled am: 7d695f4bff
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21691322
Change-Id: I08b1bc6bbd0d47336079c767cc824e3b62a97918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 09:36:33 +00:00
Jack Wu
93f69850ae
Update health AIDL HAL to V2 am: e1282e2c0e
am: 38c98bf94e
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2356796
Change-Id: I36197f8857fb2fbf627641c964bc2d653cf52850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:52:43 +00:00
Jack Wu
38c98bf94e
Update health AIDL HAL to V2 am: e1282e2c0e
...
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2356796
Change-Id: Iea023db8100c4b4dbc350eb8e1999d9874984b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 01:20:54 +00:00
Woody Lin
7d695f4bff
DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled
...
Bug: 265382296
Change-Id: Ib215551397a361f5734401173e62a15691e45425
2023-03-02 07:14:55 +00:00