Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
789,922 Commits 3 Branches 0 Tags
24a824156fe4e5f7350da198643fa2cfedcd2eda
Commit Graph

789922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
b50a3b4605 Add keyguard callbacks to ShellInterface 
- Currently multiple shell feature interfaces expose the same
  keyguard visibility callback, instead we can pipe this signal
  to the shell for controllers to register for events.

Bug: 238217847
Test: atest WMShellUnitTests
Test: atest SystemUITests
Change-Id: I96125e9f3796c8303683c9314f13884121ded39d
 2022-07-20 06:39:47 +00:00
Automerger Merge Worker
6f75a838b9 Merge "Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da966 am: bc6a6e335b" into tm-qpr-dev-plus-aosp 2022-07-20 06:37:46 +00:00
Sam Dubey
513bed2896 Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da966 am: f3cabdecb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19332088

Change-Id: I63a805670111e77465d2dc2b81b2981da02c8abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:37:28 +00:00
Sam Dubey
8b48d84e3d Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da966 am: bc6a6e335b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19332088

Change-Id: I5d159c6c1eef69fba51e25468fea051819086341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:37:21 +00:00
Sorin Basca
f520737eef [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours am: 0e6426add4 -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642

Change-Id: I45549c4b79780ac6bbb8f485294e9ac969c3c8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:28 +00:00
Sorin Basca
1c3e5c3fe7 [automerger skipped] Use Mockito 4.6.1 API am: d12c911fb8 -s ours am: ce66acabec -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642

Change-Id: I3a81a95ef911ab96a9510246781c56ed60fae0a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:05 +00:00
Sam Dubey
f3cabdecb2 Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da966 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19332088

Change-Id: I585194ed3d3f99968abc1cd371d811ef6b0f25b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:02:26 +00:00
Sam Dubey
bc6a6e335b Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev am: 0de21da966 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19332088

Change-Id: I2ad4699ff5cc72089314c304ed1e572734ab7947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:02:19 +00:00
Sorin Basca
0e6426add4 [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642

Change-Id: I6003cad31908ab06bf6c2b44c62f586d4192d93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:56:03 +00:00
Sorin Basca
ce66acabec [automerger skipped] Use Mockito 4.6.1 API am: d12c911fb8 -s ours 
am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642

Change-Id: I7be388667119fe5e57f56b3a0f4324c5e8d7ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:23 +00:00
Sam Dubey
0de21da966 Merge "Test Mapping: Update test-mapping-group post platinum split" into tm-d1-dev 2022-07-20 05:38:59 +00:00
Sorin Basca
59b496c31d Merge "Use Mockito 4.6.1 API" 2022-07-20 05:32:35 +00:00
Suprabh Shukla
ee9331c0d3 Stop crashing the system on hitting the alarm limit am: c010da3a46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069

Change-Id: I0fe52c40c5e9d38ea5c4d31dd901c1c03d5f8ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 04:39:11 +00:00
Sarah Chin
0ddebc6774 Update values for NR signal strength 
Ranges were the same as LTE values, which is incorrect.

Test: atest CellSignalStrengthNrTest
Bug: 234304714
Change-Id: I030c6aeec22556454955bb4f9671afe830bb9e2f
Merged-In: I030c6aeec22556454955bb4f9671afe830bb9e2f
 2022-07-19 21:27:28 -07:00
Arthur Hung
0099ca8fab Ignore back invoke when window focus has lost 
The back invoke target could lost focus during back navigation.
To prevent the non-focused window could still trigger back action cause
some unexpected behavior, this CL will listen focus changed and skip the
back invoke call.

Test: launch a trampoline activity and trigger back before next activity
shown.
Test: atest WindowOnBackInvokedDispatcherTest
Bug: 238050065

Change-Id: Ifd345b2283c5d07628e2884db6e4e13f3ec31e83
 2022-07-20 04:26:45 +00:00
Automerger Merge Worker
b49eba8792 Merge changes from topic "am-30628f6a7d0345608b270c060d37602f" into tm-d1-dev-plus-aosp am: f28844c848 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 28dc43e6a7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I5a6764aaea66f6acca55f3820702974c8c925ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:41:12 +00:00
Steve Elliott
d9118744ed [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours am: c26af50021 -s ours am: adb1daddc8 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I3a7855c761215ed4b00a5526c9c3636ea292d28f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:41:08 +00:00
Jeff DeCew
5bd4e09cc8 Fix squished notifications on the lockscreen. am: c29777f405 am: b6790b9f8f am: 4e16f7ab01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: I9d5a4a9731cbed91e8fe2f18a3753416be48d869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:41:01 +00:00
Steve Elliott
290751343a [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf am: 3dc7f1867c -s ours am: e9125e3fcd -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I9bf03af32dee327ea2508648e91e2e6322a867a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:40:10 +00:00
Jeff DeCew
2a14759737 Fix squished notifications on the lockscreen. am: c29777f405 am: a3db62b5ec am: 8d8969e2fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: I921a69db59f30b210e782315755dca7598946e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:39:48 +00:00
Steve Elliott
39bda36c50 [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours am: c26af50021 -s ours am: 126b3b416e -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: If1590f4e950f4adace8c0cb18d3fcae3fcfb9630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:39:36 +00:00
Steve Elliott
ed0119e1d3 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6a7 -s ours am: d4b198e1e1 -s ours am: cee915c814 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I906b1f9e2913be6f59893739b1f5a73bf56ac955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:39:28 +00:00
Jeff DeCew
30643ad02c Fix squished notifications on the lockscreen. am: c29777f405 am: b6790b9f8f am: be2c71a44d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: I448ed62101160d9186f4c9f8a6bc1c898cc6d1a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:39:14 +00:00
Automerger Merge Worker
f28844c848 Merge changes from topic "am-30628f6a7d0345608b270c060d37602f" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours am: c26af50021 -s ours
  [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6a7 -s ours am: d4b198e1e1 -s ours
  Fix squished notifications on the lockscreen. am: c29777f405 am: b6790b9f8f
 2022-07-20 03:24:42 +00:00
Steve Elliott
adb1daddc8 [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours am: c26af50021 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I8baa12c1d99c526c74c979fd015a0d17641c4159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:33 +00:00
Steve Elliott
e9125e3fcd [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf am: 3dc7f1867c -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: Ifea4b94c2635a2d1617ba33293e2aa7ff624b0f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:25 +00:00
Steve Elliott
a2395205d2 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6a7 -s ours am: d4b198e1e1 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I7f075d0c12079f01b53ab84a32be55775ad703a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:21 +00:00
Steve Elliott
126b3b416e [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours am: c26af50021 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: Ib90db391ead53bd7daecc90f0d2fbf4b5374d949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:13 +00:00
Steve Elliott
cee915c814 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6a7 -s ours am: d4b198e1e1 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: Ibffce7b95e72c503adcdf8a85242cb7dfdbcb461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:11 +00:00
Jeff DeCew
8d8969e2fc Fix squished notifications on the lockscreen. am: c29777f405 am: a3db62b5ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: Ie9131597ed23fad54caa35a431c9b0d85155109e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:10 +00:00
Jeff DeCew
4e16f7ab01 Fix squished notifications on the lockscreen. am: c29777f405 am: b6790b9f8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: If1c89d5f45812b4806206137183ccce2038d36ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:09 +00:00
Jeff DeCew
be2c71a44d Fix squished notifications on the lockscreen. am: c29777f405 am: b6790b9f8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: Id7dcfdac83e0c81792228f529d56aa2b4f5d056b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:24:08 +00:00
Beth Thibodeau
ef53f601f2 Fix crash when loading album art by resource 
When the album art is loaded from the notification largeIcon it may be a
resource rather than a bitmap, so it has to be loaded as a drawable.
Bitmaps are still loaded using `WallpaperColors.fromBitmap` to avoid
the extra steps needed by the `fromDrawable` method.

Fixes: 239368697
Test: manual
Test: atest MediaControlPanelTest
Change-Id: I0ba9a4b0f4d308cc360a785b68cbabdcb2480690
 2022-07-19 22:07:53 -05:00
Steve Elliott
c26af50021 [automerger skipped] Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: Ief57d911935629ae269bf9fd64fe1fcbf9ae6ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:06:12 +00:00
Steve Elliott
d4b198e1e1 [automerger skipped] Fix stale NSSL "fling" state caused by no-op fling am: 28dc43e6a7 -s ours 
am skip reason: Merged-In Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 with SHA-1 7f387f9ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I341eb129d0459251cd05b4221a79444f1c8a1f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:06:09 +00:00
Jeff DeCew
b6790b9f8f Fix squished notifications on the lockscreen. am: c29777f405 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: Ib447f567bc08f5ab8f200fab294873f6a5447769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:06:06 +00:00
Steve Elliott
3dc7f1867c Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708

Change-Id: I8a291df07add9f33af3eacd0dea5292f0f9a984d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:05:17 +00:00
Jeff DeCew
a3db62b5ec Fix squished notifications on the lockscreen. am: c29777f405 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229

Change-Id: I0c3ad0aff7cb63b7b8d4113a1493ff71add01ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:05:08 +00:00
TreeHugger Robot
21621fd2bc [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am: 98f625151c -s ours am: 6e4bd6d0e0 -s ours am: a0634be0b4 -s ours am: e2423179f6 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: I7b0cf5d5588ac849a32c106db50fa18f45fd33b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:51:45 +00:00
TreeHugger Robot
85de52b9b3 [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 am: e41a97f229 -s ours am: f5b9c814e1 -s ours am: 6b76d854bb -s ours am: bbacf4ab21 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: Ie7904798a8c499a79937bb6f5bc7984d37add9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:51:34 +00:00
TreeHugger Robot
9edecf7275 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am: 98f625151c -s ours am: 6e4bd6d0e0 -s ours am: a0634be0b4 -s ours am: cb1b5e8ad9 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: I8a44ccfd06722de6976f2155cb93e61c87e06ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:50:59 +00:00
Automerger Merge Worker
3fe0860141 Merge "[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours am: b23fac6739 -s ours am: d280e9bd4b -s ours am: 3914d40698 -s ours" into tm-qpr-dev-plus-aosp 2022-07-20 02:50:47 +00:00
Automerger Merge Worker
337a78d5b4 Merge "[automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 am: e41a97f229 -s ours am: f5b9c814e1 -s ours am: 6b76d854bb -s ours am: 070dd64d09 -s ours" into tm-qpr-dev-plus-aosp 2022-07-20 02:50:41 +00:00
TreeHugger Robot
26ac654c66 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours am: b23fac6739 -s ours am: d280e9bd4b -s ours am: 3914d40698 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: I7b98b4d8b49f7101fead26fd37464cdc35f4c5e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:50:37 +00:00
Automerger Merge Worker
7712c5e910 Merge changes from topic "am-ac9a42cb509a4e7a9b7baffd321e9713" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb7f -s ours am: c41f714122 -s ours am: 9b71aa5bf5 -s ours am: df2730d391 -s ours
  [automerger skipped] [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129 am: b7d6952de7 -s ours am: 2dac8d1d85 -s ours am: d80bf72c09 -s ours am: 57335fd428 -s ours
 2022-07-20 02:50:33 +00:00
TreeHugger Robot
9a6e713f98 [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 am: e41a97f229 -s ours am: f5b9c814e1 -s ours am: 6b76d854bb -s ours am: 070dd64d09 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: Ie2e71fdfa689e6bbaba6293d592c27d177419562
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:50:26 +00:00
TreeHugger Robot
268d802daf [automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb7f -s ours am: c41f714122 -s ours am: 9b71aa5bf5 -s ours am: df2730d391 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: I40189a8b77fcc514c1495e49519086549371eff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:50:25 +00:00
Automerger Merge Worker
da2ae6f8d6 Merge "[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours am: b23fac6739 -s ours am: d280e9bd4b -s ours am: f2b66565d6 -s ours" into tm-qpr-dev-plus-aosp 2022-07-20 02:50:18 +00:00
Suprabh Shukla
80fb2a0412 [automerger skipped] [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129 am: b7d6952de7 -s ours am: 2dac8d1d85 -s ours am: d80bf72c09 -s ours am: 57335fd428 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: Ic597ee081c9e0fc932b31549d2449b1b1b8185ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:50:14 +00:00
TreeHugger Robot
c4506552b5 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am: 98f625151c -s ours am: 6e4bd6d0e0 -s ours am: ac50dce281 -s ours am: 745b27e412 -s ours 
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495

Change-Id: Ia676c2d4b09012dc86b9ce8b9f75a566e3f657fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:49:53 +00:00