PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,211 Commits 1 Branch 0 Tags
67078e43bd80b91a8b0bc6d0954c73c0bd13e7db
Commit Graph

115211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
67078e43bd Clean unused string arrays 
Bug: 234570979
Test: Make Settings App
Change-Id: I5478bb88a046a21b410283140a35b3931d4c9635
 2022-09-08 20:18:56 +08:00
Treehugger Robot
c5ba381215 Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a am: 1b69e6b87c am: f0c250900c am: fc899d5e64 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: I4129c2fce49101a1d569b2cfb91b3684a31fcc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:17:05 +00:00
PETER LIANG
c9a792e54c [automerger skipped] Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev am: 240eb5c9e5 am: 66816bcbc6 -s ours 
am skip reason: Merged-In I88c65aa9c3f05281a5c5090c2ca9503327bb580f with SHA-1 4b13620457 is already in history

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

Change-Id: I9630987563c83920391357a7c697ae67e1711536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:16:55 +00:00
Treehugger Robot
fc899d5e64 Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a am: 1b69e6b87c am: f0c250900c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: I6d2cc6fbab002ad366a73dd2241e0afccbe46303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:16:53 +00:00
Menghan Li
c87a456903 [automerger skipped] Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e294 am: 5f9570381f -s ours 
am skip reason: Merged-In I52425190cce4ab3cf31be025a743bf8b212fa1f9 with SHA-1 d95d799d86 is already in history

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

Change-Id: I796148d3a78b16d315e0e685000a41bdd3ed3427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:15:59 +00:00
PETER LIANG
66816bcbc6 Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev am: 240eb5c9e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19770084

Change-Id: I309b5d5fd545ad6289df487669c4dbccdb03526e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 02:31:54 +00:00
Menghan Li
5f9570381f Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev am: 299057e294 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880529

Change-Id: I0e107181ccbf59fc80d1b429768f8281128092cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 02:31:25 +00:00
Bill Lin
6f9bf171a9 Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732ee am: 37785c81ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527

Change-Id: Id4de390f6bf0276795ca1f73759a2172e25ef7e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 02:18:58 +00:00
Treehugger Robot
f0c250900c Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a am: 1b69e6b87c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: I63721073b4e8032505b97413cf8064caa3497ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 02:18:57 +00:00
PETER LIANG
240eb5c9e5 Merge "Fix the preview section incorrectly ordered of the display size and text." into tm-qpr-dev 2022-09-08 02:09:13 +00:00
Peter_Liang
e10799c774 Fix the preview section incorrectly ordered of the display size and text. 
Goals: Set correct order into.

Fix: 233326281
Test: manual test
Change-Id: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
Merged-In: I88c65aa9c3f05281a5c5090c2ca9503327bb580f
(cherry picked from commit 4b13620457)
 2022-09-08 02:07:02 +00:00
Menghan Li
299057e294 Merge "Fix extra dim turns on failed in setting search bar" into tm-qpr-dev 2022-09-08 02:02:26 +00:00
Treehugger Robot
1b69e6b87c Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 am: 451ced2f5a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: I16683a4e78350d713ab8a0f756d69581aa97526d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 01:46:51 +00:00
Bill Lin
37785c81ce Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev am: b9263732ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19880527

Change-Id: I60e52637331ca2801845999334a8d83f4bec04fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 01:46:49 +00:00
Treehugger Robot
451ced2f5a Merge "Fix NPE crash in TextToSpeechSettings" am: 6672e37864 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2208995

Change-Id: Id0c4e3c68ee40e5d0d57449b531228b31f2246ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 01:02:07 +00:00
Bill Lin
b9263732ee Merge "Fix regression of pressing power key cancel sfps enrollment" into tm-qpr-dev 2022-09-08 00:59:09 +00:00
Treehugger Robot
6672e37864 Merge "Fix NPE crash in TextToSpeechSettings" 2022-09-08 00:34:03 +00:00
Oli Lan
e65c21a750 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 3c8578c22f -s ours am: 449dce27a4 -s ours am: 3c17eec470 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I48e4ff288013e0e3544523dba5ccaf32d6df7149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:06:29 +00:00
Oli Lan
c6f11356be [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 56abc7ad1a -s ours am: c7a8479c9b -s ours am: 2e4dc18464 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I8d685db9d02a1a6311129ecdff42833d3d96f310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:06:18 +00:00
Oli Lan
2c4da9933e [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 2cdc09d71f -s ours am: 92654ff5b3 -s ours am: 8928a72d84 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I949326eebd8569f8e36c1d4defca3d15ab2541a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:05:55 +00:00
Oli Lan
3c17eec470 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 3c8578c22f -s ours am: 449dce27a4 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Iff6a3ebcc87bf175b497c4c835eabd17db3bb310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:05:32 +00:00
Oli Lan
6f8558cd5e [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 43ecd848b4 -s ours am: 601afe2f7e -s ours am: a9888cb51c -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I11be5ab17d2fc02559dd39e249e336e2e9b0167e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:05:31 +00:00
Oli Lan
2e4dc18464 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 56abc7ad1a -s ours am: c7a8479c9b -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ieae8b400b6687a8e9de9a41f193f5b73b00bda56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:04:48 +00:00
Oli Lan
91bb72ca58 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 2cdc09d71f -s ours am: dcff5134d1 -s ours am: 2b6b70d624 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I756ce703d1e48e53db1b12079892307f8cecd408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:04:43 +00:00
Oli Lan
8928a72d84 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 2cdc09d71f -s ours am: 92654ff5b3 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I11f4ff3a2de65cb1ca63ad55f6e964df951d0e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:03:48 +00:00
Oli Lan
5a590b2709 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 43ecd848b4 -s ours am: 335e1fd2c1 -s ours am: 894ac0c20a -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I5f8e15fecc6b209053f96a7ddeb12cb0335b01ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 00:03:41 +00:00
menghanli
aaee157fdd Fix extra dim turns on failed in setting search bar 
Root cause: Don't call displayPreference before setChecked called.
Solution: Don't show quick settings tooltips if preference is not ready.

Bug: 237850687
Bug: 244676175
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityQuickSettingsPrimarySwitchPreferenceControllerTest
Change-Id: I52425190cce4ab3cf31be025a743bf8b212fa1f9
Merged-In: I52425190cce4ab3cf31be025a743bf8b212fa1f9
 2022-09-08 07:44:17 +08:00
Oli Lan
a9888cb51c [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 43ecd848b4 -s ours am: 601afe2f7e -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I697fe11355829491e11495b06d243677085fc86f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:33:44 +00:00
Oli Lan
2b6b70d624 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 2cdc09d71f -s ours am: dcff5134d1 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I64877526d835d170f37cce4fe3cb15043e91a98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:31:46 +00:00
Oli Lan
894ac0c20a [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 43ecd848b4 -s ours am: 335e1fd2c1 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Iddd932c58e3e69cacfe1729d279a88fe99cf3baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:31:27 +00:00
Oli Lan
6c8cb2c80d [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: a2eb6d2a04 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I632e151b6e5b735c8d517c0ebbc7022cf614be25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:30:31 +00:00
Oli Lan
0987504271 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: f04be701ef -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I82d27bf3abcc3ce09502420b84aef553ea28aec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:23:32 +00:00
TreeHugger Robot
a821b422d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 6fcaee92b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6f69f9aba763e1588f7c00a50bea429594159a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:18:43 +00:00
Bill Yi
73d8ad4e8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a0ed849dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00b28cf7993d69b446143830e9ca2e06597f5ce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:18:31 +00:00
Oli Lan
449dce27a4 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 3c8578c22f -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I37acba556261d1409222b9d7e544dc20f29f7d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:57 +00:00
Oli Lan
c7a8479c9b [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 56abc7ad1a -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ie6c931e185e8c22ddb12d4a5ad7a3dd036593578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:41 +00:00
Oli Lan
dcff5134d1 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 2cdc09d71f -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I8b7e7fc0b569d55429038824e1c65a10dea629fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:28 +00:00
Oli Lan
92654ff5b3 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours am: 2cdc09d71f -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I26bbe9761cde34d5ecedfde66233f9b2fd59b4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:28 +00:00
Oli Lan
335e1fd2c1 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 43ecd848b4 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Iaf1a1dfbe55c7589350fa1c2c8422835d3db96c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:12 +00:00
Oli Lan
601afe2f7e [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours am: 43ecd848b4 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ib9e0a21a890e13c1a007868b1a387dcea8d1862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 23:03:08 +00:00
Oli Lan
3c8578c22f [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Iadbd31b60e5744a5b2532dc0cd64d21858efcda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:31:30 +00:00
Oli Lan
2cdc09d71f [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I09d0433fbe68aa510156bb4574b4c81ee6bc06eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:21:17 +00:00
Oli Lan
43ecd848b4 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Iaca6981e0651ef32ac1a388d446417f382447927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:21:11 +00:00
Oli Lan
a2eb6d2a04 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours am: 9b9d0b2275 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I08fbd586bf002c9e6a14df35ca967ff9f1bfcb69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:20:37 +00:00
Oli Lan
f04be701ef [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ic273a435ab13500b45413786ec5c17a382c2cc9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:20:28 +00:00
Oli Lan
9b9d0b2275 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours am: ff1de3711e -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ib8379f1b92400f4bd1b2b76a6c418216a44fce6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:18:29 +00:00
Oli Lan
56abc7ad1a [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours am: 7e67690072 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I7aa5c978f0be7269e3a3211284d2d0ba6cf0b1e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 22:18:00 +00:00
Oli Lan
ff1de3711e [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 11484d510a -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: Ie0f4cc27e8ad3987f120a8c13ca033cc17972e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:54:20 +00:00
Oli Lan
7e67690072 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours am: 54f0522027 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I98a5f814012718e1a31fb7a1935715e9d7756151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:51:18 +00:00
Oli Lan
54f0522027 [automerger skipped] Prevent exfiltration of system files via avatar picker. am: f70e351d1a am: 05ea36ddc5 am: ff5b6611cf am: cbf1699cd7 -s ours am: 52f5f2ee31 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I1d62ca22214c2cb04c15545764864d65231d9230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-07 21:26:35 +00:00