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
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
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
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
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
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
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
522338d0eb
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16
am: e95b2c6c53
-s ours am: c46233f2c6
-s ours am: b298270a03
-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: Ia90b46f3e3c1aa99abfe2305c94ab640bc637c49
2022-01-13 06:45:18 +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
fcfb6ddb2a
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: dc44d01a16
-s ours am: 463624d522
-s ours am: 0a298b167d
-s ours am: 7aa26ea1e9
-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: I15e9dfe04b26439c6d17a746665f347d26c5a3fe
2022-01-13 06:10:12 +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
56eb657908
[automerger skipped] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment am: 8e7cc8fa4d
-s ours am: edcb9c9b0e
-s ours am: 761a605352
-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: I43c83b3770e67629d3690730ffd82fece99b7e41
2022-01-13 05:40:55 +00:00
Edgar Wang
169e366ac3
[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f6062
-s ours am: 1ca7d315db
-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: If4f11c3200eaac9bc82dcf70f72268bd00f862d2
2022-01-13 05:40:48 +00:00
Edgar Wang
781a615a41
Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cdff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579589
Change-Id: Ice31d95883bab76241015851444c3feb6bfa4b3c
2022-01-13 05:40:41 +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
3fd5e0f7f8
Merge "Add non system overlay flag to RequestManageCredentials" into sc-dev am: ff07f8c34d
am: d8124d47f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16551092
Change-Id: Ia028b11274420bec314c22f967f0d7cbe0e88570
2022-01-11 21:33:10 +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
Treehugger Robot
5ea82e5955
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9
am: 039cdfd764
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134
Change-Id: I603a7c75d79b81f2b5e5809ed4292a5cba77a169
2022-01-11 09:46:19 +00:00
Treehugger Robot
039cdfd764
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134
Change-Id: I763f17465055f64f42093fac721e06ac2c81b286
2022-01-11 09:26:59 +00:00
Treehugger Robot
0ccb8750b9
Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages"
2022-01-11 09:06:50 +00:00
Junyu Lai
123f2e1581
[MS50] Remove NetworkTemplate#buildTemplate* usages
...
This is a no-op refactoring.
These functions are deprecated and replaced by
NetworkTemplate#Builder, use public API instead.
Test: make RunSettingsLibRoboTests
Bug: 204830222
Change-Id: Idc2a09d8e3789ca2c7a97691cfad4b2e2b417f0d
2022-01-11 02:53:03 +00:00
Treehugger Robot
c002768550
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours am: d7b3c851b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: Ib8828007c502460cab8675859efd53c79b358b61
2022-01-11 01:36:15 +00:00
Treehugger Robot
56786c8317
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours am: 8b4a0a04f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: I73e4abb51e6dfb3725a0b19a2c39d76ad18d7d4d
2022-01-11 01:32:53 +00:00
Treehugger Robot
d7b3c851b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 48c90fde8a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943804
Change-Id: Ia9a27700f722dc98f1ba8f9ff8f21ce7a2dbc0bd
2022-01-11 01:18:26 +00:00
Treehugger Robot
8b4a0a04f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe140a6410
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943805
Change-Id: If6ce83076908961edfe95a2f388d87a06a0efdf2
2022-01-11 01:15:44 +00:00
TreeHugger Robot
eb3e22d6f8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591753
Change-Id: I1c6b3ef2d40215c682ba5ff59b758e9a091ac75a
2022-01-11 01:03:43 +00:00
Bill Yi
7973db12a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16591754
Change-Id: Iac3fa529e4c286e699f140a779a56c3500c5391d
2022-01-11 01:02:26 +00:00
Treehugger Robot
48c90fde8a
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:54 +00:00
Treehugger Robot
fe140a6410
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-01-11 00:46:30 +00:00
TreeHugger Robot
8e1e9adc14
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2022-01-11 00:41:52 +00:00
Bill Yi
0b57480c1a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f04568a54e4b9ed91a16579f210fd320e317e5e
2022-01-10 17:06:49 +00:00