Tetiana Meronyk
|
53a45bea3d
|
Remove overflow from guest user settings
- Removed overflow for guest users
- Code cleanup
Bug: 191509236
Test: atest UserSettingsTest
Change-Id: I1ccf9924a471f148bf6413a040ccc769f9293c97
|
2022-08-23 14:25:59 +00:00 |
|
Automerger Merge Worker
|
a5789ddaa3
|
Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: ad5444df28 am: f2220437ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ife8ee8bf4755cd93317dc6e11968629f14e76ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:41:17 +00:00 |
|
TreeHugger Robot
|
920c70da3c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: a31f4bd4de -s ours am: 614943029f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I4c339e6159363349220d24d929427da0f187c985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:40:59 +00:00 |
|
TreeHugger Robot
|
8638f1a9f3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: aa3a5a8e5f -s ours am: 9313d8a22a -s ours am: 7132b78cd2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ic0eccd3825e7d6fc44d7c7c8d78489ee216138bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:37:25 +00:00 |
|
Bill Yi
|
56577277de
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: c6fcf4dd69 -s ours am: 03694f9b15 -s ours am: 7bef9eab0f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I4b081431cd5db5fa63dee5f8f41c2256be427a7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:37:03 +00:00 |
|
Automerger Merge Worker
|
f2220437ba
|
Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp am: ad5444df28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: If3d42aa8f43328404c65ee659d1a5ebb438149b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:12:13 +00:00 |
|
TreeHugger Robot
|
614943029f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours am: a31f4bd4de -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ic97a2bd6beb54d3d555b80ed0377714f7ec0c04d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:11:58 +00:00 |
|
TreeHugger Robot
|
7132b78cd2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: aa3a5a8e5f -s ours am: 9313d8a22a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Id693f540436ffd8fe8a8745aaaa737ae667213f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:09:09 +00:00 |
|
Bill Yi
|
7bef9eab0f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: c6fcf4dd69 -s ours am: 03694f9b15 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Idacf29303b59a4c8d8995b81e77a6ebcc018472e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 07:08:51 +00:00 |
|
TreeHugger Robot
|
3cd548088b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 1a2d36a67f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ic9fb8cc721a79b6aa7c9de7abd9c63ce489b149f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:54:19 +00:00 |
|
Bill Yi
|
d64405dad1
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: 1399a1767a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Iff782408f3c36301c8fa05ff3cad7a0076000781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:54:05 +00:00 |
|
Automerger Merge Worker
|
ad5444df28
|
Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours
|
2022-08-23 06:52:09 +00:00 |
|
TreeHugger Robot
|
9313d8a22a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: aa3a5a8e5f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Icbc3f343aa07d0122481f2908c9b6d97aea4d30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:51:15 +00:00 |
|
TreeHugger Robot
|
a31f4bd4de
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours am: 4f819e1516 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Ibb4cb81dd2d8389d328d97cb4736888a8791b4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:51:10 +00:00 |
|
Bill Yi
|
03694f9b15
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: c6fcf4dd69 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I1f306f069b9c31b824091a7aafc43ef84b348cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:50:57 +00:00 |
|
Bill Yi
|
43e0cb70ee
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours am: f8f3b752ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I891d1b51f44b3da0074262eeb5b7a92f7598fe3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:50:52 +00:00 |
|
TreeHugger Robot
|
4f819e1516
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Iaa6359f18e9ab1bc55e1b98b25d634b893ff4cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:12:41 +00:00 |
|
Bill Yi
|
f8f3b752ea
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I2e8b27c3967b6a51860cb17f7da2ec6f5f53c4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:12:23 +00:00 |
|
TreeHugger Robot
|
1a2d36a67f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I57f34f8ac64d6750d2074f5d78f3960adcf146a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:11:32 +00:00 |
|
Bill Yi
|
1399a1767a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: I02006d4364d9a5c13ba8253b0e0855957fe1e92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:11:15 +00:00 |
|
TreeHugger Robot
|
aa3a5a8e5f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ad78b5a675 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: Iaeecd274c351d8e464dde1a2d47b97fe7dbc4768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:11:12 +00:00 |
|
Bill Yi
|
c6fcf4dd69
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32ddcf7c21 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694393
Change-Id: If536c05600e8c63286f3ca35e5526b3dd0179e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-23 06:10:54 +00:00 |
|
TreeHugger Robot
|
ad78b5a675
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
|
2022-08-23 05:47:36 +00:00 |
|
TreeHugger Robot
|
3a8f36148c
|
Merge "Properly reflect the default value."
|
2022-08-23 01:10:25 +00:00 |
|
YK Hung
|
e2125f5af3
|
Merge "Resolve insufficient contrast for system component icons"
|
2022-08-23 00:23:02 +00:00 |
|
Diya Bera
|
c273cb266c
|
Merge "Removed redundant face unlock option." into tm-qpr-dev am: 02ca9bd23e am: 0b34834c92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19645603
Change-Id: I2705711c1115b63603c7c45a80302a66a83648aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 22:39:21 +00:00 |
|
Diya Bera
|
0b34834c92
|
Merge "Removed redundant face unlock option." into tm-qpr-dev am: 02ca9bd23e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19645603
Change-Id: I1ad6fb329ecfdcffcecd8bb80b6d300b7bc9e0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 22:17:53 +00:00 |
|
Diya Bera
|
02ca9bd23e
|
Merge "Removed redundant face unlock option." into tm-qpr-dev
|
2022-08-22 21:57:44 +00:00 |
|
Joe Bolinger
|
002c641875
|
Merge "Cache context for generateChallenge response." into tm-qpr-dev am: aeb042d965 am: d3b4bf7e03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19662253
Change-Id: I57198e5fb8b85b1d9f7473ca92c4f9ce7afc6e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 21:43:10 +00:00 |
|
Joe Bolinger
|
d3b4bf7e03
|
Merge "Cache context for generateChallenge response." into tm-qpr-dev am: aeb042d965
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19662253
Change-Id: I668ff41be6cda1b42c8815eb5ad382ab4757e763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 21:22:40 +00:00 |
|
Joe Bolinger
|
aeb042d965
|
Merge "Cache context for generateChallenge response." into tm-qpr-dev
|
2022-08-22 21:04:40 +00:00 |
|
Oli Lan
|
00ef44ec8a
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours am: 5c46283548 -s ours am: fa1157048c -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I5cd1a3ed8992a40ad5b5a25b8e9f7bfa4d15b7e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:31:59 +00:00 |
|
Automerger Merge Worker
|
908486c86f
|
Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours" into tm-d1-dev-plus-aosp am: 19f1f4fb14 -s ours am: d30d0a603a -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: If29d2ae66444fe2a0bce38d6b58c3830bc197e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:31:46 +00:00 |
|
Oli Lan
|
e6b32ec1a8
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours am: d9da83fc20 -s ours am: 3df07a2543 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Ia4d23f43cfe47f93183a444cf691029f0bbefadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:31:44 +00:00 |
|
Oli Lan
|
6731dbd019
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours am: 4d00a7174b -s ours am: 93e71dbcc2 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Iece354d27aa5a827e6e0f92b2b307ae616561abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:31:22 +00:00 |
|
Oli Lan
|
4583bc96b2
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: 1dbf6b7d60 -s ours am: 505e7f9b1b -s ours am: 322dc3b2ad -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I319988d71f2f0fd5976b5adcee9996a96a412866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:31:03 +00:00 |
|
Oli Lan
|
30bd825e6a
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours am: 20dacec65b -s ours am: 30ede7524b -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I5c265aeeb32df96b92663061084988f9a6e822a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:30:45 +00:00 |
|
Oli Lan
|
41a89fdbdb
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours am: 9190be8288 -s ours am: d8879d9720 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Ieb6c00ed19ea8b7ab038b145a2dad7565f9dd8e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:30:02 +00:00 |
|
Oli Lan
|
fa1157048c
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours am: 5c46283548 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I26abf022c66735e7c44794911eaa47f0056c16f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:11:39 +00:00 |
|
Automerger Merge Worker
|
d30d0a603a
|
Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours" into tm-d1-dev-plus-aosp am: 19f1f4fb14 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I2dff5ada9e9d3dd76bee050cf1e946d9f52f7937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:11:29 +00:00 |
|
Oli Lan
|
3df07a2543
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours am: d9da83fc20 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I72172d0e443962175b3c5c85a8896e29e62f13bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:11:27 +00:00 |
|
Oli Lan
|
93e71dbcc2
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours am: 4d00a7174b -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Ifee2a5fe38a06fc2d741c3d52e256fd706f0e0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:11:07 +00:00 |
|
Oli Lan
|
322dc3b2ad
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: 1dbf6b7d60 -s ours am: 505e7f9b1b -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I861a96c2b141b7736d99dae39fd94ab3fd19a1cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:10:43 +00:00 |
|
Oli Lan
|
30ede7524b
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours am: 20dacec65b -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: I57ef1768699e86fe21534120bd891ab73bfdcb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:09:57 +00:00 |
|
Oli Lan
|
d8879d9720
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours am: 9190be8288 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Iecfa7f7492c11543783899f97d6d67713db28206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 17:09:30 +00:00 |
|
Oli Lan
|
5c46283548
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Icb22ace85025a844aedfcc8f83a2f25aa88912af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 16:53:19 +00:00 |
|
Automerger Merge Worker
|
19f1f4fb14
|
Merge "[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours" into tm-d1-dev-plus-aosp
|
2022-08-22 16:53:13 +00:00 |
|
Oli Lan
|
d9da83fc20
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 5d23958f2a -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Iecd9189cd8e37f5f784dce3b0b12395a513ba3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 16:53:10 +00:00 |
|
Oli Lan
|
20dacec65b
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 141dc63796 -s ours am: 40ec6382a0 -s ours am: bb562d7426 -s ours am: 80cdde7ce8 -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Idac34b4a807a9cda12ad28cfa38a9a195cec12c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 16:53:09 +00:00 |
|
Oli Lan
|
4d00a7174b
|
[automerger skipped] Merge "Revert "Prevent exfiltration of system files via user image settings."" into qt-dev am: b9bafa0d3d am: 05031cc574 am: 03b1a52977 am: e2815b7e11 -s ours am: 48046cf4ae -s ours am: 819430ed60 -s ours am: d3938dfc4c -s ours am: da927d5a6b -s ours
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19449016
Change-Id: Ie4280bc8c8c693709f838656e00b66c7b7b390e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-08-22 16:53:04 +00:00 |
|