Commit Graph

120690 Commits

Author SHA1 Message Date
Valentin Iftime
55ca89a36d [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours am: ed73e49a2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d0e601abfa4f29691c061cef5097e70c9ee875c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 21:13:38 +00:00
Valentin Iftime
ed73e49a2c [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3aa4a584e42eef11cc12c790488aff284cd93acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:44:33 +00:00
Patty Huang
ff16a5f033 Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 am: 9745460cad
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: If01014be9fd1c2d8a5f52b41e4f815a95e64883d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 20:17:21 +00:00
Patty Huang
9745460cad Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I30cf2f5e5fcf534877986839aba2f908b8f3b461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:44:08 +00:00
Treehugger Robot
75d984c200 [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours am: 3e7889ce0d -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I3b1ac610de89529fb068f70d1158791f814f6830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:29:10 +00:00
Treehugger Robot
3e7889ce0d [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

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

Change-Id: I63e0e83bad08da0869f07ae4b58c18f2e80cd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 19:00:10 +00:00
Matías Hernández
6994a18c26 Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev am: 4f4368b7c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21873239

Change-Id: I0425ab55d689001590e664872b738a2acbcd5a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 18:20:59 +00:00
Matías Hernández
4f4368b7c2 Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev 2023-03-07 18:18:27 +00:00
Matías Hernández
bf1b95e0fe Don't allow setting channels to bypass DND if the app cannot show notifications
The fix makes the flow more consistent with preexisting behavior:
* Apps appear in the "Apps that can interrupt" section only if some channels are set to bypass DND *and* the app is able to show notifications.
* Channels cannot be set to bypass if those individual channels are blocked.

Fixes: 265064188
Test: atest AppChannelsBypassingDndPreferenceControllerTest
Change-Id: If10f086fd60f0f70f53adb8f5cd67f90936bc35f
2023-03-07 16:41:36 +01:00
TreeHugger Robot
9069305926 Merge "Fix battery saver switch test case" into udc-dev am: e4058d20a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809668

Change-Id: Ie27d402ac7e1972d5143a081c78df95374af7ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 13:53:45 +00:00
TreeHugger Robot
e4058d20a7 Merge "Fix battery saver switch test case" into udc-dev 2023-03-07 13:13:19 +00:00
Wesley Wang
5d18287b3b Fix battery saver switch test case
- Fix the test fail which cause by ag/21784766, and also mentioned at
   ag/21644522

Bug: 260380584
Test: make SettingsRoboTests
Change-Id: I72a7a24f57a7eeeacefeb40eef3025398329379b
2023-03-07 11:44:55 +00:00
Sunny Shao
ea5b2854af Merge "Add the SPA page enter/leave logging metrcis." into udc-dev am: cb24cb29db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21787864

Change-Id: I81f0cfcabbf2480c5a5b5083012597d465d457f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:23:23 +00:00
Daniel Huang
bb54f76325 Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev am: a2375807ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809665

Change-Id: Ibeb356895d1f22653afb70ee50b7e4819167e3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:22:10 +00:00
Sunny Shao
cb24cb29db Merge "Add the SPA page enter/leave logging metrcis." into udc-dev 2023-03-07 10:12:55 +00:00
Daniel Huang
a2375807ec Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev 2023-03-07 10:08:10 +00:00
SongFerng Wang
79d519346f Merge "Using upper case country code" into udc-dev am: 524b15c627
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809663

Change-Id: Id81fe803e40d276ec2cb53a11f43cef0918864f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 10:05:03 +00:00
SongFerng Wang
524b15c627 Merge "Using upper case country code" into udc-dev 2023-03-07 09:43:30 +00:00
danielwbhuang
cf4be05b64 Update KeyboardLayoutPickerControllerTest
The logic is changed, so we need to update the test. (https://screenshot.googleplex.com/AnrJgmGfK2fPxmQ.png)

Bug: 270109384
Test: atest KeyboardLayoutPickerControllerTest
[1/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#isAlwaysAvailable: PASSED (5.876s)
[2/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddTwoPreference: PASSED (192ms)
[3/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getSameDevice_shouldFinish: PASSED (5.797s)
[4/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_shouldRegisterInputManager: PASSED (1.495s)
[5/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddOnePreference: PASSED (75ms)
[6/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getDifferentDevice_shouldNotFinish: PASSED (366ms)
[7/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStop_shouldCancelRegisterInputManager: PASSED (65ms)
[8/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_NoInputDevice_shouldReturn: PASSED (309ms)

Change-Id: I018873cba9e73c6d684d828858cc1b08d3f2f7f9
2023-03-07 16:31:15 +08:00
SongFerngWang
d1d1ecc9d3 Using upper case country code
According to the ISO 3166-1, the two letters country code is upper case.

Bug: 271753491
Test: build pass and local test
Change-Id: Ia71cb6de45682407e4d988522c50d83659fe0017
2023-03-07 16:27:36 +08:00
Sunny Shao
de797e1198 Add the SPA page enter/leave logging metrcis.
- Add the SpaLogProvider and SpaLogData for logging writing.
- Write the SPA page enter/leave logging.

Fixes: 271793388
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I0ad5af39ba207ac00d58f6392496effa3adc42f4
2023-03-07 16:10:56 +08:00
Angela Wang
4efb1f47f9 Merge "Updates to use flash notification settings keys in settings provider" into udc-dev am: ccb009c34f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21507358

Change-Id: Id824e4ebb5c9701db8af67e155d242a89c5160ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 07:20:04 +00:00
Angela Wang
ccb009c34f Merge "Updates to use flash notification settings keys in settings provider" into udc-dev 2023-03-07 06:58:53 +00:00
Tom Hsu
1d2a29ace5 Merge "Add confirmation dialog for system locale change." into udc-dev am: 39129e09d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21740799

Change-Id: Ic22299672f5063265dd6c024fae2e6442c83ae02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:50:08 +00:00
Tom Hsu
39129e09d3 Merge "Add confirmation dialog for system locale change." into udc-dev 2023-03-07 03:31:02 +00:00
Julia Reynolds
90811b8f61 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours am: a5cb399e33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0546316e2537d9d7c128cd4691e465a85c5aca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:53:53 +00:00
Valentin Iftime
d1d457c8ef [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours am: 940d0ca617 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I813d6d4d45bbf4138459fc135214cade84e341d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:53:51 +00:00
Julia Reynolds
a5cb399e33 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I48f619653dd7d9c93200c7dcff5167f3be4a032d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:15:54 +00:00
Valentin Iftime
940d0ca617 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd3fa951f0536c29edf94fffd8b6ab9a4550041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 01:15:46 +00:00
Julia Reynolds
03d8116dec Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Ibb5eb78a2a204c65e07b5d7aadb1192140d885fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:42:46 +00:00
Valentin Iftime
573ee43d30 [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I7720486012e67028bfa6887fa02078ad0094e00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:42:42 +00:00
Julia Reynolds
65a6e18fcb Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev 2023-03-07 00:03:01 +00:00
Iavor-Valentin Iftime
31f45753c9 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 64ed6231d7 -s ours am: 47130733e3 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: I1657aebcad0360cb3d4f2038dfc007f68edc9032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 22:15:27 +00:00
Iavor-Valentin Iftime
47130733e3 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 64ed6231d7 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: I17328bdff6629464c78592983be1792889192d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 21:38:22 +00:00
Iavor-Valentin Iftime
64ed6231d7 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: Ib2982a404593ddea6437f76c5eb62dce2370e70b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 21:06:45 +00:00
Iavor-Valentin Iftime
5cd3dc7d1d [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: Iab2124de0eabd08b6ac97d3302b0ce06d627f138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 20:26:13 +00:00
Valentin Iftime
cf9f09008b [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30909e801232abebc967cdc33cdbcffe4b4a41f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:56:12 +00:00
Iavor-Valentin Iftime
7a997113d1 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: Ie578f8dd5ff04a85cff54040d36cef9331e20f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:49:21 +00:00
Presubmit Automerger Backend
845f667f47 [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ceb3161d14 -s ours am: 5e017cca99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7ae3e6a71c9047682e465e347136e2a43d0a16f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:48:37 +00:00
Valentin Iftime
e43a9c0dc4 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: bc6fff715d -s ours am: 2e4ebc1759 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic423e377b284751edd7c347b81e4a99b8dddab83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:47:44 +00:00
Valentin Iftime
f383a0a176 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I998d7c23d1e24de08c3eecd282265ad069e36bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:55:09 +00:00
Presubmit Automerger Backend
5e017cca99 [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ceb3161d14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6adc360e67ee07d67c0c1bfd471b837892cbcfc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:52:33 +00:00
Iavor-Valentin Iftime
89c9dc07df [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: Icf801ae03384820cde40bf452e906720310b9c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:52:18 +00:00
Valentin Iftime
2e4ebc1759 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: bc6fff715d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5aa077fd7d5ab41cd381f3c65e46512c94bc00d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:51:51 +00:00
Valentin Iftime
0fd2472a0a [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41883fd8c3ae7406f2143d3e5caad5c256a38a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:19:29 +00:00
Presubmit Automerger Backend
ceb3161d14 [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dc7783b274603e316e72f5a37d10f9ae6b17169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:19:17 +00:00
Valentin Iftime
bc6fff715d [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6844c8000a7ff0fe12680686526d39eabb5be17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:18:46 +00:00
Iavor-Valentin Iftime
91ade78763 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

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

Change-Id: I5de53e483836d8324f70aba0ac3524ec0136e570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:16:16 +00:00
Presubmit Automerger Backend
d9561eccb6 [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a7a9cec98eef9a7fb4ac97b1d12ed4e60610953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 17:58:35 +00:00
Presubmit Automerger Backend
3d35d4f195 [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I24706c16914df481703c844313d8d1bd340e0e20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 17:43:48 +00:00