PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,971 Commits 1 Branch 0 Tags
36e6b1193ee8d16b5385e31b0e0c29b51a9a133f
Commit Graph

105971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2a34e48069 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I8d2bd68530fc32cae6b354dd1e6c7df3ce3119b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 11:10:15 +00:00
Chaohui Wang
02eb0aa980 Fix crash when operator name contains % 
Currently, cannot use ListPreference.setSummary() when the summary
contains user generated string, because ListPreference.getSummary() is
using String.format() to format the summary when the summary is set by
ListPreference.setSummary().

Use preference.setSummaryProvider() instead, which is recommended for
ListPreference.

Fix: 233295254
Test: manual
Change-Id: Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39
 2022-05-23 19:02:20 +08:00
TreeHugger Robot
ac572e72a6 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I0a317f53e6578ee245d54c3993267ab08d803161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:53:24 +00:00
Treehugger Robot
2b7eb9eff6 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" am: 97b4621c68 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928158

Change-Id: I5685d61f33acf4fbf4b5ff8356a487f77d314bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:52:07 +00:00
TreeHugger Robot
07cb063579 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I470de9e89f9b36b2797a8260d7617e96712c52da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 10:51:57 +00:00
TreeHugger Robot
02d3965634 Merge "Simplify the duplicate click checker logic" into tm-dev 2022-05-23 10:24:18 +00:00
Treehugger Robot
97b4621c68 Merge "Call CardDatabaseHelper.getInstance() when used and not in onCreate" 2022-05-23 10:21:02 +00:00
SongFerngWang
0167a4d8a6 [LE unicast] Disable the "phone calls" when LE is enabled 
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.

Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
Merged-In: Ib507352107c0d825b8c7a9605713bc9083259fbd
 2022-05-23 17:34:48 +08:00
Håkan Kvist
6f1b6e3693 Call CardDatabaseHelper.getInstance() when used and not in onCreate 
Providers can be created before onCreate is called on the application.
Calling CardDatabaseHelper.getInstance() too early will cause
ContextualCardLoader to call getAppllicationContext before application
has been fully started.

Postpone calling CardDatabaseHelper.getInstance() until database is
accessed.

Test: Start device with sim card inserted and Pin enabled on sim.
  Wait some time before entering sim pin. After entering pin, open
  settings. Verify that settings does not crash.
  Verify that there is no contentProvider exceptions from settings in log.
Bug: 154076590
Change-Id: Id0b6294ca2aeebdc71076299928c4dea5145ba33
 2022-05-23 09:08:30 +02:00
Bill Yi
476e1c93da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours am: 3304393c1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib588cbf1f007dfe264e5956e9f366a179092adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:47:42 +00:00
Bill Yi
a62ca13292 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: de1793faf0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a1cee04c15721dea08f7877690e43f18d552eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:47:07 +00:00
Bill Yi
9c89e876e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: c7bada8348 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5a21ecf04a60ccd53e9799c119a63f9fdcf3a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:45:20 +00:00
Bill Yi
3304393c1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id728bf2c000929f278e02cf915b05f78fcff9a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:30:12 +00:00
Bill Yi
de1793faf0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93bd4dff9d8e5eb14a6c97ad61b8dace102f84b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:29:26 +00:00
Bill Yi
c7bada8348 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2494cb688e139ec769915b1bc092e98436ea806f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:29:03 +00:00
Bill Yi
c3d4eb094b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99b5282130809460605bf2af7a56d466b6752e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:09:38 +00:00
Bill Yi
153aaf7682 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2f2c0c4b54bccf5e3e6966297d08813d27aeac7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 05:08:17 +00:00
Jason Chiu
5bc2dc4ae9 Simplify the duplicate click checker logic 
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
 2022-05-23 12:57:19 +08:00
Bill Yi
750cea242e Import translations. DO NOT MERGE ANYWHERE 
BUG:233440940

Auto-generated-cl: translation import
Change-Id: Idbd4c9ec8105849b762afae06c780c47185fda65
 2022-05-21 09:20:58 -07:00
Automerger Merge Worker
6b24baab7d Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into tm-d1-dev-plus-aosp am: 7a395263d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I1240818bbac7538c2d40b007c2eacb431d3e710a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:45:36 +00:00
TreeHugger Robot
ca330b2b27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 8c1aed12ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I224af70b19e1b24c84092ae348d8f60d26da055e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:45:34 +00:00
Automerger Merge Worker
0ef373f9b9 Merge changes from topic "am-2194a6a85b914b21804de4e27b3bc48e" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 85f117afe7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours am: 08462bff56 -s ours
 2022-05-21 02:45:22 +00:00
TreeHugger Robot
e24623e659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 85f117afe7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97a294f40583fdeafa80810aa8ccf0b5ff83351c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:45:18 +00:00
Bill Yi
3fe4babf13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours am: 08462bff56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82e27fa1eb240a3eec17e941e57a4bdb7aefea65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:45:17 +00:00
TreeHugger Robot
871bb62065 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: be66d387e9 -s ours am: c71ecb31e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabf1aa709f1aac7c0ae11d0a026a5026fbc3582e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:45:14 +00:00
Bill Yi
e6b3cbae50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: ea8b3f83b2 -s ours am: de09c13ece -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iefbdc6dd0d0efcda0fecd62c2887219fc549c1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:45:13 +00:00
Chaohui Wang
bf393a9ac0 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 849dba46a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I7a069a4c0cf6a752c5391b70917718cb2f618dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:44:58 +00:00
Automerger Merge Worker
429768bf64 Merge "Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 52507eb518" into tm-qpr-dev-plus-aosp 2022-05-21 02:44:48 +00:00
Chaohui Wang
1dcd81b7b8 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 52507eb518 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I9e578817811d5740d4372ac8b70b5137b7758b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:44:45 +00:00
Chaohui Wang
3fdd89556e Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I98d0c3ab385539d258baad72beb048aa0c563e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:44:42 +00:00
Automerger Merge Worker
7a395263d5 Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours
 2022-05-21 02:29:00 +00:00
TreeHugger Robot
8c1aed12ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I198c568a7c5ae92f0a86c1fd2dcdfea9609d0739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:55 +00:00
Bill Yi
3ffb54a1e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25debac8937a771f3ef19488192f3c31bfc806c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:53 +00:00
TreeHugger Robot
c71ecb31e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: be66d387e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddb0b76e5d5ca58e1fd454bf552c5c33323ea62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:51 +00:00
Bill Yi
de09c13ece [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: ea8b3f83b2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I973d31e95ee41c512eccd7b31dac06b962475afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:50 +00:00
TreeHugger Robot
85f117afe7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51c05f2893d6960ebee8f69bf1f58dff78ba8caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:42 +00:00
Bill Yi
08462bff56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie1e2c966de5184a95caf8dd27e096b0c63bdb0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:41 +00:00
Chaohui Wang
849dba46a3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: If64e9a2f5e885f90b949485a781f8dd6459a0984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:38 +00:00
Chaohui Wang
456a27bee3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I3b9ae5d0e02db28f8965d158d97937b8b2603433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:32 +00:00
Chaohui Wang
52507eb518 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I54efb9201eb76f49297a86ce9aac430c2fbd7989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:28:27 +00:00
TreeHugger Robot
e393321e1f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf8567fee996c979796c8507b70d4f48729a5313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:19:17 +00:00
Bill Yi
b13cc8ca4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11f86d958b411818eb7a549bf0bf6d783c564943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:19:10 +00:00
TreeHugger Robot
be66d387e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6001aab1e0cbac0515c44f40a92d2486ff58f49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:17:56 +00:00
Bill Yi
ea8b3f83b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id60653015a9a4344e2428a51390806f449f4ea4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:17:40 +00:00
TreeHugger Robot
97a3f54878 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-21 02:12:55 +00:00
Chaohui Wang
f61254af3c Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I59fbcd9e9646f2a7fab8fd0410768b08b06f6512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:10:18 +00:00
Chaohui Wang
0d6569d199 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I911dc4f729e7d6eeb0fda8b12f16d8a153cb6bc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 02:08:39 +00:00
Chaohui Wang
0dc89bc85c Merge "Fix Conversation page flickers when back" into tm-dev 2022-05-21 01:54:27 +00:00
Edgar Wang
739b6fd20d Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 42704ba27c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I4fc4f187592b0f904f65cc892554371493e339ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:20:17 +00:00
Edgar Wang
0d56428610 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 2e995ee697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Ib1015a217770a3412ab914146686a5816162e40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:06:23 +00:00