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
8af60fee17
Update pixel stability logging mask am: 0708effa67
am: 2791a43df1
am: 0bbc76e997
am: 6bd575f8a4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21982885
Change-Id: Ibd8f507330bb2a708934b13f66b3dcdd7d54dc1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 14:44:36 +00:00
Nicole Lee
47aa905f7b
Update pixel stability logging mask am: 0708effa67
am: 2791a43df1
am: 0bbc76e997
am: 243a0213a2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21982885
Change-Id: I983b5bc7cf087a12d3aa50a5d04263e115792609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 14:43:53 +00:00
Nicole Lee
6bd575f8a4
Update pixel stability logging mask am: 0708effa67
am: 2791a43df1
am: 0bbc76e997
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21982885
Change-Id: Id53ecdb1f556e3c224ef570d930d9d912243f450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 14:10:42 +00:00
Nicole Lee
243a0213a2
Update pixel stability logging mask am: 0708effa67
am: 2791a43df1
am: 0bbc76e997
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21982885
Change-Id: If5baaafa25ec2a1f1d76e5d7329d551baaf09094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 14:10:22 +00:00
Nicole Lee
0bbc76e997
Update pixel stability logging mask am: 0708effa67
am: 2791a43df1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21982885
Change-Id: I52a41b36123443f1ba169d466be1c0193362c435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 13:32:40 +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
Adam Shih
b83148357f
move modem operation to dump_modemlog am: 76e63fb7b3
am: dc82b679b7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21945562
Change-Id: I4672e38cacb5eea40e7d199c7bdff979932463a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 03:15:26 +00:00
Adam Shih
c2e4cfaab1
move modem operation to dump_modemlog am: 76e63fb7b3
am: cde88141eb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21945562
Change-Id: I2764df10d9af3eb5a29a27120b1748965f02e6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 03:13:59 +00:00
Adam Shih
cde88141eb
move modem operation to dump_modemlog am: 76e63fb7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21945562
Change-Id: Ibe9159ab92d9838fec43841f3fa828e3cef1f8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 02:41:51 +00:00
Adam Shih
dc82b679b7
move modem operation to dump_modemlog am: 76e63fb7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21945562
Change-Id: If2158d913c980574e54867d969c945931e27635b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 02:41:34 +00:00
Adam Shih
76e63fb7b3
move modem operation to dump_modemlog
...
Bug: 240530709
Test: adb bugreport
Change-Id: Ib57623cc37cbd3becc20365854b150a4c7a7551b
2023-03-13 02:11:45 +00:00
Woody Lin
c9ead8fec7
[automerger skipped] DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled am: 7d695f4bff
am: d1a237a574
-s ours am: d0d2eb84da
-s ours am: f86bcfe24e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21691322
Change-Id: I44a7498ce2214369c8b0b001e3adf83bd7ecbd24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 11:26:41 +00:00
Woody Lin
2786a7c72a
[automerger skipped] DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled am: 7d695f4bff
am: d1a237a574
-s ours am: d0d2eb84da
-s ours am: 76fcdf1922
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21691322
Change-Id: I680a624897ad06d537f166b05cf0d7818fc859cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 11:26:19 +00:00
Woody Lin
f86bcfe24e
[automerger skipped] DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled am: 7d695f4bff
am: d1a237a574
-s ours am: d0d2eb84da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21691322
Change-Id: I0f77d2f914b6e6b3b715323dac063e92e366a0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 10:50:16 +00:00
Woody Lin
76fcdf1922
[automerger skipped] DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled am: 7d695f4bff
am: d1a237a574
-s ours am: d0d2eb84da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21691322
Change-Id: Ie957d88900c71c77623a08c4b82af952d717d723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 10:50:02 +00:00
Woody Lin
d0d2eb84da
[automerger skipped] DO NOT MERGE: gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled am: 7d695f4bff
am: d1a237a574
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21691322
Change-Id: Id5d3445ddb7a995dc2f0d68ae10eae90ee89c842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 10:12:30 +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
Woody Lin
73dab09197
gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled am: 5186bf4b9b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21689771
Change-Id: I525c3a731b2b721bf15680d8610ce2f0e36c9fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 09:34:59 +00:00
Woody Lin
5186bf4b9b
gs201: init.debug.rc: Enable etm/etm2dram when ramdump is enabled
...
Bug: 265382296
Change-Id: Ib215551397a361f5734401173e62a15691e45425
2023-03-10 08:43:31 +00:00
Jasmine Cha
5cb9c34a9a
audio: move audio hal hidl mk to gs-common. am: e345714375
am: 5983d75c5f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21794900
Change-Id: I42aa8d4e1d26b405cf774919816c2161875ff6da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 02:39:27 +00:00
Jasmine Cha
ab0e485c02
audio: move audio hal hidl mk to gs-common. am: e345714375
am: 8514bb0e01
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21794900
Change-Id: I2dd4e6043c6e1ab61533e7cbf03963905cadcdb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 02:22:30 +00:00
Jasmine Cha
8514bb0e01
audio: move audio hal hidl mk to gs-common. am: e345714375
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21794900
Change-Id: Ibaa29b97674fb954828d1334667f6914bf5ad4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 02:19:46 +00:00
Jasmine Cha
5983d75c5f
audio: move audio hal hidl mk to gs-common. am: e345714375
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21794900
Change-Id: I82f8160b67419392d32047815b16b169fcfa5a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 02:18:13 +00:00
Jasmine Cha
e345714375
audio: move audio hal hidl mk to gs-common.
...
Bug: 259161622
Test: build pass and check audio function with HIDL service
Change-Id: I4a72f00be1c9eafc92cab5ff7ef93a688f82eb75
Signed-off-by: Jasmine Cha <chajasmine@google.com>
2023-03-10 02:05:58 +00:00
Erik Staats
7bd69909cf
Add UmfwStat am: 63080f5452
am: 01d8c6695f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21914462
Change-Id: If2e42ed87034896acedddcc0e81983da67655880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 22:24:50 +00:00
Erik Staats
cdfce914cb
Add UmfwStat am: 63080f5452
am: 72024597a5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21914462
Change-Id: I3bfa8b24d32faf413198d5c22d43988e419b3c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 22:04:16 +00:00
Erik Staats
01d8c6695f
Add UmfwStat am: 63080f5452
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21914462
Change-Id: I734574ae319d2dfefce8da1ca6df98d354575fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 21:43:46 +00:00
Erik Staats
72024597a5
Add UmfwStat am: 63080f5452
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21914462
Change-Id: I97199c2820aa4160b8b15882670e2a9ed6ed2413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 21:23:09 +00:00
Erik Staats
63080f5452
Add UmfwStat
...
Bug: 272323547
Test: Verified UmfwStat tables are dumped in bug report.
Change-Id: Ia2848a3893ce20a8bf02629e6ee4fbee6f8651fb
2023-03-09 20:38:02 +00:00
Habib Moukalled
728726c3a8
Updating VINTF manifest for IDebugManager. am: eb0f05cc42
am: 8fb3c8906d
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21527429
Change-Id: Ib547b070e49fd1c52a8e62a0a93a262903488fe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 18:14:29 +00:00
Habib Moukalled
de24af6657
Updating VINTF manifest for IDebugManager. am: eb0f05cc42
am: 52dce478b5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21527429
Change-Id: I6ae13368ab375c11dc282d6f0a904172861bd4ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 18:08:50 +00:00
Habib Moukalled
52dce478b5
Updating VINTF manifest for IDebugManager. am: eb0f05cc42
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21527429
Change-Id: Icebd8a0871866654de3ba66bf892a9db83302018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 17:29:50 +00:00
Habib Moukalled
8fb3c8906d
Updating VINTF manifest for IDebugManager. am: eb0f05cc42
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21527429
Change-Id: I3610bc8e13991f68d89fb51ffd53a021631754bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 17:29:39 +00:00
Habib Moukalled
eb0f05cc42
Updating VINTF manifest for IDebugManager.
...
Notes:
- Adding new AIDL HAL for IDebugManager.
Bug: 249611327
Test: build test
Change-Id: Ie9f1ef082bc0ca88098e1a89e93a5daae22d0fc8
2023-03-09 17:06:05 +00:00
Adam Shih
b64926168b
Move display dump to gs-common am: fe0605b2b1
am: a0804f1dc5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21808920
Change-Id: Ia20bb9ae8d00dbe0e8a2fd606802a8e80ec636b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 06:01:47 +00:00
Adam Shih
70c91b6112
Move display dump to gs-common am: fe0605b2b1
am: 115ff20ff4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21808920
Change-Id: I901227372630afc38dbcee9d55795a937b1b8442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 06:00:38 +00:00
Adam Shih
a0804f1dc5
Move display dump to gs-common am: fe0605b2b1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21808920
Change-Id: Ic98f6f3ef92c260cafea59634df0a6bfc44da3b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 05:29:55 +00:00
Adam Shih
115ff20ff4
Move display dump to gs-common am: fe0605b2b1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21808920
Change-Id: Ifbdc2bd917cc56caa45db764a94963e62a1dc155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 05:29:18 +00:00
Adam Shih
fe0605b2b1
Move display dump to gs-common
...
Bug: 269212897
Test: adb bugreport
Change-Id: I7b17d4d54e90429d07b545e3d53c3f528155dab5
2023-03-09 05:09:19 +00:00
Daniel Chapin
a7c91ba71f
Revert "Pixel 7 Pro: Use SkiaVk as RenderEngine backend" am: 9f413fc11b
am: ab765c62b7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21849882
Change-Id: I309993e9bdecdce8a06e783631f61937450ffa4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:26:46 +00:00
Daniel Chapin
37d3cae809
Revert "Pixel 7 Pro: Use SkiaVk as RenderEngine backend" am: 9f413fc11b
am: 60b9996f5f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21849882
Change-Id: I195ccce14b41b4c094d32a2de948815bdd2f3008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 22:22:52 +00:00
Daniel Chapin
ab765c62b7
Revert "Pixel 7 Pro: Use SkiaVk as RenderEngine backend" am: 9f413fc11b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21849882
Change-Id: I1f3af929cf7261dc55fed00d0da32231e99f24e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:33:40 +00:00
Daniel Chapin
60b9996f5f
Revert "Pixel 7 Pro: Use SkiaVk as RenderEngine backend" am: 9f413fc11b
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21849882
Change-Id: I891b3a571318b70d450d7dc7d62e270cc19b2bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:32:05 +00:00
Daniel Chapin
9f413fc11b
Revert "Pixel 7 Pro: Use SkiaVk as RenderEngine backend"
...
This reverts commit 2fa6ce1ba2
.
Reason for revert: Droidfood blocking bug: b/271968787
Change-Id: I62b475b01732f4a285c020fcaab3103ef972d248
2023-03-07 21:08:31 +00:00
Nicole Lee
f9b839b839
Update pixel stability logging mask am: 5caec1cab9
am: 1ef8a1785a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21803648
Change-Id: I7644c646f7d44b9e94d6e90b625f46b8f9a7c42f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 09:14:03 +00:00
Nicole Lee
9357c6896d
Update pixel stability logging mask am: 5caec1cab9
am: 7fab1435ad
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/21803648
Change-Id: Iecb86d64991768ece393c93650f11a0f61b2f12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 09:13:07 +00:00