TreeHugger Robot
32c150e8ea
Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330fb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645
Change-Id: I7bb7e5fd8e647e2f99532ef56effcf9b1f10587d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:18:04 +00:00
Chaohui Wang
afab1d4250
Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963
Change-Id: I7d4f1d5299aebc1bc01da4def39703a28d7a5fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:16:53 +00:00
Chaohui Wang
5ec794285e
Fix SettingsRoboTests am: 36dfb5ac0b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23696638
Change-Id: I13783f780c085e99536da114500733b54568227b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 10:16:32 +00:00
TreeHugger Robot
a1fd330fb5
Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev
2023-06-15 09:42:19 +00:00
Chaohui Wang
9aa7466cf2
Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev
2023-06-15 09:29:39 +00:00
Chaohui Wang
bb47f32011
Fix bluetooth settings pairing page stuck
...
There is heavy work to do when add device to list in the
DeviceListPreferenceFragment, off load these work from main thread
to solve the issue.
Make devicePreferenceMap a ConcurrentHashMap to avoid potential race
condition.
Also no longer use getCachedPreference(key) since we not put anything
into the cache, the fallback flow is always used.
Also in BluetoothDevicePreference.onPreferenceAttributesChanged(), move
more heavy work to background thread.
Using System.currentTimeMillis() to sort devices could cause flaky
because System.currentTimeMillis() could be same for different device,
use AtomicInteger instead.
Fix: 286628533
Test: Following the step in bug
Change-Id: Ia9750adb6b4c1424d084381e9d7c2ca8e7912391
2023-06-15 08:43:17 +00:00
Chaohui Wang
36dfb5ac0b
Fix SettingsRoboTests
...
Mock the getViewLifecycleOwner in test to fix.
Fix: 287387514
Test: m RunSettingsRoboTests
Change-Id: I346930e9655e4f78227276aee4c2a4e5ae6962e0
2023-06-15 16:33:05 +08:00
Rhed Jao
721a7bacaa
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341
Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 06:34:53 +00:00
TreeHugger Robot
f5acc230b3
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: ee77d651fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884
Change-Id: I70bef64fcefc75fc3d3496c76d4af9c85efdd9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 06:31:38 +00:00
TreeHugger Robot
ee77d651fa
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884
Change-Id: I8bbc5d48e272ab0a5b7880f1ee3b99043df64665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 05:00:40 +00:00
Rhed Jao
e1c9d65cda
Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev
2023-06-15 04:55:45 +00:00
Treehugger Robot
0b25525328
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c am: d4aa1b65a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I403765aae030e5b1aea4482fc161a43932148b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 04:38:06 +00:00
TreeHugger Robot
1765c1dc6e
Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev
2023-06-15 04:07:32 +00:00
Chaohui Wang
5d847e0207
Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev am: 8617f63823
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659924
Change-Id: I71e428a2a332e4ed6f3d4719c28cb5408aeaeb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 03:59:56 +00:00
Treehugger Robot
d4aa1b65a5
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450
Change-Id: I159952074306255db4397de180ee4b49eb78613b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 03:53:50 +00:00
Treehugger Robot
8182348d5c
Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev
2023-06-15 03:02:41 +00:00
Chaohui Wang
8617f63823
Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev
2023-06-15 03:00:52 +00:00
tom hsu
8bb09238bb
[Settings] Avoid NPE when user enter WifiCallingSettings back and forth
...
Bug: 277833102
Test: Manual test
Change-Id: Ifd3272ddf8b8a27fc7772d860653df2c33a3df7b
2023-06-15 02:58:42 +00:00
Rhed Jao
b7a4a7daa4
[Settings] Add a verification flow for exiting repair mode
...
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.
Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
settings put global repair_mode_active 1
am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
2023-06-15 02:14:41 +00:00
Hao Dong
a9f1ed3501
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181
Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-15 01:45:55 +00:00
Hao Dong
61659799de
Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev
2023-06-15 01:22:22 +00:00
Matías Hernández
92fa0bcfd7
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 2f1883c397 -s ours am: dfef40cb74 -s ours am: becca315c3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I0f90e18b865ad25ad462bbb2f9695b6531802317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:15:19 +00:00
Matías Hernández
b3654eefc9
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 5a51d41a4c -s ours am: d2d1643c2f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I2ca95a5fca029075a0d940dbd8029d64d957023d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:15:11 +00:00
Matías Hernández
26d18d8182
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 5a43ab914c -s ours am: c2d5f12351 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I34cb68d75e7763e98b606bb37a0d899fc8dffc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:15:03 +00:00
Matías Hernández
b6140d21f0
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 95a2f32e7d -s ours am: 6c6184ef61 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I690f62901457f6fc7d0c4b530781aa88dcc710ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:55 +00:00
Matías Hernández
f87c8ea544
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 4226b5bb24 -s ours am: cdca315c80 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I90a3075baefd09d10da5e13dc4bf22a493525a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:47 +00:00
Matías Hernández
2c36be4494
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: bbfe425326 am: ed1b91ffdc am: c39ab727ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Iadbb767394a51f256643eeaafee0f71f1a62487c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:39 +00:00
Matías Hernández
7df9182d8c
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce am: 68a0fc9469 am: 209fe19e63
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ia06a25c6ba863003118c65f5141b5e11bd7991d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:14:30 +00:00
Matías Hernández
89c5d6f524
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: 33e5518af1 am: 1be0ca9c45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ib744bb8aba0ba7fbfef12af7884eda333803678f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:13:52 +00:00
Matías Hernández
150dc64053
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 0166bcc776 am: 46cdbed02e am: a820fd4bce am: 0bdda899d3 am: 7a97196347
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: I2aea3a9eb79030ae060382916ccf6ee3a5272951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:12:39 +00:00
Matías Hernández
88bfc017fa
Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: e8cfc9cb3d am: 4c941d3a97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580
Change-Id: Ic16366122cb83cc770254a12a49a1f22370260da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:11:37 +00:00
Treehugger Robot
1772660414
Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 am: 03b39bc5d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725
Change-Id: I04e22d89b03c0e0b303357d5495db85343e4911f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:10:58 +00:00
SongFerng Wang
143d1f50ee
Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 am: 7f29649aa9 am: 2a6553b122
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23688861
Change-Id: Ib77854f005228a2193682cc3e55406e0ef60e651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:10:07 +00:00
TreeHugger Robot
f1ead71b4f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 90cf6e8a3c -s ours am: c358727f7e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I7afba6666b2238be172cbe1d8aa8b7b47b24a211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:08:44 +00:00
Bill Yi
4c42839007
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db8e6f51ff -s ours am: 7b59426838 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664848
Change-Id: I98e8ff052b4ba476a69786b2c0bb7aedc9daf38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:08:37 +00:00
TreeHugger Robot
8a6ab3ca57
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9d38813d4b -s ours am: 2d110c54dd -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: Ibd38cdfc5bad9990a704960e1730cdb5b99ee1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:08:33 +00:00
Bill Yi
98d73f6e56
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b47c44e4dd -s ours am: 03aece6855 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664845
Change-Id: Id45308caccfb611a9fc51de9894253ac639dd4e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:08:10 +00:00
TreeHugger Robot
c97ef4db81
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c937ce7a22 -s ours am: 49a26f49c7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: Id6a514b2d6f861bc3a121d4be1a04a827cdd57ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:07:47 +00:00
Bill Yi
13f57aa232
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 948e9dd4e3 -s ours am: 4f14f98b2f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664036
Change-Id: Ic4bf9bb6f768cf7dfd7f443212d7995964204b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 19:07:26 +00:00
Matías Hernández
becca315c3
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 2f1883c397 -s ours am: dfef40cb74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Ib1bf67ee6a50689381b9a6f9d2ccab3059bc3809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:55:49 +00:00
Matías Hernández
d2d1643c2f
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 5a51d41a4c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Id3a92533d3197288644fe1aba8db9e101887125a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:55:42 +00:00
Matías Hernández
c2d5f12351
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 5a43ab914c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I628c03631db5381f8cbbaac34ec27ee5525de510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:55:32 +00:00
Matías Hernández
dfef40cb74
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 2f1883c397 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I8aaec15d21be327b17e6a2645ef04ac431633afd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:55:17 +00:00
Matías Hernández
6c6184ef61
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours am: 95a2f32e7d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I2aae79eda392ce1067d52917b7c43e2ba05197bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:53:45 +00:00
Matías Hernández
cdca315c80
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours am: 4226b5bb24 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Iac8de36652e2d1c4a69f1737039d981e8be29c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:52:51 +00:00
Matías Hernández
5a51d41a4c
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I5f6a9dd6f7ca79d0c34386d907282b4870c9ccc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:13:14 +00:00
Matías Hernández
95a2f32e7d
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours am: 42339b4e56 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Ibde49999268f3191cb88dd354794d0e014694e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:11:22 +00:00
Matías Hernández
2f1883c397
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14ddd8b659 -s ours am: 85cad88256 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: Ic98a1c7f24ecc89b74dae1d1edcee9bdf0bab335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:09:45 +00:00
Matías Hernández
5a43ab914c
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I721a9e800419dbb55903f02021734b741c1fec95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:09:33 +00:00
Matías Hernández
4226b5bb24
[automerger skipped] DO NOT MERGE Don't hide approved NLSes in Settings am: 173cc267e0 am: d7608c84b4 -s ours am: 78a4048eac -s ours am: b971690a4e -s ours am: d185f3aebf -s ours am: 897c8321a6 -s ours am: 14c85fff7d -s ours am: 41d3ecca1c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563581
Change-Id: I18649342b9ed4735aa7dfb55ce2eb7b50e472e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 18:09:28 +00:00
