Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
827,321 Commits 3 Branches 0 Tags
0cc16dc7b82ee2e13d4768bbd4a23a176363d4fe
Commit Graph

827321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Caitlin Shkuratov
0cc16dc7b8 Merge "[SB Refactor] Turn off flags for teamfood." into tm-qpr-dev am: acd24598da am: 1b49eeaf1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19734395

Change-Id: I7cce7cc64b62bc56805aa0e6e6cb8808fead2bbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:51:39 +00:00
Jeff Sharkey
7b053a9e12 Merge changes from topic "aug24" 
* changes:
  [3/3] Factor out current BroadcastQueue implementation.
  [2/3] Factor out current BroadcastQueue implementation.
  [1/3] Factor out current BroadcastQueue implementation.
 2022-08-24 19:50:35 +00:00
Caitlin Shkuratov
1b49eeaf1a Merge "[SB Refactor] Turn off flags for teamfood." into tm-qpr-dev am: acd24598da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19734395

Change-Id: Ief7ad4976c5002e3080ce3717c36d4d842f5bd69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:31:17 +00:00
Nate Myren
f82b80203f Merge "Revert "Add GET_USAGE_STATS to RUNTIME_AND_APPOP_PERMISSIONS_OPS"" 2022-08-24 19:28:23 +00:00
Oli Lan
78dadb2362 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: 514eaefa2c -s ours am: d1a5e1f023 -s ours am: afab4a1597 -s ours am: 9538034f39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie04c89ce68a6fb92a415f31fb46b8a446efb6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:14:18 +00:00
Oli Lan
76544ef2f4 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: 8af031ff0e -s ours am: e6958f175a -s ours am: 2aa8cf3e58 -s ours am: ee914f2b16 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50a309bf3c37e344dfa640166ecb2d58ea06f3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 19:14:04 +00:00
Caitlin Shkuratov
acd24598da Merge "[SB Refactor] Turn off flags for teamfood." into tm-qpr-dev 2022-08-24 19:09:46 +00:00
Oli Lan
00e47f5359 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: ede7acde4b -s ours am: 351025e8a3 -s ours am: 7eae1bbf8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I900085bfab95f58f3557ea1aa9224f51fad22143
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:56:13 +00:00
Oli Lan
dcf7eff0f3 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: 0ebdf370a7 -s ours am: 931afc5f21 -s ours am: 3fd6a4f3a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icba43c3bb985891cb4140b1210df56c724deea36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:55:57 +00:00
Oli Lan
8edbaa0da7 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 23daf1cf1e -s ours am: 48a407c9f7 -s ours am: eff224a8c0 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I051d05806d9ffa9b17170e8641df8daebe78a379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:55:04 +00:00
Oli Lan
3fdec95e61 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours am: a03bec424a -s ours am: 75275e1b45 -s ours am: 9083ca4467 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: Iae0a59d2de2753288ec02da625881723e1352ba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:54:35 +00:00
Oli Lan
919a7c0868 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: 421657eb10 -s ours am: a80c234b3a -s ours am: b663cf6962 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d730defad45655bde5b999c5791ebda44b317e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:54:04 +00:00
Oli Lan
7ec9f09668 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: d39de3ca27 -s ours am: ac3d035a8c -s ours am: 8772a58871 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25d9601ed860b012857ae2ed6bc09fdbe0092167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:53:31 +00:00
Oli Lan
91d7b8e7fb [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 181db6aa71 -s ours am: 1bd04d17eb -s ours am: 839d5ae90c -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I184277cfb202dadbedf6a833abcfda8fc4aece9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:53:01 +00:00
Oli Lan
b8096aa820 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours am: 73f3f3cc1b -s ours am: 579de6be17 -s ours am: 4ab7da3b8a -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: Ia97b66947b72a220e8d02c8ae5028fee50713cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:52:06 +00:00
Oli Lan
654f3d020a [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: ede7acde4b -s ours am: 5d873e955a -s ours am: d5d14f1987 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cf7dcb738747ca7feffd323f320eb0b29b29eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:51:35 +00:00
Oli Lan
7e4c49fc44 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: 0ebdf370a7 -s ours am: f80481b01a -s ours am: 10d854796f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4576abdbaf07829ad3904a41c623a087983d784e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:50:56 +00:00
Oli Lan
325f67f524 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 23daf1cf1e -s ours am: 36830dd90d -s ours am: 91b2bb3526 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I14d14b224183824828b835f3ef2e889edbae83aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:50:27 +00:00
Oli Lan
eba2f84761 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours am: a03bec424a -s ours am: e8d36bb2c8 -s ours am: 1624080065 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I5e83c378c76007fa489f16f960f0f67a96d1f6b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:49:37 +00:00
Anna Bauza
1ddd760f2b [automerger skipped] Merge "Add Android Multiuser Atom which will contain number of supported users." into tm-qpr-dev am: 661265f485 am: 386f5f2ce6 -s ours 
am skip reason: Merged-In I3cfbd2f79e71df6b2952d73d5a2bd20268708129 with SHA-1 c3249a8704 is already in history

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

Change-Id: Idef42fd3214b237f27147d4efa0bbf7129c07a56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:49:02 +00:00
Andy Hung
d21c4ac872 [automerger skipped] Merge "SpatializerHelper: Fix device name translation" into tm-qpr-dev am: 48f95ff5ab am: 491c08b668 -s ours 
am skip reason: Merged-In Ic6cbeb8bfadbe961eea04517a404b49db9eb2b34 with SHA-1 5b3731851f is already in history

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

Change-Id: I49ed91c11d7ddd93edc2fb31e627ef8fad1dbdeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:48:06 +00:00
Mark Renouf
9542cb33be Merge "Adds test coverage for TakeScreenshotService" into tm-qpr-dev am: b53e6934fa am: c0d9771e8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19716856

Change-Id: If797c61568c54910721f43ee67580a2e9334803e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:46:32 +00:00
Andy Hung
1d3634b46d [automerger skipped] Merge "AudioSystem: Fix hdmi name typo" into tm-qpr-dev am: bca24335ac am: 60fe7b36ed -s ours 
am skip reason: Merged-In I4e2c14f49d96f2bde98b3274233f0dd2083134bb with SHA-1 799bb3e978 is already in history

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

Change-Id: I4bdc5ee94deb9afeba40904ebd86acbfd20cecee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:45:14 +00:00
Alejandro Nijamkin
5e3fb6163d Merge "Deletes SysuiLifecycle." into tm-qpr-dev am: cb0d0ff844 am: 07eee765b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19716136

Change-Id: I6470f0c61fa0570addc4dbd62868f181038b300a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:42:59 +00:00
Oli Lan
9538034f39 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: 514eaefa2c -s ours am: d1a5e1f023 -s ours am: afab4a1597 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf7c61d8ce2f2c3cdd16f3daddac71ff2ba9365d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:42:13 +00:00
Oli Lan
ee914f2b16 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: 8af031ff0e -s ours am: e6958f175a -s ours am: 2aa8cf3e58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8046fd5bcbc24091b6befdee30ead9c7e9c66cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:42:11 +00:00
Caitlin Shkuratov
1410400b44 [SB Refactor] Turn off flags for teamfood. 
Bug: 238425913
Test: compiles
Change-Id: I6c8c5e93cf00d598a3e68d7158421ed1145324a7
 2022-08-24 18:37:10 +00:00
TreeHugger Robot
bb96a3ee55 Merge "wait-for-broadcast-idle before stopUser in UserLifecycleTests." 2022-08-24 18:33:37 +00:00
Oli Lan
7eae1bbf8f [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: ede7acde4b -s ours am: 351025e8a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e87b79dfe8c0bf2652f86c37d6a8814a0aaea68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:26:14 +00:00
Oli Lan
3fd6a4f3a8 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: 0ebdf370a7 -s ours am: 931afc5f21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id8b19397dc131f18c938ace8b21182da93695185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:26:07 +00:00
Oli Lan
eff224a8c0 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 23daf1cf1e -s ours am: 48a407c9f7 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I495bb8fb7afaa6a35b97c242ad5de85a99cf9a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:25:51 +00:00
Oli Lan
9083ca4467 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours am: a03bec424a -s ours am: 75275e1b45 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I16af368a6eff4787cf9d482493c69288218a957f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:25:39 +00:00
Oli Lan
b663cf6962 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: 421657eb10 -s ours am: a80c234b3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b753cbebb970ce42d38437b3d917039d30cd025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:25:10 +00:00
Oli Lan
8772a58871 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: d39de3ca27 -s ours am: ac3d035a8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67790d1532e44d54f038b7a46ed6f6998056a48b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:25:05 +00:00
Oli Lan
839d5ae90c [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 181db6aa71 -s ours am: 1bd04d17eb -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I4fe1a1f833e506d0a7f445433dc3b71fec515f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:24:43 +00:00
Oli Lan
4ab7da3b8a [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours am: 73f3f3cc1b -s ours am: 579de6be17 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I6ce15483efb852420b4ca1905a0ecb0a3e88f6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:24:06 +00:00
Oli Lan
d5d14f1987 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: ede7acde4b -s ours am: 5d873e955a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94e64d27388b1a5d117b0f82b4b376e13618cc8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:22:40 +00:00
Oli Lan
10d854796f [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: 0ebdf370a7 -s ours am: f80481b01a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffeaf72162f4adde74408e80f1c28565be190323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:22:34 +00:00
Oli Lan
91b2bb3526 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: 23daf1cf1e -s ours am: 36830dd90d -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: If1fb3c932ff942e86d4ae3d4b8ab228960d2710f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:21:38 +00:00
Oli Lan
1624080065 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours am: a03bec424a -s ours am: e8d36bb2c8 -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I3436e019d802b153d6cf2b2a13483e2e850e88b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:21:14 +00:00
Anna Bauza
386f5f2ce6 Merge "Add Android Multiuser Atom which will contain number of supported users." into tm-qpr-dev am: 661265f485 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19715873

Change-Id: I408738843e8700293d77dd1d41a415e98581b1b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:20:38 +00:00
Andy Hung
491c08b668 Merge "SpatializerHelper: Fix device name translation" into tm-qpr-dev am: 48f95ff5ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697119

Change-Id: Ib929d106375aad792a249a029c13bf7b4a600580
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:18:26 +00:00
Oli Lan
1516195122 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: 4bdb2ee120 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2e79958fa77660e9b05ceb811e154b794fb91bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:17:51 +00:00
Mark Renouf
c0d9771e8a Merge "Adds test coverage for TakeScreenshotService" into tm-qpr-dev am: b53e6934fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19716856

Change-Id: I8e99b6913f4764e07bd9d1909a3f72dca3ed4813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:17:24 +00:00
Oli Lan
9852f01266 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: 80f8066792 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia555dc933d41c73bec7d02f3b0d6df542e5eed22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:17:22 +00:00
Oli Lan
1a96bdcdf2 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fee26edc80 am: 044600c74e -s ours am: 3392b69c87 -s ours am: b0e4bbcb7a -s ours 
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

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

Change-Id: I83a345f02ed0b4564e53e2d4aa978b56d5133f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:16:49 +00:00
Oli Lan
351025e8a3 [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: ede7acde4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I76c758553acc3c28f9b647940bbc3dc47797de98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:16:44 +00:00
Oli Lan
5d873e955a [automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." into qt-dev am: adafc9cb0f am: 02101eec31 -s ours am: 35868459ce -s ours am: 4bbf0d99f4 -s ours am: df9c2c7df0 -s ours am: efd6628052 -s ours am: 620cc32ffe -s ours am: ede7acde4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0aebfa68206e9b31097a60512468f794ab76a4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:16:38 +00:00
Oli Lan
931afc5f21 [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: 0ebdf370a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8b5bfa83c016ff3a5ad77c3decf0f79837e4f717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:16:38 +00:00
Oli Lan
f80481b01a [automerger skipped] RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4 am: 4c5aaf952b -s ours am: 4523b61a18 -s ours am: 1f3cf27c90 -s ours am: 8a71c13c4a -s ours am: d7b3d7d217 -s ours am: 330adeadc4 -s ours am: 0ebdf370a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e4a4361c850be75e327f778ae6cf7f85887c4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-24 18:16:33 +00:00