Bill Yi
|
c09b5ba58d
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e4ca28a0d0
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16712348
Change-Id: Ie58b5d18d82912aa129715db7a7480aa523b3326
|
2022-01-25 06:25:53 +00:00 |
|
Bill Yi
|
e4ca28a0d0
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I09e6df9ed565dcd098d1b1a98c51786fe5d87785
|
2022-01-25 06:25:43 +00:00 |
|
Bill Yi
|
abf6fc3cde
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ea0d5d717a9d1126b53b41d5461ce43cbc3e868
|
2022-01-25 06:11:20 +00:00 |
|
Jack Yu
|
a579ca7554
|
Do not let guest user disable secure nfc
Bug: 209446496
Test: manual
Merged-In: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
Change-Id: I7253f7f08fde04e30400a30d9a0d24f1ceff04b0
(cherry picked from commit d9e3e6e4b1)
|
2022-01-22 07:56:25 +00:00 |
|
TreeHugger Robot
|
9b153e3bd4
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
|
2022-01-15 19:45:22 +00:00 |
|
TreeHugger Robot
|
1f889d54e0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 572b59c465 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637238
Change-Id: I302cb85c51e48fcf9b5bfb04aee10cbf1f7d0979
|
2022-01-14 18:33:11 +00:00 |
|
Bill Yi
|
1179a58d9f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a6f38c19f8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637484
Change-Id: I48d29a773ac44e8dca5917ba7e49e9cb7cf9c7dd
|
2022-01-14 18:31:29 +00:00 |
|
TreeHugger Robot
|
572b59c465
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
|
2022-01-14 18:09:51 +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
|
3bf676d7ce
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic57de1e9085d2e5ebc2a4eaaa38bdcbc1af70090
|
2022-01-14 09:09:42 +00:00 |
|
Bill Yi
|
309dfa85f8
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I14169aab5b628d8559680f553d43488f98a3e61b
|
2022-01-14 09:05:29 +00:00 |
|
Bill Yi
|
1ec6a5c572
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I25e71adccb1ccbdad52e5c659c22708388010c70
|
2022-01-14 09:01:53 +00:00 |
|
TreeHugger Robot
|
a4f683f53e
|
[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: I115e726c34bef7c2c763c55f12e3af244527e449
|
2022-01-13 22:00:54 +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
|
3c427d1702
|
[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: I4c7244679855404fd5842d0e3e7ab407a6d07f4f
|
2022-01-13 21:36:49 +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
|
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 |
|
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
|
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 |
|
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 |
|
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
|
0aaaf2da05
|
[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: I61e5e5a355059111d07bfa47f1b8785c59ca9a3f
|
2022-01-13 06:32:04 +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
|
0176f0dccd
|
[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: I25fbef4a9b5d8799b36d5a588985d2508e9ecde2
|
2022-01-13 05:56:50 +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
|
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
|
c363b9f075
|
[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: I8f21f65450c0c3d9cb9f976e94273d5a35444094
|
2022-01-13 05:39:37 +00:00 |
|
Edgar Wang
|
cea95e05ca
|
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588
Change-Id: Id08f433e70d184be4d38db04c5a4097ca6a803b1
|
2022-01-13 05:39:31 +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 |
|
Alex Johnston
|
7bf45c4006
|
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: I2a1621fcddeded97c93ef41e809a7c60f13f7235
|
2022-01-11 21:08:42 +00:00 |
|
Alex Johnston
|
ff07f8c34d
|
Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev
|
2022-01-11 20:47:35 +00:00 |
|