PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,642 Commits 1 Branch 0 Tags
382cb77635a5c41e2ecf3beea665158fe9a3461c
Commit Graph

107642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
0e3dbbef3a Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f0ed87645c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I48dacd6ca6a9e5fd356fd496c38f1531e4f62fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 00:13:44 +00:00
Jack He
3671fb8438 Merge "Cancel bonding upon back gesture." 2022-05-10 00:09:48 +00:00
TreeHugger Robot
3e52359cd3 Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 4d7e960d65 am: 8c30f1b644 am: 14d0ac8aac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I1574028ebbefea3d6aea11b003ed3cc4f886bd58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 00:03:27 +00:00
Julia Reynolds
c92e89217f Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 8e41734caf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I7d6153f6f46a116a3a25872dc422a59b02ffd1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:57:18 +00:00
Chaohui Wang
9be729627b Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: 10f7493fe3 am: 89fa491c6d am: 86ab3c55df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: I1cc905fab79675001974d3960a460357d7afcae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:49:51 +00:00
Tom Hsu
431613301b Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: b0eabfb352 am: 74d771a5e3 am: 024b7875a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: I7469090d94066176f7b73de34300754f337ae448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:43:55 +00:00
Kholoud Mohamed
b1144f95e2 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90 am: b4117d0068 am: 09e84417f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I4067ba5ae1f89598275a52d6a57c60beb7612155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:43:37 +00:00
Tom Hsu
a24d71ccef Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 927b6c4f63 am: 8ab642f71d am: a0f9356dfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: I6bea04eaf287f3d9fcdcb318b3685da5e173aaf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:42:11 +00:00
Raphael Kim
b73015451f Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: 197d19654f am: 8f32fa54f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: Ie42089e75d048ac575615c068047598ddc6afaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:39:31 +00:00
Yuri Lin
0fe8746358 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: 475ee039ea am: 7ac6bb4d61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: Iaa06314aab10359b4d1c7371703d03ad50d55381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:31:25 +00:00
Julia Reynolds
73b08f15b0 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f5148fd0a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Icd76217fc4ee5059c9abbdc00cdbd8bd57937b38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 23:28:41 +00:00
Yanting Yang
ee0931f5ba Fix reset app preferences for work profile apps 
In the past, Settings didn't support resetting the disable status of
work profile apps, it doesn’t follow the behavior that the reset dialog
mentioned.

To fix it, we are going to check apps by enabling user profiles and user
id. If the work profile is enabled, we will also reset them when users
select to reset app preferences.

Bug: 187387211
Test: manual
Change-Id: I25fd0129335539a23ed2ee0af57fdd9714eddf74
 2022-05-10 07:06:14 +08:00
TreeHugger Robot
f1167898b7 Merge changes from topic "tc_change_20" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-09 23:02:43 +00:00
Raphael Kim
7f48922727 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba am: 94355d5717 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I180ed5f01c25c1a93c93b26263a8bde000971ce4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 22:45:08 +00:00
Chaohui Wang
69cec9673b Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: b09fcd145d am: 0c38840066 am: 680dfaa421 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: I6a16baed50d84c063e7f963087e942cf32459827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 22:35:03 +00:00
Raphael Kim
8f32fa54f7 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: 197d19654f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: Icdfe37ff28d24d37a7d62686656a837cb52a8419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 22:34:30 +00:00
Yuri Lin
7ac6bb4d61 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: 475ee039ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: Ifa6599f54d191244c2dc1af47ce9a673d00e3a90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 22:14:49 +00:00
Julia Reynolds
68aaf15888 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 73a0bada43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I6fee068537f09ae083224daf6305bd5f72511f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 22:14:13 +00:00
TreeHugger Robot
88290ba077 Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 4d7e960d65 am: 90f8dd0abd am: f084eecb4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I605f8f3f96169d4461c2ea56ac82d89b898edc67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:55:09 +00:00
Raphael Kim
f6da68723e Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: 5d3aa0eb85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I229b884ac4be926205215660c530e5d72a971dc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:53:51 +00:00
Julia Reynolds
8e41734caf Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Ifb623c3650ae1c46efa0485979f412b80896b11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:48:00 +00:00
Chaohui Wang
74956be35f Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: 4859f6cfe1 am: cd760beb21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I68b35f65069f853757790641637963e716263575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:36:31 +00:00
TreeHugger Robot
d5ab43596e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-09 21:35:14 +00:00
TreeHugger Robot
8ec0fc0931 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-05-09 21:35:14 +00:00
Yuri Lin
2bdba08adf Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e am: b855cf5d12 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: I2ac5cb166c4d6a0f55287d9e04e20d708cc4ce42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:22:37 +00:00
Jason Chiu
eef51aaf8e Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: ccf066c663 am: bcf6dd1384 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: If4ab25a02c81b0c62d3c93cbfd13bb7814f95330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:21:12 +00:00
Julia Reynolds
f0ed87645c Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Id34ab31feb04fb25e7103623387b873906a94838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:21:09 +00:00
Chaohui Wang
772e11aca8 Merge "Fix Wi-Fi "Network usage" and "Privacy" drop down" into tm-dev am: 7a21c9ef1f am: 10f7493fe3 am: 91413daba0 am: 42bd80b21c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186095

Change-Id: I52b0df9684ba75711814dcfaea92330e274e8f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:17:48 +00:00
Julia Reynolds
f5148fd0a7 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I1fd64e19f44fa0df9eda4a921a3c15cf7f55db09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:14:25 +00:00
Chaohui Wang
18fbcba0d1 Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: e33539d629 am: 556d73bfe0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I881c0773c9e5aa74118a2c92c86bef36711d691b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:14:13 +00:00
Julia Reynolds
73a0bada43 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Ic89e018c524ab26098265d404304595758ecd545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:13:37 +00:00
Raphael Kim
097debb8f7 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba am: f14c2ff2da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I1bf19889148043819695ea586d8d087b0e201ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:07:35 +00:00
Tom Hsu
0ee8f8a411 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: d3341895ee am: 9ac7f3d212 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: I53deeb4b31ff70d561ba377a322879bd81fe579f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:07:18 +00:00
Kholoud Mohamed
5d190f58d0 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: e8aa31b017 am: 98ce84f65b am: ba4721a171 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I688bb9a1ba9c7222d40a13308e881aff6d3d225f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 21:00:04 +00:00
Jason Chiu
098b00e909 Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: 399093f82a am: 1e4edfd3e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: Ibed018d0d2b25ef6853cdee9239c43e5bc48ec99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:59:05 +00:00
Raphael Kim
5d3aa0eb85 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: Ife2dea93220f7bb673ea1cbf7f7c8b6d6d542d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:57:13 +00:00
Qasim Javed
78765b0b26 Cancel bonding upon back gesture. 
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.

The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog

Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
Merged-In: Ia790e345be811be1b60762ff819544d03c5a18fd
 2022-05-09 13:55:52 -07:00
Treehugger Robot
711e092b8a [automerger skipped] Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385 am: 34ca30adc7 -s ours am: d91f702ad0 -s ours am: 5b1b7d118e -s ours 
am skip reason: Merged-In Id055fbd441936a9842b4acc978a894a855165bb7 with SHA-1 0f68faf996 is already in history

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

Change-Id: I4ee0061b4195e877baa1def44e5bbe9388b9bbbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:54:59 +00:00
Tom Hsu
a07dbd1657 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: b0eabfb352 am: c02919a597 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: Ib67405f84927fc7a70d12f03cf4d41410c79fc98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:49:04 +00:00
Raphael Kim
94355d5717 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I40e0de672046d74cc3fb131b841ceb2fc93b3456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:46:08 +00:00
Raphael Kim
197d19654f Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: Idecf480854d722ec9149a8a721c7219b377508b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:41:48 +00:00
Julia Reynolds
c80fc1ba4d Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I08f148210ade5545c070a88656909d4acb7becb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:40:45 +00:00
Kholoud Mohamed
719b9c7228 Merge "Add missing settings strings." into tm-dev am: 155df044e5 am: d5a0ee6a90 am: 87fd72bbe1 am: 513023b2d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944008

Change-Id: I4afd70f7b9dd27e5a4d5b2e1b27889eb73d596a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:32:50 +00:00
Tom Hsu
7298a5ccda Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 6586310e62 am: c064ad98fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: I6dc35b7ca107bd7c2ab06833f9e926ac435d9a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:23:25 +00:00
Yuri Lin
45c53640ed Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e am: 3bb0f67d1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: Ie3da6eaf8ddef00dff106e06dcac93f83e47975b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:17:14 +00:00
Julia Reynolds
23a85a1f96 Merge "Remove notification permission feature flag" into tm-dev 2022-05-09 20:16:09 +00:00
Chaohui Wang
1f3c4bc6e7 Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: e33539d629 am: b215b96dfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I3a0622080d6a550d2c346edfcbe878c00ef468c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 20:12:12 +00:00
Qasim Javed
0521856683 Cancel bonding upon back gesture. 
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.

The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog

Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
 2022-05-09 13:11:13 -07:00
TreeHugger Robot
6b6cdcc8d5 Merge "Ensure loading all apps once in ManageApplications" into tm-dev am: 036d6744dd am: 0cfa226653 am: e42176705b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18160674

Change-Id: I060c4f7a4484af92182833488de33842567558f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:57:06 +00:00
Jason Chiu
d4560d279a Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: 399093f82a am: 99e01325bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I5290159397f87ee688293c4fade0e28f8345e9b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-09 19:56:40 +00:00