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

770747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Rosky
f2b01dc98c Merge "Use the pre-reset userLeaving for canPipOnFinish" into tm-qpr-dev am: 77a72dc470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298132

Change-Id: Icde57218525a96395a292ca09cba3220a8d43e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 00:55:26 +00:00
Evan Rosky
77a72dc470 Merge "Use the pre-reset userLeaving for canPipOnFinish" into tm-qpr-dev 2022-05-12 00:10:00 +00:00
Justin Koh
904294cf9b Merge "Add screensaver icon to DreamTile" into tm-qpr-dev am: bc501c5e02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18241784

Change-Id: I521b5915adf3090a4407e5cddc1826a39aee6e22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:53:25 +00:00
Justin Koh
bc501c5e02 Merge "Add screensaver icon to DreamTile" into tm-qpr-dev 2022-05-11 22:37:01 +00:00
TreeHugger Robot
cba547429c Merge "Prevent to revoke input focus from recentsAnimationInputConsumer" into tm-dev am: 7e6088fa86 am: 14bfac10a6 am: aab7c3092e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18167461

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

Change-Id: I043aa19224a97bf3f4252d4a97005eba76685176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:26:11 +00:00
Andy Hung
08af3f51d8 Merge "SpatializerHelper: Remove custom sensor handling" into tm-dev am: 1d5623f14b am: 6b2a5d39cc am: b23e503c94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290065

Change-Id: I6729ec74c58ab80a8a6b7b81c0bb408d92671e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:25:38 +00:00
Pavel Grafov
2e222d707e [automerger skipped] Merge "Allow profile owners to protect packages." into tm-dev am: 20bd378d55 am: c64a6989b7 -s ours am: d99c48415b -s ours 
am skip reason: Merged-In I2d1d33acad035610c8db365f69b7a15faa03a2d5 with SHA-1 91edfc163b is already in history

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

Change-Id: I5866e9ee24fe3c0d9677e8dd4c06bc1c0d8bd525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:25:22 +00:00
Chavi Weingarten
fe471ffe6b Merge "Lock in Surface#destroy" into tm-dev am: 1559113427 am: a4844e15aa am: 6f2d60a8c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283681

Change-Id: I6afda7d0c1ebbe28e6bd34025f3404e28a7d1cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:20:32 +00:00
Jonathan Scott
ad00ad44d6 Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev am: 7b11af45d1 am: 2ce51a336a am: 2e87d56fad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308199

Change-Id: Ic6586158946c8db882f416d2a9361b6790942d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:20:19 +00:00
Kholoud Mohamed
ab8270f48b Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" am: 00c0a92877 am: 649c2b2441 am: 8628bb8bfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308199

Change-Id: I72ddbc738a49d8a6548f7d68f3953f164bf27da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:20:17 +00:00
Zach Johnson
09f9c873d9 Merge "Check for installed bluetooth package name" into tm-dev am: 945df7d77d am: 909b15b74a am: c4675cfbf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17774836

Change-Id: Ia8b5e7d61cf999f0248fc03412d7416e482aca82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:19:54 +00:00
Eric Biggers
89fac0a18e [automerger skipped] Merge "UserDataPreparer: fix volume preparation order" into tm-dev am: 5815b8820e -s ours am: 27ecd72c92 -s ours am: 31d5810c97 -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: I8edfc6739ab7cd4e5ea0fece527b3b77665c02e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:19:21 +00:00
Eric Biggers
cdbbaf8f51 [automerger skipped] UserDataPreparer: fix volume preparation order am: a1c15b70f8 -s ours am: a9198b983d -s ours am: 6dfae59814 -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: I2f22350fb9c8e4aa80f09e57a6c807b8c95da9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:19:13 +00:00
Edgar Arriaga García
a25d9cd788 Merge "Resend remaining VMAs on partial compaction due to failure" into tm-dev am: a47d028ed0 am: 06d00ed61c am: 4c212c97dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18193321

Change-Id: Ia8a3f9ed19898614670f0645fbb752151f347329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:18:49 +00:00
Automerger Merge Worker
edc72af84a Merge "Merge "SpatializerHelper: Remove custom sensor handling" into tm-dev am: 1d5623f14b am: a68cbd6377" into tm-d1-dev-plus-aosp am: 833252f125 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290065

Change-Id: I5583f3de68acde5cf66b23f5dc070d6b4f8548ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:18:23 +00:00
Automerger Merge Worker
6cb4adbb93 Merge changes from topic "am-0ed08256e6f44b35bbcf3098e70eeea8" into tm-d1-dev-plus-aosp am: c7465bfdc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: Iad01a660aa44c05be3954e814ccfdcb31817a8be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:17:30 +00:00
Tom Chen
685b451337 Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev am: c6caf1cfdc am: 7e3fa37ba2 am: 01cfc5763b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17717683

Change-Id: I3ab3551fcd371a7e7dd4e6f4bf85b7c082b348a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:17:25 +00:00
Pavel Grafov
e9738bbe02 [automerger skipped] Merge "Allow profile owners to protect packages." into tm-dev am: 20bd378d55 am: 2f7db4e0c7 am: 44836e2f4e -s ours 
am skip reason: Merged-In I2d1d33acad035610c8db365f69b7a15faa03a2d5 with SHA-1 91edfc163b is already in history

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

Change-Id: I9a6c84fb2059572ddb7072fdc0897249b3094cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:15:53 +00:00
Brad Ebinger
a6ab405a1e Merge "Ensure create/destroy is called properly for Capability Exchange API" into tm-dev am: 82c131e385 am: cdb521ea73 am: 3365ede715 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18298852

Change-Id: I37275498710d1b667395aa3c7a26e4e524958d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:14:48 +00:00
Chavi Weingarten
b1bd401194 Merge "Lock in Surface#destroy" into tm-dev am: 1559113427 am: a8b7ca659a am: 20d8acc8a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18283681

Change-Id: Ifdb008214b4dc17930e682a1bbb96d721029a0b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:13:20 +00:00
Automerger Merge Worker
e11902e944 Merge "Merge "Restart location requests after HAL restarts" into tm-dev am: e19d5be9ad am: d9d53d5f05" into tm-d1-dev-plus-aosp am: 60365f0162 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18289083

Change-Id: I181cec9b4e808f20f7af0ecb96b0fb020e49ba5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:13:09 +00:00
Jonathan Scott
3abc028381 Merge "Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs"" into tm-dev am: 7b11af45d1 am: 4af57483db am: ac4a760d6c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308199

Change-Id: I4e2784be77e8da9e24d09c468272a3713b12d9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:12:39 +00:00
Kholoud Mohamed
55920cdba7 Revert "RESTRICT AUTOMERGE Add feature flag to disable resource updatability APIs" am: 00c0a92877 am: eaa93a9742 am: 6f5515d2a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308199

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

Change-Id: Idd131a21b15cfa8de9eb27c2825078eb36405a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:12:15 +00:00
Nader Jawad
c5d235b03e Merge "Fix memory leak with RenderNodeAnimator" into tm-dev am: b9a8ed8b70 am: 00f8c59af1 am: 60ecebe9dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18290468

Change-Id: I9cdd81e8789288a192f333445ed61b7be984d2ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:12:01 +00:00
Eric Biggers
ed5e1280b3 [automerger skipped] Merge "UserDataPreparer: fix volume preparation order" into tm-dev am: 5815b8820e am: 2ac2a8a7a2 -s ours am: 71eca6add4 -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: I64aebd1450751736285f6d3f97470959c50c777a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 22:11:47 +00:00
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