Commit Graph

104253 Commits

Author SHA1 Message Date
Lin Yuan
ae2dd3d513 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I3a9a9ef33b0a7fd985861a85d63d5078d3fe5aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:53:38 +00:00
Lin Yuan
d8321f5df7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I23d09d7f0c376493ba30ac38577d196b69d46335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 00:02:52 +00:00
Lin Yuan
f86d507407 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I7884ced3a0a1d29508127fbc263197c20f6ff0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:23:36 +00:00
Lin Yuan
062a9ca549 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Bug: 277333746
Bug: 277333781
Change-Id: I91aa143223d7d37751120aa9246bce4dc31a54a6
2023-04-25 19:24:13 +00:00
Lin Yuan
7591fff234 Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency.
When DISALLOW_CONFIG_LOCATION is set, make location service's
MainSwitchPreference pages for wifi scanning and bluetooth scanning
unavailable too, so that intent direct access is disabled.

screenshot: http://shortn/_kkK3BMTSh1

Bug: 277333746
Bug: 277333781
Test: atest SettingsRoboTests, on device
Change-Id: I52f9a11b1dd78a5e5dbb1bbde3cda7381c87ae39
2023-04-25 19:23:53 +00:00
Jason Chiu
5d50556ce2 [resolved conflict] Refine permission check process of 2-pane deep link am: 0f13f70655
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22235906

Bug: 277168213
Change-Id: I35125125776e350ae7fce5feac4a387868fac7af
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 10:21:27 +00:00
Jason Chiu
0f13f70655 Refine permission check process of 2-pane deep link
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
2023-04-06 04:23:01 +00:00
Julia Reynolds
2a66721ccf [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours am: e4ce644bfe -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie50619f573b47b5998b52d2933465e09397124fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:37:28 +00:00
Julia Reynolds
e4ce644bfe [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours am: 684952a8b0 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I760d7d641cc26d9d640c3504414a16a26d70bc24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:57:36 +00:00
Julia Reynolds
684952a8b0 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours am: 85c25d29d7 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ic239b938c957b82b8eb072ba55b34ab9388a24af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:25:15 +00:00
Julia Reynolds
85c25d29d7 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours am: cfacc2acb8 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I8124bdb6668bc43f275489abb311994ea69645db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:58:46 +00:00
Julia Reynolds
cfacc2acb8 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours am: 8befc27425 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: Ie11a802db36591d58289cd82956c5205f0893244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 16:28:40 +00:00
Julia Reynolds
8befc27425 [automerger skipped] Don't show NLSes with excessively long component names am: 11ac41d9b6 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 79cb59e618 is already in history

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

Change-Id: I8d1fa61e9c43c711725505554b464697f1f1ad4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 15:56:56 +00:00
Julia Reynolds
f1bd633fec [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I3f18d0dfa27c9b8efd19e9f551605f7ff345c145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 22:01:10 +00:00
Julia Reynolds
40bec70af8 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I0c3f8af192ffa31af66955a27ef870122a04ce4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:46:08 +00:00
Julia Reynolds
82fcfa8da0 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 21:16:39 +00:00
Julia Reynolds
7c9190d25a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:43:18 +00:00
Julia Reynolds
ceb2d0400a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 20:25:32 +00:00
Julia Reynolds
94ef1c333f [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Ie295579d5360bdd8b35232e2233f8f572563357e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:46:09 +00:00
Julia Reynolds
7594f2deea [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I22fe2da8599d3a5b002f6c145a15e71ed06634e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:20:42 +00:00
Julia Reynolds
acb5e90d5d [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I844c70ca3340a3800ca2b88b55094fdb9f111635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:08:05 +00:00
Julia Reynolds
cbb6811219 [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is in history

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

Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-28 16:56:07 +00:00
Julia Reynolds
1636440ed3 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I271dc0fe1a1c8bdeb6cebbda04167987f7916cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 16:25:16 +00:00
Julia Reynolds
0f7287271f Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I65575bb2f0bf4b82498c523f8d0b4b76628e2673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:53:58 +00:00
Julia Reynolds
2e701b29dc Don't show NLSes with excessively long component names am: 1f3969f615
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I6316f0181d44d0d0a83f09d36d27cc4839e4ddfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 15:27:55 +00:00
Julia Reynolds
cb2e6fba6d Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: I398ee9f0966e462a6270bd37a8dcf5d915a5ddee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:48:39 +00:00
Julia Reynolds
f2cdc03837 Don't show NLSes with excessively long component names am: 793257967f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290643

Change-Id: If0f7483eb6d79791ade3f8fb51e6f8852292ff15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:48:01 +00:00
Julia Reynolds
d9604dbe15 Don't show NLSes with excessively long component names am: 90ced5d2ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: Iaf70f837d7d41f485d1b6082aa2af535264de3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:45:14 +00:00
Julia Reynolds
11ac41d9b6 Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 16:14:27 +00:00
Julia Reynolds
79cb59e618 Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 16:13:15 +00:00
Julia Reynolds
1f3969f615 Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 13:55:41 +00:00
Julia Reynolds
90ced5d2ec Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 13:54:48 +00:00
Julia Reynolds
793257967f Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
2023-03-27 13:53:52 +00:00
Dmitry Dementyev
a3d15a91e1 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe am: 9bec974991
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I33ee7b0b3fd191ed993a3537d598d102c2d6ffb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 22:18:42 +00:00
Dmitry Dementyev
9bec974991 Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa am: 7f73a168fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: Ia0bfeee6be995a2df857147a0aadc17f41672d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 21:34:39 +00:00
Dmitry Dementyev
7f73a168fe Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef am: 4f67ca0cfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I4815a1e5e05bcee661a8ce037a2671086d16faee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 21:01:01 +00:00
Dmitry Dementyev
4f67ca0cfa Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21 am: 32813a2bef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef Convert argument to intent in AddAccountSettings. am: c7e8052b52 am: f56584cd21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 19:39:21 +00:00
Dmitry Dementyev
f56584cd21 Convert argument to intent in AddAccountSettings. am: c7e8052b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485

Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 19:01:57 +00:00
Dmitry Dementyev
c7e8052b52 Convert argument to intent in AddAccountSettings.
Bug: 265798353
Test: manual
Change-Id: I0051e5d5fc9fd3691504cb5fbb959f701e0bce6a
2023-03-07 10:36:41 -08:00
Julia Reynolds
56e2a08f3f 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: Ie7171fe36f6fda62ce827c41b18e8c625c94359b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:43:17 +00:00
Valentin Iftime
fe2ad5085f [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: I4942c2bb54de7d06d147d1a592ae25ac5184ab9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:43:14 +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
66b0c4e41b [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: I2782cddd33dfa11c0dc1c51b6936776075e4d638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 21:06:55 +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
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
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
Presubmit Automerger Backend
ca46a99755 [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: Ie059ac9fb2556887959eda621b11eb22fe321311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:20:30 +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