PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,440 Commits 1 Branch 0 Tags
0dea418d575db2d7b141ac4a93094e5533d3b59c
Commit Graph

100440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f0c66b61ce [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 887a7b5c43 -s ours am: 16e91b5782 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I26e4f45f305f1ef9dfa919e68c1c0d374b84ce8c
 2022-01-13 21:20:02 +00:00
TreeHugger Robot
06b045547a [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 638c6fb3fc -s ours am: f4dd91931b -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: Ic469d219fce25a0a5e367d5d39a7b60ccbb8a6a3
 2022-01-13 21:19:41 +00:00
TreeHugger Robot
97729a9e16 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I0c4662c0cda74c28d2385ade52a345e84086bbc9
 2022-01-13 21:06:55 +00:00
TreeHugger Robot
02a19ec59d [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I34d7fec987c297fbb846888d9cf187d0a0f7321c
 2022-01-13 21:06:50 +00:00
TreeHugger Robot
16e91b5782 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 887a7b5c43 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I664394c55298a4bb751f9d709c3ff4a54b098cae
 2022-01-13 21:06:23 +00:00
TreeHugger Robot
f4dd91931b [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 638c6fb3fc -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I9100456ceedb6b084af41000054d033dde94ff86
 2022-01-13 21:04:38 +00:00
TreeHugger Robot
f7995298c5 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: f74fe2981a -s ours am: 095c123e60 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I2a1bf9fe9e7eaa8d1a4053ad73092c2ac8fa658c
 2022-01-13 20:51:05 +00:00
Automerger Merge Worker
50f73dae18 Merge "[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: 76fba21fa8 -s ours" into sc-v2-dev-plus-aosp am: aebae8faba -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 6407b20ab3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I297ac9fbfdcd0c866f6283645c247c35855a5d06
 2022-01-13 20:50:53 +00:00
TreeHugger Robot
62c0e2a7a8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: ab8b39c5e0 -s ours am: 701fe2cfde -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Ib32e2370dff4232ccf07726578aee291fe2b3d90
 2022-01-13 20:50:39 +00:00
TreeHugger Robot
638c6fb3fc [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I59fe851b88df7c4fbf48c384c78d9af03bc7c673
 2022-01-13 20:50:16 +00:00
TreeHugger Robot
887a7b5c43 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: Ia6e5b90c5642742dd540e9a2d15efa51dfffa174
 2022-01-13 20:50:16 +00:00
Automerger Merge Worker
1513a9845d Merge "[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: 45bfdf58b9 am: d8e43e80c0 -s ours" 2022-01-13 20:49:18 +00:00
TreeHugger Robot
72c6695ec8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: 45bfdf58b9 am: d8e43e80c0 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I1354f8ae1e127cab688de0a10d670af5e0bf5e8f
 2022-01-13 20:49:12 +00:00
TreeHugger Robot
b321a097f6 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 5f960a59ba -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I7191797d5ad7ff1d89e499eafcd3211bddd03119
 2022-01-13 20:49:06 +00:00
TreeHugger Robot
3f6a48a552 Merge "Add caller check to com.android.credentials.RESET" into rvc-dev 2022-01-13 20:43:35 +00:00
TreeHugger Robot
9f4837e276 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I858b821fe9d17c4c46d61cb0dc57025b454cbc7e
 2022-01-13 20:32:00 +00:00
TreeHugger Robot
095c123e60 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: f74fe2981a -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Ia6035dc9e4de2d740c71529b831066885b6e34c6
 2022-01-13 20:31:44 +00:00
Automerger Merge Worker
aebae8faba Merge "[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: 76fba21fa8 -s ours" into sc-v2-dev-plus-aosp 2022-01-13 20:31:41 +00:00
TreeHugger Robot
e1027822ed [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: 76fba21fa8 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I76cb26b5fc9c4afbf5be481372d2e9bab98c0420
 2022-01-13 20:31:37 +00:00
TreeHugger Robot
701fe2cfde [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: ab8b39c5e0 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I034ac7eeb1557b79fad15ef4a52d8f5d62668997
 2022-01-13 20:31:35 +00:00
TreeHugger Robot
d8e43e80c0 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: 45bfdf58b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Iaced4c96addd8b30fc9eb63f65d496ec122530bd
 2022-01-13 20:31:28 +00:00
TreeHugger Robot
5f960a59ba [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I6d2a2287357037a96d9b9c1fbb7d012a0d19effc
 2022-01-13 20:30:55 +00:00
Nate Myren
232962c3f2 Create PrivacyControls page in settings 
Current strings are WIP, no entry point. Also updates a few remaining
EXTRA_PERMISSION lines to EXTRA_PERMISSION_GROUP

Test: build
Bug: 194816787
Change-Id: I347b3011e1f51bd11dca92471ba8ba77e2d758e5
 2022-01-13 12:24:21 -08:00
TreeHugger Robot
f74fe2981a [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I426970b84625e07872ab3973336a1c4133ef42a5
 2022-01-13 20:20:45 +00:00
TreeHugger Robot
76fba21fa8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I6cce0aeefff778c09b3b8b531299cbb82e9bb5d9
 2022-01-13 20:20:43 +00:00
TreeHugger Robot
ab8b39c5e0 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I9def541c37fcc068c201abd75394cd3623b8db16
 2022-01-13 20:20:36 +00:00
TreeHugger Robot
45bfdf58b9 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Idb425f3dff3259ba3e121a5cbad0cf1cc4feb36b
 2022-01-13 20:20:35 +00:00
TreeHugger Robot
e3b118ded0 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: f61e4e04c8 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Ie9ea8c60bbbd7090493386fc57bc1c3ba3f5f19d
 2022-01-13 20:19:31 +00:00
TreeHugger Robot
b7c5bb42fa [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: e7ca4bcfb7 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 4c1272a921 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I9be81480a0705cf5c289ad9b95a853ece5d28a63
 2022-01-13 20:19:19 +00:00
TreeHugger Robot
b04e0ab405 Merge "Add caller check to com.android.credentials.RESET" into sc-dev 2022-01-13 20:19:00 +00:00
TreeHugger Robot
3e06e0c112 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I19a4cf6f214fa4d6766486a6fea2b82cf7bbc6a2
 2022-01-13 20:01:01 +00:00
TreeHugger Robot
3a4ebbfcec Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I16e704faf7e99596482855c90816b1c3bcf6ca69
 2022-01-13 20:00:55 +00:00
TreeHugger Robot
f61e4e04c8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I79f941fe262a0f9177ab8f9d3b3c4cef751ec0af
 2022-01-13 19:59:57 +00:00
TreeHugger Robot
e7ca4bcfb7 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I9b5f7003ce9011b941dfaf3325df2985daf6e012
 2022-01-13 19:59:48 +00:00
TreeHugger Robot
01739e127c [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Iff74bcb5c45d9bd9e2a7766fb00c38d289150d1e
 2022-01-13 19:48:23 +00:00
TreeHugger Robot
ea3d0361c8 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I490a23c20a60933dff04251cdf8ba4f24c361e97
 2022-01-13 19:47:30 +00:00
TreeHugger Robot
67f53e247a Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I6593507b33223cf79fbf0e134651b78b93464a01
 2022-01-13 19:35:55 +00:00
TreeHugger Robot
d902f8c7d6 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I7080ca5b236b6dd34cfe66789ef1a141d3b735cb
 2022-01-13 19:35:50 +00:00
TreeHugger Robot
f43f129dc0 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Ibc94e102fc69e4e2052526e1ee000684c5d7724f
 2022-01-13 19:18:08 +00:00
TreeHugger Robot
1ef5f42b54 Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I8dae6a8a3fd0ed7cde335ead1e4b760bb5a8d195
 2022-01-13 19:04:05 +00:00
TreeHugger Robot
50b65a168a Merge "Add caller check to com.android.credentials.RESET" into qt-dev 2022-01-13 18:50:36 +00:00
Yasin Kilicdere
d9281c887a Make sure activity for adding a supervised user is opened full screen. 
Add supervised user activity only covers the right hand side of the
screen in large screen devices. This CL makes sure it is always
started from Settings with correct flags to be shown full-screen.

Bug: 214401383
Bug: 205101183
Bug: 199868785
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: If81e0cce91a5295eb2b93b12f68b70fd1240c953
 2022-01-13 18:46:19 +00:00
Etienne Ruffieux
70c9f89e6f Replaced use of Bluetooth resource by SystemApi 
Bluetooth resources are moved to the Bluetooth module,
we need to clear all existing usages of these resources.
Updated existing tests.

Tag: #feature
Test: make RunSettingsRoboTests
Bug: 211570675
Change-Id: I0f76df5043e69ed33cca40af3c32ac5b922b79ef
 2022-01-13 17:22:35 +00:00
Jimmy Chen
d0e27f8dbd Merge "wifi: add Trust-On-First-Use option for CA" 2022-01-13 15:42:46 +00:00
PETER LIANG
e26c0ec801 Merge "New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (4/n)." 2022-01-13 14:57:06 +00:00
Peter_Liang
93668d6002 New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (4/n). 
- Extending the interface of AppGridView to be flexible. It will be used
in the TextReadingPreferenceFragment.
  1. Add a new attribute "appCounts" into the view.
  2. Default app counts as 6 if not set the attribute.

Bug: 211503117
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER=AppGridViewTest
Change-Id: I94a5f1d037551f6faba0300a176feb11fba1f203
 2022-01-13 18:56:16 +08:00
kholoud mohamed
73ba56ff55 Change the managed profile icon for profile selector 
Switched to using PackageManager#getUserBadgeForDensityNoBackground which returns a
drawable that could be updated by the device management role holder.

Bug: 203548565
Bug: 188414370
Test: manual
Change-Id: I6b6bd9eceb90e16afa6d1fa52f3a7cd342a1f1ba
 2022-01-13 10:15:58 +00:00
TreeHugger Robot
e9ca51918c Merge "USB: move help config flag to FW" 2022-01-13 08:38:44 +00:00
Edgar Wang
b95618bed0 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours am: 4002e2c124 -s ours am: 9d1b730058 -s ours am: 8c93d2d016 -s ours am: 34203ad739 -s ours am: 724fff2094 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 dc44d01a16 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579585

Change-Id: Ic254f70f5ef04a162c0dbabeb5cef5aa49ed486b
 2022-01-13 08:26:26 +00:00
Edgar Wang
ca0afe6b43 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -s ours am: 7f848f44b6 -s ours am: 9624c50ac3 -s ours am: 4154382e01 -s ours am: 2a6851f803 -s ours am: 256f4849b1 -s ours am: 6f318f32a9 -s ours 
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 dc44d01a16 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579585

Change-Id: I20ad9c6398fc83d0afa0f59e7cffa690e532a804
 2022-01-13 08:26:16 +00:00