PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,790 Commits 1 Branch 0 Tags
dd03237f19b96900630e36f060d55ada6bd13b86
Commit Graph

109790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
dd03237f19 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours am: bbd35cbe45 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ad37af98d3167b1579cbe7dcc67af524b750044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:32 +00:00
Bill Yi
62366cdf2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours am: 19640b0bc2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic717761fc4984877e7ee1c7c8f9fabdf96072ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:23:12 +00:00
Bill Yi
181f1ecf60 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours am: 6b4251e977 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c16a47156e438351ebe617036af4cda02b793ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 23:22:49 +00:00
Bill Yi
bbd35cbe45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours am: f1d8ba94d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f20fbccb440dce4ae45998ab8714310476a3285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:58:12 +00:00
Bill Yi
19640b0bc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours am: 28d6d5a7c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f4ced9ea0c104aeabf97c3b7f1634aecda90330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:51 +00:00
Bill Yi
6b4251e977 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours am: 21d705a708 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79d399648536010692a04b480678a24e5cbbd58e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:57:44 +00:00
Rambo Wang
c21d77b724 Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev am: 31cd5304ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885633

Change-Id: I7b90423f637140df909eedc024a801d700148e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:23:55 +00:00
Bill Yi
f1d8ba94d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours am: 19de182abb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5c0d891ea8d91e1e1c1868e90456ff59947772f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:36 +00:00
Bill Yi
28d6d5a7c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours am: 5f1549cee7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id56eae08a39ddea4e76a27b0bd0887c06d2ef392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:06:15 +00:00
Bill Yi
21d705a708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours am: 2fabfd31d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03897f87ff0fd32328f2de1d6c7f044ca58ab1a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 22:05:54 +00:00
Bill Yi
19de182abb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 66c2b80023 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0357173f1cbe8056bdd872376aeb226a8cddc995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:58:01 +00:00
Bill Yi
5f1549cee7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 09b685534a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I90137c2b7dcdabd0e11ec09548224f59e42b2a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:38 +00:00
Bill Yi
2fabfd31d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3348813e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5d7147bdcfb6ed4c19544f572416b3cb9278454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 21:57:17 +00:00
Rambo Wang
31cd5304ab Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev 2022-09-08 21:57:11 +00:00
Bill Yi
09b685534a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-08 21:31:01 +00:00
Peter Zhang
7572bafb98 Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev am: 66dee9be82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19867066

Change-Id: I058b6b73ec3d92d5d80c4dd59ae0d55954b7c496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 05:30:11 +00:00
Rambo Wang
c9292dc792 Support AIDL IDumpstateDevice service in verbose vendor logging 
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.

Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
Merged-In: I4a2ec44092804574a60113e5be3df19b586bfa64
(cherry picked from commit 17a9fb6bec)
 2022-09-08 05:29:10 +00:00
Peter Zhang
66dee9be82 Merge "Fix insufficient contrast for the strings "Dimmer" and "Brighter" in the light theme" into tm-qpr-dev 2022-09-08 05:07:30 +00:00
Bill Yi
c0ab911f3f [automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours am: 62d1c9a527 -s ours am: cdaad5b066 -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: Ieabb70af0022d2843f706a0bf251bd8c433d9335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:30:30 +00:00
Bill Yi
c3d5f88d49 [automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours am: d8e775a59d -s ours am: e655a213ec -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: I9baa32d9503d169eb6a090e36d38de1c6c29a698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:30:18 +00:00
Bill Yi
cdaad5b066 [automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours am: 62d1c9a527 -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: I33b90519ccd96615fff46e33542ae440117779ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:18:47 +00:00
Bill Yi
e655a213ec [automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours am: d8e775a59d -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: I7efd3d9b2e032e746f71e5697bbf041fd351248d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:18:36 +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
Bill Yi
62d1c9a527 [automerger skipped] Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: e7e935454f -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: Ib71b6904b5c85b3d9f96563bd38bbf2d0305127d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:14:23 +00:00
Bill Yi
d8e775a59d [automerger skipped] Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE am: e935326ab9 -s ours 
am skip reason: Merged-In I3048482c0e9c74bc4488fb76e7166b4e94bf1e98 with SHA-1 d24f4a3f54 is already in history

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

Change-Id: I8dfba5cb143b8a3e85d5cd486e259b620b133cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-08 03:14:10 +00:00
Bill Yi
e7e935454f Merge "Merge TP1A.220905.004 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2022-09-08 02:32:31 +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
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
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
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
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
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
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