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
Edgar Wang
037411349d
[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: 036e8b4de2
-s ours am: 64129fe0bd
-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: I25bd6ac3e2f47202cbb7870eb2fd2beb09294ca0
2022-01-13 08:26:06 +00:00
Edgar Wang
e42d435067
[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: f000e74151
-s ours am: 46424e527f
-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: I6eb7948f7418581eff279ef320f3476df9ebfeec
2022-01-13 08:25:54 +00:00
Edgar Wang
724fff2094
[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 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: I808d62c716cb09163b5480694171e1f425a6f783
2022-01-13 08:20:29 +00:00
Edgar Wang
6f318f32a9
[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 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: I20c10707baa06f3fcde54a1a110ff329e356228a
2022-01-13 08:20:18 +00:00
Edgar Wang
64129fe0bd
[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: 036e8b4de2
-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: Ib52d1d2b74bb375c02f932f2d462b4910675e124
2022-01-13 08:15:02 +00:00
Edgar Wang
46424e527f
[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: f000e74151
-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: If19c243a2f6edc0770efa2153f97100de3f205fa
2022-01-13 08:14:48 +00:00
Edgar Wang
34203ad739
[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 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: I4a0bf65b252ebecd3728a121c9254f72cafb2a16
2022-01-13 08:03:06 +00:00
Edgar Wang
036e8b4de2
[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 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: I6b9982c6ca1da2c0f18707f28f43229a81d65b40
2022-01-13 08:03:03 +00:00
Edgar Wang
256f4849b1
[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 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: I1992426209c960efe2793f1a66c25937f39deca1
2022-01-13 08:02:56 +00:00
Edgar Wang
f000e74151
[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 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: I5b94b084866aba9fcefa8f756a934526b90bcd5e
2022-01-13 08:02:56 +00:00
Edgar Wang
f81170a51e
[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: ad6f175d78
-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: Ifb3375d9aabf7bdfb17ddcfdd459a7ee8d390007
2022-01-13 07:56:14 +00:00
Edgar Wang
a773393e12
[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: 3498634630
-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: If69abbeb08e6ef02a7aca579f2cb1e607f224119
2022-01-13 07:56:02 +00:00
Edgar Wang
8c93d2d016
[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 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: If950d32d048b08e4c918f908b2ec0d190189617e
2022-01-13 07:45:42 +00:00
Edgar Wang
2a6851f803
[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 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: Ic35bf7131db5ecabb1f355850f0d0f45ab74ccb3
2022-01-13 07:45:35 +00:00
Edgar Wang
ad6f175d78
[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 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: I9b4a83df360befb6b2bdcceab87c990970226817
2022-01-13 07:44:44 +00:00
Edgar Wang
3498634630
[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 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: I8ded300b64ae32d51468e30f8959fad6513b5a59
2022-01-13 07:44:34 +00:00
Edgar Wang
9d1b730058
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127
am: c0d6987e06
-s ours am: 7f848f44b6
-s ours am: 4002e2c124
-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: I38dd848bc2c0f47649ee53a4c1815363a3e4ac57
2022-01-13 07:32:27 +00:00
Edgar Wang
4154382e01
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127
am: c0d6987e06
-s ours am: 7f848f44b6
-s ours am: 9624c50ac3
-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: I3964ad2a91446210b9db2b549b13bacace3c44f0
2022-01-13 07:31:53 +00:00
Edgar Wang
4002e2c124
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127
am: c0d6987e06
-s ours am: 7f848f44b6
-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: I587522a9692116826e16409f40c7fe3bebf4b362
2022-01-13 07:21:15 +00:00