PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,902 Commits 1 Branch 0 Tags
9231789a8ad0a811e912e414738e39494b8fbc6c
Commit Graph

106902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
dd8c6768fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: 4cfb1ffa90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie56d8fa2b401f6a8264a029a0b1e07082e10e100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:12:04 +00:00
Bill Yi
785f9c689d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours am: a99136a41f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib661b99ebe08f17b0a4639f15332bc6cf1ba5b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:12:04 +00:00
Bill Yi
addc1c03f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 95b19ac0a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iddfb406f0907729950ee118796da5ca8698eda64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:12:04 +00:00
Bill Yi
038842bd3e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 6c8413c9d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib29f5ede5f654fc710cf561dd95859bc40abf323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:54 +00:00
Bill Yi
a4f418e952 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours am: 95b19ac0a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8035fb614c21257d0bb47cc92f6821d06434194d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:54 +00:00
Bill Yi
187b9a2630 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 6a72c90cac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b67bf4fd539f8703edf78ca7f5dbb741a50fd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:50 +00:00
Bill Yi
db0f24bb60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 2ae7a0db93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd52eef88231b9f4f3a3336b059d76b3c40f0cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:40 +00:00
Bill Yi
d9c0deb0b2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours am: 6a72c90cac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85c3e28397146be8cef1a038a8839f4ca2a3406e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:39 +00:00
Bill Yi
ee26947d53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 00a68cc896 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib40e6726c039744531f1ae93ba33c59f3c009be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:38 +00:00
Bill Yi
ba8ad5e3af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: 00a68cc896 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied0d66866aca1d2f4938b0f7960e1d4dcdc5a602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:28 +00:00
Bill Yi
131adc8bf7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours am: c3d89fb945 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e56e6595871a7b4e86f10bfab757a2edf46d3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-04 00:11:26 +00:00
Arc Wang
ca436b7e59 Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev 
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
 2022-06-03 23:33:36 +00:00
Arc Wang
5eabdc88f0 Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev 
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
 2022-06-03 23:27:16 +00:00
Arc Wang
481113b6a3 Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev 
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
 2022-06-03 23:27:07 +00:00
Arc Wang
688ec25ca8 Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev 
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
 2022-06-03 23:26:56 +00:00
Arc Wang
0ed1190469 Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-qpr1-dev" into sc-qpr1-dev 
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
 2022-06-03 23:25:50 +00:00
Arc Wang
27f9995beb Merge changes from topics "presubmit-am-81a031e484d84618b0548f9872055538", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5" into sc-v2-dev 
* changes:
  [DO NOT MERGE] Fix can't change notification sound for work profile.
  [DO NOT MERGE] Fix Settings crash when setting a null ringtone
 2022-06-03 23:25:34 +00:00
Raphael Kim
14a63dbf67 Merge "Extract app label from component name in notification access confirmation UI" into sc-v2-dev 2022-06-03 22:20:03 +00:00
Joshua McCloskey
74f7988ced Update fingerprint removal dialog strings 
Test: Verified manually.
Fixes: 234183857
Change-Id: I52d2ae620da40d33c13fb860200137f10e51b07d
 2022-06-03 19:51:20 +00:00
Joshua McCloskey
28c0d90491 Clear FP error only on progress. 
Test: Manually verified progress is cleared only
when the user makes progress on fp enrollment.
Fixes: 234094887

Change-Id: I173d2edb94132a4f68e0ef90aa9fa8008a25236f
 2022-06-03 19:07:07 +00:00
Bill Yi
4cfb1ffa90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc23d1f792e657187589de3fba403533fa420906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:48:20 +00:00
Bill Yi
95b19ac0a7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f5afba53003126a77759608733ef880c9aab6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:48:06 +00:00
Bill Yi
6a72c90cac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iee867683389a1ac7769863880bd59c18c4a4ee00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:53 +00:00
Bill Yi
00a68cc896 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a92bd9f7023ed10cfffa03bc32e11af66ee14ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:42 +00:00
Bill Yi
a99136a41f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71c19fea50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I568ceec5dd64d2437afac39549205fcabefc896e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:28 +00:00
Bill Yi
6c8413c9d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 73cce5c14c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8f1df638638d16b76e7e0a53a12455f54e8f152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:13 +00:00
Bill Yi
2ae7a0db93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1217038cc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11ebf35f2daf101e4d8419f4346c587246977339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:47:01 +00:00
Bill Yi
c3d89fb945 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7ce798e7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0c607c52b6b3f3d420500b4cab9502f6b921bb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:46:46 +00:00
Bill Yi
71c19fea50 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-03 18:27:21 +00:00
Bill Yi
1217038cc5 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-03 18:27:21 +00:00
Avinash Vadlamudi
d23aba7042 Fix the Ephemeral guest mode UI bugs 
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest

Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
(cherry picked from commit 9cf1d188a2)
 2022-06-03 10:58:54 +00:00
Alice Kuo
f71b2ea56e Grey out LE audio offload switcher as LE audio isn't enabled/supported 
Screenshot: https://screenshot.googleplex.com/C6pRBzLh7CtNeXr

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Change-Id: I0ea498d2fa191f9b9352b37500a5d2c348b36ce0
 2022-06-03 11:53:33 +08:00
Alice Kuo
b13abc03dd Unify the LE audio string and refine the layout to put LE audio switch together 
Screenshot: https://screenshot.googleplex.com/A6PwLhscRUypgYK

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I2d650eb315790c3efc7510d9e125aeaf4464cda6
 2022-06-03 11:52:50 +08:00
Lin Yuan
5decb8008b [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours am: 15e4092ab1 -s ours am: e3448236fb -s ours am: 791bb4e948 -s ours am: aa303bf841 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa8fdb7f99a4339a7565a9de5b835331fd91f2ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 23:21:15 +00:00
Lin Yuan
b93146c5c6 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours am: 5390d998be -s ours am: c39beae5d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13744e84ed64d9a0421726aa0c2ff3b7174b8928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 23:21:14 +00:00
Lin Yuan
93ab443f81 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours am: 15e4092ab1 -s ours am: e3448236fb -s ours am: d2b4eb16df -s ours am: b3f42ca856 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide37275d8988b6c77a77d6bac0b0afceb41af04c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 23:20:47 +00:00
Lin Yuan
8cbf758a3f [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours am: 43a544c77f -s ours am: 4c82cadaf7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2fdbdd081a0623e165bcf651f3db4d00954acfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 23:20:46 +00:00
Lin Yuan
d13cc2bdc6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours am: 15e4092ab1 -s ours am: e3448236fb -s ours am: 791bb4e948 -s ours am: 539565473e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9872cb3f3fa877ac6afaf1359c986f7acc50e6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 23:20:34 +00:00
Lin Yuan
5418d3bf62 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours am: 5390d998be -s ours am: a4ef44afa5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43beb94b57be7fff899b12deb3be93d02117f0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 23:20:32 +00:00
Lin Yuan
aa303bf841 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours am: 15e4092ab1 -s ours am: e3448236fb -s ours am: 791bb4e948 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic64c245c5d4b46d56723913f78e460e9705cc798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:51:04 +00:00
Lin Yuan
c39beae5d0 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours am: 5390d998be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaf23692a24d4cc273296e8fc564cb14d32fcef49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:51:03 +00:00
Lin Yuan
b3f42ca856 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours am: 15e4092ab1 -s ours am: e3448236fb -s ours am: d2b4eb16df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e2726bfbe468b9304744ec04cff04d5d5de655e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:50:46 +00:00
Lin Yuan
4c82cadaf7 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours am: 43a544c77f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9da5bc1a0063278bec254f1821c32222581196b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:50:45 +00:00
Lin Yuan
539565473e [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours am: 15e4092ab1 -s ours am: e3448236fb -s ours am: 791bb4e948 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I55da50eb51e5e231b1c71c53c657079675e5ea7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:50:42 +00:00
Lin Yuan
a4ef44afa5 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours am: 5390d998be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41907d6719529d3b9f9f42a6484a0e0cb925491b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:50:41 +00:00
Lin Yuan
791bb4e948 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours am: 15e4092ab1 -s ours am: e3448236fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic12e9da7b56b99815fbb0dd347be5b5a5816da9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:33:55 +00:00
Lin Yuan
5390d998be [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: a4609cf869 -s ours am: 2667882654 -s ours am: e7943d5edc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10e9b3ce43e36a5e2d2997585b41b86ddb388899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:33:54 +00:00
Automerger Merge Worker
43163784b1 Merge changes from topic "am-8a1c2556f29f4cbaa6945d3156a205b3" into tm-d1-dev-plus-aosp am: 933f3a97e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386

Change-Id: I431d388da9630a0b8b67720a9c528da33ea87bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:33:39 +00:00
Lin Yuan
b7c00690b9 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 am: 95d21bc12f -s ours am: 18c00007b7 -s ours am: 148b2d99ba -s ours am: fd627f9c1d -s ours am: 729c5d0487 -s ours am: f59cba01c2 -s ours am: e4afecdfbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic33cb968bc037b7693e45e6eb7666dd36d5eba52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:33:38 +00:00
Lin Yuan
57fda70588 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6 am: 95d21bc12f -s ours am: 18c00007b7 -s ours am: 148b2d99ba -s ours am: fd627f9c1d -s ours am: 729c5d0487 -s ours am: d299b72b26 -s ours am: 8aa0045582 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e5fe6fc712a26529fad774db567857c7a76a77a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:32:56 +00:00