Commit Graph

84115 Commits

Author SHA1 Message Date
TreeHugger Robot
87e5157b5a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-14 18:09:47 +00:00
Bill Yi
0eab9c02b9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I962c318f41adcf180b885f2052ce0ec4952edfb6
2022-01-14 09:22:25 +00:00
Bill Yi
a6f38c19f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib7868c5698aef46813818165545a388552033564
2022-01-14 09:18:54 +00:00
Bill Yi
9d56130c5e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie7fde007b60291d37ac3283c0037c3717b2798be
2022-01-14 09:11:12 +00:00
Bill Yi
3bf676d7ce Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic57de1e9085d2e5ebc2a4eaaa38bdcbc1af70090
2022-01-14 09:09:42 +00:00
TreeHugger Robot
fc22f7f99f [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -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: If75738f8e8c3e4e6febfd77710e81613978153f2
2022-01-13 22:02:06 +00:00
TreeHugger Robot
8a91ea7add [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -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: If02ad441dd23232075e4fbe9b1927e795aed175e
2022-01-13 21:43:35 +00:00
TreeHugger Robot
0abbff1a86 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -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: I3a13d6cf9644292e474c5554e6423072aca2fb67
2022-01-13 21:37:42 +00:00
TreeHugger Robot
616aecf1ec [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -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: Iacff1f7f942431bba6f09a9f500a8e60ea394824
2022-01-13 21:25:16 +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
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
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
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
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
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
Edgar Wang
9624c50ac3 [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: I1f38d39b1da9d41bc9fbe5b9824bda7a3bcff77a
2022-01-13 07:21:11 +00:00
Edgar Wang
7f848f44b6 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127 am: c0d6987e06 -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: I72f294f9e8817aa2a5d694dd870115322f1525ec
2022-01-13 07:09:00 +00:00
Edgar Wang
c0d6987e06 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: f57d75f127
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579585

Change-Id: Icd26ee5a31e0cc7e11edaf6c542b045ab3a7ff01
2022-01-13 06:50:30 +00:00
Edgar Wang
b298270a03 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 am: e95b2c6c53 -s ours am: c46233f2c6 -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/+/16579586

Change-Id: Ia1f307d2766005815f113c441b748e1e7e0c88e0
2022-01-13 06:33:13 +00:00
Edgar Wang
c46233f2c6 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 am: e95b2c6c53 -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/+/16579586

Change-Id: I07509ceb33acd71e7166e1b6b21fe314143720c1
2022-01-13 06:20:38 +00:00
Edgar Wang
7aa26ea1e9 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours am: 463624d522 -s ours am: 0a298b167d -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: I764311dfb54d1f0df1e047b95343ac1e9e9d9d67
2022-01-13 05:57:46 +00:00
Edgar Wang
0a298b167d [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours am: 463624d522 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: Ie5a778da092bf3055ec6ccc8641b684d7f54ad46
2022-01-13 05:45:13 +00:00
Edgar Wang
761a605352 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours am: edcb9c9b0e -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I968ec3a812591dac1ec67d5b614d7739a1607e64
2022-01-13 05:40:26 +00:00
Edgar Wang
1ca7d315db [automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32f5 is already in history

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

Change-Id: Ibd39dbbcfca577d349e68a971c6fe559323956b3
2022-01-13 05:40:19 +00:00
Edgar Wang
e95b2c6c53 Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579586

Change-Id: I3311a1514d0edeca1011642e2a368b7aa6eeb170
2022-01-13 05:40:08 +00:00
Edgar Wang
463624d522 [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16 -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa4d is already in history

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

Change-Id: I5e42a5a8939af57523b1691c5f525df746e94ac1
2022-01-13 05:39:53 +00:00
Edgar Wang
edcb9c9b0e [automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d -s ours
am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 9926187972 is already in history

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

Change-Id: I6bf44b9e56ac21a73b7ea20b756a4d93a438e485
2022-01-13 05:39:03 +00:00
Edgar Wang
2df76f6062 Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev 2022-01-13 05:27:40 +00:00
Edgar Wang
36a989cdff Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev 2022-01-13 05:27:31 +00:00
Alex Johnston
d8124d47f0 Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092

Change-Id: Ifbce4430f251b7b152538520f318e62900ea64b0
2022-01-11 21:09:59 +00:00
Alex Johnston
ff07f8c34d Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev 2022-01-11 20:47:35 +00:00
Alex Johnston
6407b20ab3 Add caller check to com.android.credentials.RESET
* Only the Settings app can reset credentials
  via com.android.credentials.RESET.
* com.android.credentials.INSTALL should still be
  callable by CertInstaller.

Manual testing steps:
* Install certificate via Settings
* Verify unable to reset certificates via test app
  provided in the bug (app-debug.apk)
* Verify able to reset certificates via Settings
* Verify com.android.credentials.INSTALL isn't changed

Bug: 200164168
Test: manual
Change-Id: I9dfde586616d004befbee529f2ae842d22795065
(cherry picked from commit 4c1272a921)
Merged-In: I9dfde586616d004befbee529f2ae842d22795065
2022-01-10 17:45:00 +00:00
Alex Johnston
f8a1a563c7 Add caller check to com.android.credentials.RESET
* Only the Settings app can reset credentials
  via com.android.credentials.RESET.
* com.android.credentials.INSTALL should still be
  callable by CertInstaller.

Manual testing steps:
* Install certificate via Settings
* Verify unable to reset certificates via test app
  provided in the bug (app-debug.apk)
* Verify able to reset certificates via Settings
* Verify com.android.credentials.INSTALL isn't changed

Bug: 200164168
Test: manual
Change-Id: I9dfde586616d004befbee529f2ae842d22795065
(cherry picked from commit 4c1272a921)
Merged-In: I9dfde586616d004befbee529f2ae842d22795065
2022-01-10 17:39:47 +00:00
TreeHugger Robot
ad7ea804d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf86012a9197656e463869fa55785efadf1230c8
2022-01-09 05:34:35 +00:00
Bill Yi
dcd2b90022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07cdae04675495c5ed06cd0effdf2381939e54f2
2022-01-09 05:34:28 +00:00
TreeHugger Robot
fad8ac95a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-09 05:14:26 +00:00
TreeHugger Robot
cc94febb28 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-09 05:14:18 +00:00