PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,506 Commits 1 Branch 0 Tags
166d8767381b56ea7169136df1a429f7ca71070c
Commit Graph

103506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
66647772aa Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I87f3614bc5496b73e3f5224f1430454859b246d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:51:19 +00:00
TreeHugger Robot
431c7ede2b Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: 1c16e6b314 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: I4ecd7932ed0100a15fd739ca8cade7394db0b31d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:51:18 +00:00
Tom Hsu
f591ba9c73 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: Ie29131dff4c62b1c8d0f8d093b7c5116833c0ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:51:13 +00:00
TreeHugger Robot
5ed72fae84 Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 7d1f75839d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I45b74f273b2a2665b643e97f8450981228e95402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:51:12 +00:00
Chaohui Wang
74030a5bc5 Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: 19356dae5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I7d12f8797c346d1cef2be49c97d45a1f40a20ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:51:07 +00:00
Tom Hsu
3521d0420c Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 169517aacc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: Ieefa68c92581682a5eb08d1a85867a1fefc02065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:51:01 +00:00
Arc Wang
3122f7c53d Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: 7a530c79ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: I57ab6acf0e1877cd4cb850cd7b7ac3e2d4557663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:50:59 +00:00
Arc Wang
3af1d90a43 Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: 7a530c79ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: I76ce4b70bec93a73c91d716858cb7703f3ed4a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:50:56 +00:00
Joshua Mccloskey
438108f1ad [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 am: d1a232d24e -s ours 
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: Ia6cf25eba115c505ee1db1b930cde024a39623fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:45:51 +00:00
Bonian Chen
e518b8848e Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 am: 2276920b9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Icb56a73efe4945099d13c8a6d81093c379050cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:45:22 +00:00
Bonian Chen
226d1a137d Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 am: 480c80f79d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I5d05f75c2a5d9fb24549cd89424a22a9e10383ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:45:03 +00:00
TreeHugger Robot
a2e15fd03c Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a am: fb214b99c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: Ib350ef8ba53530293ac074ce39c9afdcac633ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:44:46 +00:00
Jan Tomljanovic
fb6771d939 Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 am: d1d0f0a88e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: I96a34dbbd9d4fecf21a8f53e92934fa976556fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:44:28 +00:00
TreeHugger Robot
a20c3a082b Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb am: e76c4e0d0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: I165c9e086d54b87f6d2ed9c52ac47b0a711fcd8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:44:11 +00:00
TreeHugger Robot
678444ec91 Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 am: 46c773142b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I234137108095ceffff08b62fefa067ee8ba93a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:44:04 +00:00
Chaohui Wang
e54e855b1b Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd am: bda9049621 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: Ib087add327143c0d12541e55ee586b01908af3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:43:48 +00:00
Tom Hsu
4c5e815848 Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 am: 3c49878dbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: I2cf0d4966cd91e49af668acb26be907412feaaf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:43:23 +00:00
Arc Wang
783b627cef Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a am: e349ed0371 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: I5646796e4d3f95e2f3d2359cb82a6ffaefed1230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:42:52 +00:00
Joshua Mccloskey
d7855afb3e [automerger skipped] Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 -s ours 
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I1c40b68911a323745512d79fcfb9a2255910b755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:30:44 +00:00
Joshua McCloskey
8495275d81 [automerger skipped] Fix final UDFPS enrollment haptic. am: b7f3001cea -s ours 
am skip reason: Merged-In I8623771016b9819d4211d07a19b50291a8b06cd9 with SHA-1 d3001a1a01 is already in history

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

Change-Id: I673c3e1f547220846b81630906ef7ce6e0a193c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:30:43 +00:00
Joshua Mccloskey
d1a232d24e Merge "Fix final UDFPS enrollment haptic." into tm-dev am: 8f463f5c88 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18083583

Change-Id: I2f8a9966f03a4362d2bb2f57269f31b8e556d197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:28:50 +00:00
Bonian Chen
b32415b955 Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Ibfd126ebd63971e4e3b9f4f2429213c6039b2ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:28:38 +00:00
Bonian Chen
01e97e371e Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I064026298e1dedeb9bdd8cc170c413aa20739deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:28:30 +00:00
TreeHugger Robot
d1c67e389d Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I56cba95face2b3c989abc77ed0a520f29b6ed8b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:28:22 +00:00
Jan Tomljanovic
3c357dec8a Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: Ic4eb2afbbfed8bc6353f9d79dc3451c789166243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:28:15 +00:00
TreeHugger Robot
1c16e6b314 Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: Id017a3a3b3a67cd98f0727cd476a86b9ce248fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:28:08 +00:00
TreeHugger Robot
7d1f75839d Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I8367ebd5ba89af527152ad41cb0446abd8d5370e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:28:01 +00:00
Chaohui Wang
19356dae5d Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I43b852b5c2ae039e20f40ee0d91ed842caf79998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:27:54 +00:00
Tom Hsu
169517aacc Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: Ia047213d433f4829bb134f0fbbfc7e8c4c1d6f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:27:46 +00:00
Arc Wang
7a530c79ec Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: I822332ea3404102dc25aaeb6db9e6c329a943d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:27:39 +00:00
Bonian Chen
2276920b9b Merge "[Settings] Avoid from crash UI when querying data usage" into tm-dev am: 5ef52de6b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950069

Change-Id: Idac304bab5480e12813a2b99b875673abcbb7a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:27:25 +00:00
Bonian Chen
480c80f79d Merge "[Settings] Rename title of SIM UI when changed" into tm-dev am: 7bdf717410 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983870

Change-Id: I4531e4611b2b52e6d3153042d5d2a24d969c9c23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:27:17 +00:00
TreeHugger Robot
fb214b99c0 Merge "Show restricted message in Wi-Fi Direct summary" into tm-dev am: 38989c9c6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062823

Change-Id: I288a6d876107c243b7e173e21cd396091a3503f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:27:08 +00:00
Jan Tomljanovic
d1d0f0a88e Merge "Update the SafetyCenter icon" into tm-dev am: 297028ea69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18029249

Change-Id: Ia4c82407c9e1c93bfba0ab19578c0d0a653c2a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:27:00 +00:00
TreeHugger Robot
e76c4e0d0a Merge "Show restricted message in Wi-Fi hotspot summary" into tm-dev am: 30bba3bbdb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062822

Change-Id: Ib95ca3193d615adf17c47deba31b1e6930753a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:26:52 +00:00
TreeHugger Robot
46c773142b Merge "Remove tab symbol for app pinning strings" into tm-dev am: 5d31a69d65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030885

Change-Id: I9d960da56143e016a7ac7ee1c6b9f8b32be9e67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:26:43 +00:00
Chaohui Wang
bda9049621 Merge "Fix flicker for Mobile data & Wi-Fi page" into tm-dev am: 71e03076cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18013070

Change-Id: I860b9d924cf2da922f3154008a194fe2ad0e3288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:26:34 +00:00
Tom Hsu
3c49878dbe Merge "[Panlingual] Avoid activity restart during rotation" into tm-dev am: 1d0f85a3d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030882

Change-Id: I0a2ffebd0d8ac82da0883cf519429d5647bd291e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:26:26 +00:00
Arc Wang
e349ed0371 Merge "Prevent side channel package installation enumeration" into tm-dev am: a3c7f8482a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944167

Change-Id: I45039eb297f9a65aa579221f0d43da45bda0cf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 23:25:32 +00:00
Joshua Mccloskey
8f463f5c88 Merge "Fix final UDFPS enrollment haptic." into tm-dev 2022-04-29 22:59:19 +00:00
Joshua McCloskey
b7f3001cea Fix final UDFPS enrollment haptic. 
Test: Verified both accessibility/non-accessibility flows
have correct haptic feedback.
Fixes: 229804277

Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9
Merged-In: I8623771016b9819d4211d07a19b50291a8b06cd9
 2022-04-29 22:52:44 +00:00
Julia Reynolds
d9d09bf112 Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961

Change-Id: Ic82fa3118e725755090a78e3e13d6bed95ce3e3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 21:07:49 +00:00
TreeHugger Robot
d266df1531 Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824

Change-Id: Ie0dbbd4df64d5bcd52e1715639228de0d7376b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 21:07:30 +00:00
Calvin Pan
492fdaf058 Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: Ia51d0a83cddabc8ba6916aebc8305fa03478f01b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 21:07:24 +00:00
Betty Chang
3ea06f174e Merge "[LE] Launch the MediaOutputBroadcastDialog when the current device is broadcasting" into tm-dev am: 7711207ba5 am: ec17c47421 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944166

Change-Id: I9fbbf6adfe050182ebbe2d1888d3ee7778b9fa4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 21:05:44 +00:00
Lucas Silva
e2ef52d6f1 Update dream settings logic to keep the customize button unselected. 
Test: manually on device
Bug: 227717835
Fixed: 227717835
Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036
 2022-04-29 20:43:20 +00:00
Julia Reynolds
d41aa383cd Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: 1f912cbfe3 am: 394ba8c07c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961

Change-Id: I9bf814076a12d9691297f65fc03bb8bc274eabe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:34:50 +00:00
TreeHugger Robot
d486e5ee07 Merge "Hide running time information for "Android System" entry" into tm-dev am: fc6cb73d29 am: 6708570e2c am: 6d41a62ab2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062824

Change-Id: I437973050b16608ef642277576b142abce19713c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:34:32 +00:00
Automerger Merge Worker
c17fe4d6ff Merge "Merge "Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure" into tm-dev am: 312de956ec am: e0d4b99626" into tm-d1-dev-plus-aosp am: 323cd11c86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17871961

Change-Id: I5e98c83254916568c56eb1069ce3a2fc97b94025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:33:37 +00:00
Calvin Pan
befbc18841 Merge "Add unit test for AppLocalePickerActivity" into tm-dev am: 8ad2642b5f am: 38fac79ee6 am: 9ac43d846e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903006

Change-Id: Ic8013a13ab409006f90562c8d2e3ef3b8fc1ff18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-29 19:33:13 +00:00