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

103582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
f0973dfa33 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 am: 2225b7058b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: Iecbe5647bbe469a0239b594692f66c0226e16df8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:09 +00:00
SongFerngWang
7c173b36f8 The UI only shows the active LE device am: 7f6fcce1d5 am: 787a0e0249 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I6e57db85b4d10586d111e39dcd7ee77e67fd9d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 11:45:05 +00:00
SongFerng Wang
2225b7058b Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" am: e27d1790f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138453

Change-Id: I45a7c8fd77798a873db7ea10683b861ee83b8622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:23 +00:00
SongFerngWang
787a0e0249 The UI only shows the active LE device am: 7f6fcce1d5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2138452

Change-Id: I19dc6c505e7ec9824cf520824ea1ed2d9dcfc196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-28 10:10:22 +00:00
SongFerng Wang
e27d1790f8 Merge changes from topic "cherrypick-LE_summary_active-smt2rklmox" 
* changes:
  Fix the testcase error
  The UI only shows the active LE device
 2022-06-28 09:27:02 +00:00
SongFerngWang
30a312975c Fix the testcase error 
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
Merged-In: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
 2022-06-28 15:18:39 +08:00
SongFerngWang
7f6fcce1d5 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
Merged-In: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-28 15:03:07 +08:00
TreeHugger Robot
d1ff298845 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 91d1b5cc61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd86338286a9313c5d77828b7fca55b691efaa6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:22:19 +00:00
Bill Yi
0a28003111 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 07bfd0bbd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6da453aa496c2e74225e98dcde6f404ce1feebf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:22:14 +00:00
TreeHugger Robot
83d410a6de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8b49ce00c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd27b45e884d7e587665b70f22f126b290a91930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:21:59 +00:00
Bill Yi
9dbc2805b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b070ddda17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68f3e1282310354db78f5327cc71603fea5c32e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 06:21:45 +00:00
TreeHugger Robot
91d1b5cc61 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:42 +00:00
TreeHugger Robot
8b49ce00c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-24 05:55:42 +00:00
Bill Yi
4bdcf48ffe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours am: 9e020b5dc5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09f511551e0d19c7e6a6cc9cd120210ae2c8cd2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:48:17 +00:00
TreeHugger Robot
92bc197d7d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours am: 2d21dce94b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b85b566cf9d8125e1b4aaff8ff88f2f649becfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:46:24 +00:00
Bill Yi
45e908da1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours am: b716d79126 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice9648b489d8713c2b733c3a92767eae4a61beaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:46:17 +00:00
Bill Yi
61bc8e9096 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours am: 7f9fa7fedb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf72157b48ca0dde99d60622bb3bbf7a14e51e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:46:04 +00:00
Bill Yi
a12b67f6ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours am: 4fcc193a8b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2984226ddd04ad01e88f025481b83e0fc9e7f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:40:59 +00:00
Bill Yi
9e020b5dc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49b4ab94b7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d52aed366853fdd6d49e08834224a4c1328e9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:33:58 +00:00
TreeHugger Robot
2d21dce94b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 2614629a50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9c9c5f80f081bbc46f2d9584da1de779dd8a19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:26:08 +00:00
Bill Yi
b716d79126 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5154fc5c35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e5678837487f60f7bdbd9685637048f582b4079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:25:59 +00:00
Bill Yi
7f9fa7fedb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0157713d52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0a4aa6df5b5a9e09080d679dae93f7221f75617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:25:48 +00:00
Bill Yi
4fcc193a8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b398e5434c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaedf643640450877cb8781bfea1ff15983af08db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:14:20 +00:00
TreeHugger Robot
975270c942 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours am: c9a2542867 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5add9401cf7e0ab70f70306bed8f2a2c0fb4b32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:13:38 +00:00
Bill Yi
9eba6b6755 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours am: 6f1895b024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I22bbda51a450224ac33de486378a7fd5be2bfd2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:13:36 +00:00
TreeHugger Robot
3116a23082 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours am: 8cd16f986b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02ad04904910de49692a7235dd35c0bf7040c4e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:13:29 +00:00
Bill Yi
1a6e2f7f6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours am: 7125a6bed3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28579be776c1c68cd5c84df5e6de331b75511a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:13:26 +00:00
Raphael Kim
f338527c54 [automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1 am: 839ce544aa am: 84bafc9fda am: d6353487cf am: 6d5ea9e89a am: fbfa9e2df7 -s ours am: cf3fe49391 -s ours 
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 8d749c55f4 is already in history

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

Change-Id: I7f5cdf0c00c5aefe38887ddc93a3221a403019c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:10:02 +00:00
TreeHugger Robot
c9a2542867 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 21b98d4cbf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I29229d24dddaf8ce8ba2dc419fae78c5232ec989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:08:24 +00:00
Bill Yi
6f1895b024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c36c8eef75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3ac79eabf2ef8f75d3d526c0ad0b64d49d35b3c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:08:19 +00:00
TreeHugger Robot
8cd16f986b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: fc5802934b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5eba9b92ccd648b4b2ca55a1d4ab7013f6ee74d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:08:17 +00:00
Bill Yi
7125a6bed3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 379c2f0774 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9ab785ce8080d1417a374283833fdc3344271d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:08:12 +00:00
Arc Wang
fcbf0ac60b [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0 am: cb82328fac -s ours am: 4b96cb9339 -s ours am: 12f11b0683 -s ours am: ab3adbd4dd -s ours am: a58d975aa0 -s ours am: 5f46cdb737 -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362 is already in history

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

Change-Id: I7962d251abe2f3db34fbeb1baf9633312e955131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:48 +00:00
Tsung-Mao Fang
24ecd6a649 [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177 am: 99a7a61ba9 -s ours am: 2224883488 -s ours am: 2a665430e2 -s ours am: 2e3f8a30a1 -s ours am: ecde630b9f -s ours am: 0572826178 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85fbc4d1a70cc75c123a12c9a26115f56b010136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:47 +00:00
Arc Wang
9f25b6ebb2 [automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304 am: 58880a0bef -s ours am: 1e688667ba -s ours am: 1da60c2f31 -s ours am: 4129c273cc -s ours am: e6135eeb89 -s ours am: eb1d86b66b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb439b97289ea9fb543d5098039b6074895ed6e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:46 +00:00
Arc Wang
d9190b2809 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-dev" into rvc-dev am: 481113b6a3 -s ours am: b9ccfd6534 -s ours am: 5df4e288bb -s ours am: e7ecf11a38 -s ours am: f026e9b800 -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0eb3011fc2 is already in history

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

Change-Id: Iaf4485659b4c3267e0ba219c413f08445b70cd8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:33 +00:00
Tsung-Mao Fang
41d96347fb [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 32145cc362 -s ours am: 797861776d -s ours am: df830ac3fa -s ours am: ab42aa1a96 -s ours am: 6d3f4e10cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I61f286603a6070b5f4d90c6aeca2d7a6316ef8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:32 +00:00
Arc Wang
4b4bc70165 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-rvc-qpr-dev" into rvc-qpr-dev am: 688ec25ca8 -s ours am: 3e93b4e4fc -s ours am: 8d2a48f22f -s ours am: 08df31aab0 -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

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

Change-Id: Iabbd2c2ff3f6fb1083c58e7a5485ce7c0b50022c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:23 +00:00
Tsung-Mao Fang
3eb6af7f2d [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0eb3011fc2 -s ours am: 709a5df6f3 -s ours am: fa1c525740 -s ours am: 09f20493a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5906c171a70303fe3e8e9ca4718d3a63954236e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:22 +00:00
Arc Wang
fa096d03a8 [automerger skipped] Merge changes from topics "presubmit-am-7e93fea7eeca4c76a2b33d5fe115ad40", "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-dev am: ca436b7e59 am: 8b268b18fe -s ours am: 1834c4bbfe -s ours 
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 0d8d05a221 is already in history

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

Change-Id: I8bd05fb7c42e8c92adce7fadf74843b9b20404fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:14 +00:00
Tsung-Mao Fang
88d41c143d [automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: 0d8d05a221 am: 6315e164f7 -s ours am: bf095a51fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a6d445ffa601e051b710592734e904f21f5824b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:12 +00:00
Arc Wang
296df76b36 [automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-sc-dev" into sc-mainline-prod am: 966a2dc8d2 -s ours am: 39fbff813e -s ours 
am skip reason: Merged-In I044b680871472a3c272f6264c4ef272df542112e with SHA-1 67b9fb57ea is already in history

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

Change-Id: I3eea2cee2ad2ec2548b4b13cad6466582cb4a21a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:04 +00:00
Presubmit Automerger Backend
73f28b3dae [automerger skipped] [automerge] [DO NOT MERGE] Fix Settings crash when setting a null ringtone 2p: 67b9fb57ea am: 03dd4cc7d2 -s ours am: 719c5bf03e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6c1f4e0bc25a229b1429f307e5dc4e4a912f190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:07:03 +00:00
Lin Yuan
bbb27f892b [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: 8d1ed52e6b -s ours am: fc42296e3c -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: If2922519093ac72b066ff5cd428af7fb75446a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:06:55 +00:00
Lin Yuan
e86a69a3cc [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: 263c0cfaca -s ours am: 1911d2fbb4 -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: Ifdf41e3e2f98cc8364573fc8feaac1e784c15f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:06:54 +00:00
Lin Yuan
6ccbbd7dba [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: 8e637809fd -s ours am: 312065af42 -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: I61e7caa68e18dceaf6b6ac2ae965d16ae30511f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:06:44 +00:00
Lin Yuan
7379f86f26 [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a am: d78ed7aa73 -s ours am: 36b5a2c8d3 -s ours am: afc61aa166 -s ours am: 86756bbbcc -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: I42431146591b77d0a4fbd2bd92d9818c30c8f9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:06:42 +00:00
Lin Yuan
fb56a11044 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 1e45df2451 -s ours am: 4b9394808a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f3795a4612654ec4ad03551da039d6770b78025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:06:35 +00:00
Lin Yuan
2bae1371a6 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-mainline-prod am: 10b5ab82f5 am: ae20f0e5bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I8b62f200d6701877f75de8bfaca054782827820e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:06:28 +00:00
Presubmit Automerger Backend
4803e01432 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: a31031e5bb -s ours am: 24d50a6c2d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5da4881f87671a2f04b30e0759ddd377ec8f3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-24 01:06:27 +00:00