Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
770,677 Commits 3 Branches 0 Tags
a61ba0085fd526d71ad12364c1e95a4837565e1c
Commit Graph

770677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a61ba0085f Merge "Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0 am: 126314b371" into tm-d1-dev-plus-aosp am: f02ad34b46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891

Change-Id: I1324a946f3b5c103e4c0f3a3284d5f163457b945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:11:15 +00:00
Edgar Arriaga García
4db215d02a Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev am: a47d028ed0 am: 40e7c81c5e am: f02d76aeca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18193321

Change-Id: I1a2d133befd5f42a9d5622e2c7f2c72c99d28d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:10:33 +00:00
Kholoud Mohamed
68acb8470e Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822a9 am: b144935fd9 am: ffe644ad25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: Iaaa386f15d8a21a6253afe78fa39b60fe3b608d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:09:18 +00:00
kholoud mohamed
5cbd6e1d71 RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs am: 50f529a1e1 am: 03350f1cb2 am: 5de2223615 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: Id046d1c04d9727e8d3bb69ba46a23a9fce1673f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:09:16 +00:00
Tom Chen
9ecb1e431a Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev am: c6caf1cfdc am: 264e9594f7 am: 200b75df86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: I01629b76cf6f695754dc049407bc2ae1a350dcea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:08:30 +00:00
Tom
61d007acb0 [DO NOT MERGE] T Subcard logging - Media Card code path am: 49e76804b8 am: d08948bd08 am: 2f3e9fef05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: I5220248a95ef2aeec06afb760692180ef9de22ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:08:15 +00:00
Automerger Merge Worker
c246e4fefb Merge "Merge "Use lint database from api_version_public" am: 39ebb3b0c0 am: d708548986" into tm-dev-plus-aosp am: c3b789f86c am: 0dd53423a0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092243

Change-Id: Idc16470c93ae4dfe9d058f1e8733a4dfd7c0ef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:07:40 +00:00
TreeHugger Robot
f2b07340ec Merge "Prevent to revoke input focus from recentsAnimationInputConsumer" into tm-dev am: 7e6088fa86 am: dc9df06be2 am: 4c3d0a719b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18167461

Change-Id: I41230c26a0eb0e7fd809593e96a8dfad7600951a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:59:00 +00:00
Andy Hung
2e454af728 Merge "SpatializerHelper: Remove custom sensor handling" into tm-dev am: 1d5623f14b am: a68cbd6377 am: 657513b040 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290065

Change-Id: I61ec6a9dc506465d9d1cc4af11b1a037ee96c471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:58:28 +00:00
Pavel Grafov
bddadf5983 Merge "Allow profile owners to protect packages." into tm-dev am: 20bd378d55 am: 2f7db4e0c7 am: 523554b47f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186904

Change-Id: Ida5992f49008ad87dc9fc15caf7594452d17694d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:58:10 +00:00
Brad Ebinger
9f582ce7c0 Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev am: 82c131e385 am: 021c4e03fa am: df9c7d68a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298852

Change-Id: I9dcc65f6641c686b53dd631cac35869c3ddb37a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:57:59 +00:00
Chavi Weingarten
6e5bf66d20 Merge "Lock in Surface#destroy" into tm-dev am: 1559113427 am: a8b7ca659a am: 4c6707b9da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283681

Change-Id: I4f1463d10de449089994922e6230dc9a6406326d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:57:24 +00:00
Yu-Han Yang
1bb118fca8 Merge "Restart location requests after HAL restarts" into tm-dev am: e19d5be9ad am: 6b9829ab91 am: 5769cd0615 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18289083

Change-Id: I9c34c22611a181097dd3c0d56e5e190490b39ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:57:00 +00:00
Automerger Merge Worker
14280f0d9f Merge "Merge "Fix memory leak with RenderNodeAnimator" into tm-dev am: b9a8ed8b70 am: b27c97ac73" into tm-d1-dev-plus-aosp am: 239f1ada6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290468

Change-Id: I46b2edfcc670dafec0fcf3908e209eea518334e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:56:46 +00:00
Automerger Merge Worker
759cfc51ee Merge "Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe0e am: 6acd9fbbd1 am: 86afce92ba" into tm-qpr-dev-plus-aosp 2022-05-11 21:56:25 +00:00
Jonathan Scott
1038dfe56d Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev am: 7b11af45d1 am: 4af57483db am: 2dba8adb33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308199

Change-Id: Ie0e1ad2698fb2f947bcc69f12c2fc8e1a561a7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:56:19 +00:00
Ronish Kalia
51f0c31233 Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe0e am: 6acd9fbbd1 am: 86afce92ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186905

Change-Id: I208eb2bae29ffe8d7d0d60203fc36231d8526098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:56:18 +00:00
Kholoud Mohamed
51bc862a0f Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" am: 00c0a92877 am: eaa93a9742 am: 37a3e5d475 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308199

Change-Id: I118cdb27e64bd5a5fdceb82a057d357c6ab3c4a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:56:15 +00:00
Matt Casey
16ab151625 Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0 am: bf0d76e742 am: 91c25d900d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891

Change-Id: I061cb7c6f43f5c056ab99e87a94a5e8444f4fe17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:56:05 +00:00
Automerger Merge Worker
5611744a56 Merge changes from topic "am-066e08a4a39f4bf0b40079cc3a5b641c" into tm-qpr-dev-plus-aosp 
* changes:
  Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822a9 am: f97d55055f am: ce5d6f750d
  RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs am: 50f529a1e1 am: d721a3edc0 am: fe915a5dde
 2022-05-11 21:55:55 +00:00
Kholoud Mohamed
e385af85dd Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822a9 am: f97d55055f am: ce5d6f750d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: Ic240195f7d70948ff44e51c49df7c0ec2752b03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:55:49 +00:00
kholoud mohamed
a6fa6369df RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs am: 50f529a1e1 am: d721a3edc0 am: fe915a5dde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: I7674a35924d46824d5ace7189a126361cb15fbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:55:45 +00:00
Zach Johnson
f346997573 Merge "Check for installed bluetooth package name" into tm-dev am: 945df7d77d am: 72dfd7b317 am: af434cce85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17774836

Change-Id: I52ee2393e09c4be48b4b9474d46f246002ad45ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:55:40 +00:00
Ronish Kalia
475040b5d9 Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe0e am: 228d8b116e am: 39f83605a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186905

Change-Id: I8fb92a47428b436f329b558f7a37d21ebb8c0ffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:55:12 +00:00
Nikita Ioffe
241472e53c Merge "Add apex_available platform to CtsShimPrivUpgrade" into tm-dev am: bda42bee6f am: e6d259945e am: 7417a3819b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309969

Change-Id: Idfaee97f092e3b44d4d2cccb66d4ab0438d94cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:54:55 +00:00
Automerger Merge Worker
86615a317c Merge "Merge "Filter the locale not in resources" into tm-dev am: 53c979939c am: d17b651d94 am: 43b167f717" into tm-qpr-dev-plus-aosp 2022-05-11 21:54:44 +00:00
Calvin Pan
89c5af6120 Merge "Filter the locale not in resources" into tm-dev am: 53c979939c am: d17b651d94 am: 43b167f717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245872

Change-Id: I817b0f46a4d167e2ce6b5eafcee53a4e04e0ddbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:54:34 +00:00
Eric Biggers
2b25251717 [automerger skipped] Merge "UserDataPreparer: fix volume preparation order" into tm-dev am: 5815b8820e am: 2ac2a8a7a2 am: 9644d8f0b6 -s ours 
am skip reason: Merged-In I146d8c786c6b923aed7f8c748db8a7e90c96687f with SHA-1 a8a53c2615 is already in history

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

Change-Id: I7e32e86a5102caa0f8aa9e0a67a5d26ac6846fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:54:29 +00:00
Keun-young Park
a5f82fbae6 Merge "Continue dexopt for other packages when a package reports an error" into tm-dev am: 3136e202b3 am: 87cd28ec33 am: 33e1c60b29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18175791

Change-Id: I42f8fd1d054a15bea1acfee019250a63470af4b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:54:06 +00:00
Automerger Merge Worker
3611215307 Merge "Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b54 am: 796c9aa13a" into tm-d1-dev-plus-aosp am: 82237fba09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083366

Change-Id: If7095d825779b2bb6b7c91f644581de4d075d03a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:53:47 +00:00
Nikita Ioffe
bf4cc32829 Merge "Add apex_available platform to CtsShimPrivUpgrade" into tm-dev am: bda42bee6f am: b23889c90b am: 46f7b5164a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309969

Change-Id: Ib8a6c0febaabe106ef6cd424f8a1701cb2d65e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:52:07 +00:00
Edgar Arriaga García
df64f07313 Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev am: a47d028ed0 am: 40e7c81c5e am: 6d1f7e0af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18193321

Change-Id: Id3cd8e709c49f420b66ee06ba2a21b6159f8b92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:51:41 +00:00
Automerger Merge Worker
d8b422e4f8 Merge "Merge "Reset mock NM before each of the tests that checks it" into tm-dev am: 1df465ed29 am: 90deedf949" into tm-d1-dev-plus-aosp am: bc4d9a420b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18282484

Change-Id: I8f06a46db035a361dd115407c5fcb49a39192655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:51:35 +00:00
Tom Chen
2bbbf4abc9 Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev am: c6caf1cfdc am: 264e9594f7 am: a537d3b1d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: I3823bc5ca951a2482fa436f144c0eab03247611b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:51:13 +00:00
Tom
d4bf4b9922 [DO NOT MERGE] T Subcard logging - Media Card code path am: 49e76804b8 am: d08948bd08 am: 0e198329c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: Idf2dfa4189c87243312ef2a0c9f96b1a46a555e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:51:07 +00:00
Calvin Pan
63570e6ad5 Merge "Filter the locale not in resources" into tm-dev am: 53c979939c am: d00dd4ee2b am: c2320a7785 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18245872

Change-Id: Idc16b8a17e91adadc83c55a3417a412feb40b89b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:50:30 +00:00
Automerger Merge Worker
2858cc1e8f Merge "[automerger skipped] Merge "Don't show "Clear All" w/ redacted notifs" into tm-dev am: e6e4946731 am: 8204fbd52c -s ours am: e6ea7dc5a9 -s ours" into tm-qpr-dev-plus-aosp 2022-05-11 21:50:18 +00:00
Brad Ebinger
9fe3fa2c49 Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev am: 82c131e385 am: 021c4e03fa am: bb0b4506f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298852

Change-Id: I8002c957433705df66e7b05bcf1251394be91dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:50:12 +00:00
Steve Elliott
d32cf65b57 [automerger skipped] Merge "Don't show "Clear All" w/ redacted notifs" into tm-dev am: e6e4946731 am: 8204fbd52c -s ours am: e6ea7dc5a9 -s ours 
am skip reason: Merged-In Ibc66576d28a48f7c82cad875ed2dcb57a7b23f10 with SHA-1 63122cbde2 is already in history

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

Change-Id: I33c1a95467597287951addfe6eb424af2b475642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:50:09 +00:00
Keun-young Park
2471080813 Merge "Continue dexopt for other packages when a package reports an error" into tm-dev am: 3136e202b3 am: 132cf59f57 am: bea119c51a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18175791

Change-Id: Icd74396a98a53f0e068bb70f980373ec46475923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:48:53 +00:00
Yu-Han Yang
84f2cd530d Merge "Restart location requests after HAL restarts" into tm-dev am: e19d5be9ad am: 6b9829ab91 am: 9a4f9338b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18289083

Change-Id: I49b4ad9dea0e006cc6ba5aea13ca73d65a4df3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:48:43 +00:00
David Coffin
23e4df8ab4 Merge "Make SEND_SAFETY_CENTER_UPDATE internal|privileged" into tm-dev am: b863765330 am: 9851671b92 am: 7d5c7652e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231665

Change-Id: I23227690fcc76133a53bbbb2ac2b9e46a650d2e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:48:24 +00:00
Nader Jawad
054c6d0c73 Merge "Fix memory leak with RenderNodeAnimator" into tm-dev am: b9a8ed8b70 am: b27c97ac73 am: 1f5355a4c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290468

Change-Id: Ib7581530a3b8823e20f831930e7a532a890ba01f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:48:17 +00:00
Matt Casey
45f2cb0922 Merge "Resolve NPE when mini resolver is rotated" into tm-dev am: ad48cd89e0 am: bf0d76e742 am: 931362feae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188891

Change-Id: I57a37e9da22e22b5122a0cbf209cf3f9f26e0d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:47:57 +00:00
Automerger Merge Worker
0f6dd91c3e Merge changes from topic "am-dc4525a0bcfa4e4e96c87d436cfb872b" into tm-qpr-dev-plus-aosp 
* changes:
  Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822a9 am: f97d55055f am: eb3b8b36ee
  RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs am: 50f529a1e1 am: d721a3edc0 am: d269bca402
 2022-05-11 21:47:30 +00:00
Kholoud Mohamed
6771014c8a Merge "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" into tm-dev am: e875e822a9 am: f97d55055f am: eb3b8b36ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: I475686bba0ffbe70d53c444a9c9af80cd860623b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:47:23 +00:00
kholoud mohamed
0f0e3c7fea RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs am: 50f529a1e1 am: d721a3edc0 am: d269bca402 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188748

Change-Id: Iab8158ef613b969100c6257f83350d2131233f00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:47:20 +00:00
Nate Myren
0fce30727a Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b54 am: 882e36e24c am: 214260900e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083366

Change-Id: Ie7352ac6e726445391b58be2617ceb63f811e4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:47:17 +00:00
Ronish Kalia
d91b204bec Merge "Use config instead of local string for qr scanner" into tm-dev am: bbd351fe0e am: 228d8b116e am: e5c5b39564 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186905

Change-Id: I3e473886bf08f977811138fa4a2ebb15ad8a5af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:47:01 +00:00
Yan Han
043983b187 Merge changes I0579b3af,If7ecd588 into tm-dev am: f7b504cece am: bdba73e302 am: 5444db2a36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18230085

Change-Id: Ib35fdf155e721d8b3265cabb72c9c98743758510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 21:46:52 +00:00