SongFerng Wang
4362f09737
Merge "Fix the burst callback issue on the repository" into main am: a23320eedd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2780887
Change-Id: Ia0f4f76a704973e123cfe5e4c2d571bbea0c861f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 09:41:19 +00:00
Hyundo Moon
e07cfd8b0b
Merge "Send bluetooth permission reply intent only to BT package" into main
2023-11-07 09:19:39 +00:00
SongFerng Wang
e60c9521c2
Merge "To avoid crash IllegalStateException" into main
2023-11-07 09:16:30 +00:00
SongFerng Wang
a23320eedd
Merge "Fix the burst callback issue on the repository" into main
2023-11-07 09:11:06 +00:00
Yiyi Shen
e4aabf044a
Merge "[Audiosharing] Impl audio sharing main switch." into main
2023-11-07 09:05:39 +00:00
Jun Lan
b29cadb3dc
Merge "Format battery java test code" into main
2023-11-07 09:03:33 +00:00
SongFerngWang
5eae90d731
To avoid crash IllegalStateException
...
Bug: 308855978
Test: [pass]make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ia0a1cbe0326e63b878c3fe7797ca47e25ccc16d4
2023-11-07 16:00:41 +08:00
Yiyi Shen
87372de071
[Audiosharing] Impl audio sharing main switch.
...
Start/stop broadcast when >=1 eligible buds connected.
Flagged with enable_le_audio_sharing
Bug: 305620450
Test: Manual
Change-Id: Ic982571f49ab79c39d0503929df4bb8be64b720e
2023-11-07 15:41:34 +08:00
Treehugger Robot
3c1a8eff2f
[automerger skipped] Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
am: f19320aca6
-s ours am: 20ceda45d4
-s ours
...
am skip reason: Merged-In Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96 with SHA-1 ad01bf88a7
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: I2b40787394aa20d254ceb0c2f1c76e32598f2e93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 06:02:40 +00:00
Treehugger Robot
ad1893a886
[automerger skipped] Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
am: 3521df9dca
am: e79bdaef63
-s ours
...
am skip reason: Merged-In Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96 with SHA-1 a5d82be483
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: If3add404ec99e96961c928cf27e9d3b25c637301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 06:02:16 +00:00
Chaohui Wang
0d338cd1df
Let SpaBridgeActivity support ActivityEmbedding
...
Move the multi pane shared logic into EmbeddedDeepLinkUtils.
Fix: 309075424
Test: manual - with SpaActivity
Test: unit tests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=".*\.SettingsActivityTest"
Change-Id: I8c41c801b8a5009a3959c85b784ed9739d947a70
2023-11-07 13:24:59 +08:00
Treehugger Robot
20ceda45d4
[automerger skipped] Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
am: f19320aca6
-s ours
...
am skip reason: Merged-In Iaaa37a8e55d755f8abcbaa26c31bf7962e166e96 with SHA-1 ad01bf88a7
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: Idaaf14e0a312aaa1a9dc51c91273ad9fa9423faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 05:21:11 +00:00
Treehugger Robot
e79bdaef63
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
am: 3521df9dca
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: Ic739f9650dcfe638521dc0488c397ef9b8fa5ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 05:18:50 +00:00
Haijie Hong
005c47f19c
Add feature flags for VolumePlus
...
BUG: 309052662
Test: m Settings
Change-Id: I36aad5bb290aee835d586f0791347ab3a05e77f1
2023-11-07 04:55:49 +00:00
Treehugger Robot
f19320aca6
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: I71614129cf95ac29f845dadf479135dcb3a5a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 04:52:27 +00:00
Treehugger Robot
3521df9dca
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325
Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-07 04:48:36 +00:00
Jun Lan
358a85ecfe
Format battery java test code
...
context:go/pixel-energizer-java-format
Test: manual
Bug: 304439460
Fix: 304439460
Change-Id: I5be0ee41afb3a7018bc7e25cceccc25669924d6c
2023-11-07 12:27:43 +08:00
Treehugger Robot
85ca373e75
Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main
2023-11-07 04:08:35 +00:00
Treehugger Robot
01e207ede7
Merge "Check if the bedtime settings intent is null before launch" into main
2023-11-07 02:58:40 +00:00
Wa Gao
2ddabf5785
Merge "Add the controller for the top switch." into main
2023-11-07 01:22:43 +00:00
Wa Gao
aa5d7420db
Add the controller for the top switch.
...
Bug: 302189945
Change-Id: Ie43ac181e643a8b215ca830afc6ef670d91a5762
2023-11-06 23:46:56 +00:00
Evan Chen
c218eb5d60
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
am: 0ff2532331
am: b375697a26
am: 20349c8e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: If44b3568b159ea5e2ebbae2791044ad17c9df610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:52:59 +00:00
Evan Chen
bd9f86d059
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
am: aed207ff31
am: 3511d5be34
am: 813729892a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I40a0f82f64daf060df185e9a86326c72a5bd0c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:52:20 +00:00
Evan Chen
75a0f0c4f8
Make sure work profile app cant enable notification listener services am: 5c6ca7959c
am: dab54b5734
am: cdc4580ec5
am: b2fd3a7029
am: 985f2d27f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551
Change-Id: I4f36808e54e1f78569a77a0260b8929d1339ba81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:51:40 +00:00
Evan Chen
b199308f57
Make sure work profile app cant enable notification listener services am: aa122da7d6
am: 2abb356f2d
am: cf17056d6d
am: 858221156a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537
Change-Id: I70239c51921193871a8ff4a0f123b0c9a38775a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:50:58 +00:00
Bill Yi
2ae41f33de
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d333b903dd
-s ours am: ecd4ffaf4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25276605
Change-Id: I7fe87f2890d69e5c006323703d655a4a0bf5303c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:47:08 +00:00
Bill Yi
64cba2cb13
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b3105688b
-s ours am: 12fc0e97ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25276605
Change-Id: Ib5352a78fcd7f689c06e341eee5be927f17e6582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:47:05 +00:00
Evan Chen
231ece5e7b
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
am: 1ffcf416b5
am: f610f59272
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I93306c8fc34a7d89ea12d1e68ac75cae9729d2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:46:43 +00:00
Evan Chen
75197c2d04
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
am: e08372af9e
am: 073f7c37fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: Ice8289ffe8939db18285d3da93275b06997eaa1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:46:28 +00:00
Nino Jagar
a6e8467375
Merge "Update content protection toggle title text" into main
2023-11-06 22:40:05 +00:00
Eghosa Ewansiha-Vlachavas
4211b4a83c
Merge "Set aspect ratio app list settings page id as attribtion in logs" into main
2023-11-06 22:38:10 +00:00
Evan Chen
20349c8e5a
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
am: 0ff2532331
am: b375697a26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I765b1bcb6779b2db7f88063d36d1a036d0981577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:43 +00:00
Evan Chen
813729892a
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
am: aed207ff31
am: 3511d5be34
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I7174453e4b835ad995290b73b67e285dd99c64b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:34 +00:00
Evan Chen
985f2d27f9
Make sure work profile app cant enable notification listener services am: 5c6ca7959c
am: dab54b5734
am: cdc4580ec5
am: b2fd3a7029
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551
Change-Id: I0e5bdc29fb9e02b9a608b0e0fa789551d72e1bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:25 +00:00
Evan Chen
858221156a
Make sure work profile app cant enable notification listener services am: aa122da7d6
am: 2abb356f2d
am: cf17056d6d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537
Change-Id: Id35b32e71b13e2afc54c619b390ce4c2d2700b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:15:15 +00:00
Bill Yi
ecd4ffaf4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d333b903dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25276605
Change-Id: I0e8abfd0dd5b99781ac3c5ab68722ac3069e4fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:12:19 +00:00
Bill Yi
12fc0e97ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b3105688b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25276605
Change-Id: I6dec091708ec663571c45b6e919ca5bcaf3a701b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:12:02 +00:00
Evan Chen
d0cf24d6fd
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
am: 234916b836
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: Idae3b94a4531033c01d2548787ae402e42b9591a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:11:01 +00:00
Evan Chen
4f56613f85
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
am: 275cb36e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: Ia47af93a15d99b60071896ab60de72e889ee2357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:10:38 +00:00
Evan Chen
f610f59272
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
am: 1ffcf416b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I46debae6fb053a7c17ea9ef608de114002250c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:05:57 +00:00
Evan Chen
073f7c37fa
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
am: e08372af9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I1189d41247c5716d408024cd21ddcff18410f545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:05:48 +00:00
Evan Chen
b375697a26
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
am: 0ff2532331
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I460ee08df5313e35aec873719688ea19df568774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:04:15 +00:00
Evan Chen
3511d5be34
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
am: aed207ff31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I01bf49740321a66ebb0c20dd68e06e2baad9916e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 22:03:58 +00:00
Nino Jagar
b5dff8f921
Merge "Use DeviceConfig flag instead of aconfig flag" into main
2023-11-06 21:33:39 +00:00
Evan Chen
0ff2532331
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I94766bf9a74894c16f60258e68fccd2f5ad1a0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:29:48 +00:00
Evan Chen
aed207ff31
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: Ia69b3586114ad332f8c50214d42f436ea7966909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:29:34 +00:00
Evan Chen
234916b836
Make sure work profile app cant enable notification listener services am: 3465535747
am: 3cd41d5c6f
am: 0947ff6b98
am: 91233dd150
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I9f12a92d0e87557a371260d7f1f9e3a564683541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:27:38 +00:00
Evan Chen
275cb36e07
Make sure work profile app cant enable notification listener services am: 3465535747
am: d1eadc08dc
am: 9b0c7298cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539
Change-Id: I6df6d866c4ffcea7592c653a2bf9ad20ca91fdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:27:31 +00:00
Evan Chen
b2fd3a7029
Make sure work profile app cant enable notification listener services am: 5c6ca7959c
am: dab54b5734
am: cdc4580ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551
Change-Id: I481338eaa8aa7a2b46aa89428216c8abf7c84f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:26:57 +00:00
Evan Chen
cf17056d6d
Make sure work profile app cant enable notification listener services am: aa122da7d6
am: 2abb356f2d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537
Change-Id: Ibb248b6478bc973fedaef8cc628eb6a0c53220f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-06 21:26:50 +00:00