Commit Graph

104457 Commits

Author SHA1 Message Date
Chris Antol
68fd19a9df [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours am: 248f8b8d9f -s ours
am skip reason: contains skip directive

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

Change-Id: If26c980b21652274bcbf2ef638824f7d871de7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:39:05 +00:00
Chris Antol
59b6740a52 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours am: 437ba81130 -s ours
am skip reason: contains skip directive

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

Change-Id: I366573aba963027ecb27346c9d7655fa4ef2d5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:38:54 +00:00
Chris Antol
54eb16a0ec [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours am: 46283eeefe -s ours
am skip reason: contains skip directive

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

Change-Id: I8660c4d40c457b0d10c16a7901172cefcc96bb01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:38:50 +00:00
Chris Antol
248f8b8d9f [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours am: c7ee3d1670 -s ours
am skip reason: contains skip directive

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

Change-Id: I385748011c362687774bed8c4bbd3ca054097e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:50 +00:00
Chris Antol
437ba81130 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9 -s ours
am skip reason: contains skip directive

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

Change-Id: Ifdeb98b970651ca19451432f10e502f8441d6164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:32 +00:00
Chris Antol
46283eeefe [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6 -s ours
am skip reason: contains skip directive

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

Change-Id: I4b23bf697513f2da855f209b4fcf035f4584c9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:22:24 +00:00
Chris Antol
63e3d91b32 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0 -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: Id29a7c4c325af4df837d904bec2eb406abdead53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:17:20 +00:00
Chris Antol
c909913f89 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e -s ours
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 7f1c4df02d is already in history

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

Change-Id: I03ee7cab0cc090fcd41fa313551ecc3416cef49e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:17:14 +00:00
Chris Antol
c7ee3d1670 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e -s ours
am skip reason: contains skip directive

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

Change-Id: Ie58434a2a765d1fbfa6436433d84d80763838d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 20:16:36 +00:00
Chris Antol
7fed195ad9 Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev 2024-06-24 20:08:15 +00:00
Chris Antol
477f4f21f0 Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev 2024-06-24 20:07:36 +00:00
Chris Antol
c5faf1d79a [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours am: 63c74b58a0 -s ours
am skip reason: contains skip directive

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

Change-Id: I554aa339ba36871b3278e4bde47e9e0b96e58499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:32:31 +00:00
Chris Antol
676e3e72ea [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours am: 0621f87f2c -s ours
am skip reason: contains skip directive

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

Change-Id: I610bfcbc8fa7443b8bf58c059c4601987b5598e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:32:21 +00:00
Chris Antol
63c74b58a0 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours am: 49877d4d16 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic412acf8f15af4d3f0abc0242edded5a17f57f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:20:09 +00:00
Chris Antol
0621f87f2c [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours am: b83437b203 -s ours
am skip reason: contains skip directive

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

Change-Id: I56cfaf769eae9492072e2c4fcd3e9d8c4ac17213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:20:02 +00:00
Chris Antol
49877d4d16 [automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf am: f158052ead -s ours
am skip reason: contains skip directive

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

Change-Id: I5b135fae2920550fcfe3fe511c0b51ba2342ff86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:02:40 +00:00
Chris Antol
b83437b203 [automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d am: 09f1d4c06b -s ours
am skip reason: contains skip directive

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

Change-Id: I4845864eb5c4eb981f4c953468c9d4e03acbb017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 19:02:30 +00:00
Chris Antol
f158052ead Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: If9375e24f43af2c0767eb8fe9d884af92f227fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 18:44:14 +00:00
Chris Antol
09f1d4c06b RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530

Change-Id: I269189a46b4c311bb8ff34e45d8d341bec54d7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-24 18:44:11 +00:00
Chris Antol
768eef96cf Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev 2024-06-24 18:24:09 +00:00
Chris Antol
fcc9252a67 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours am: cd0dbf0048 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: Ifb045f2f72ba0d1332f304e715210b4e16fe4b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:42 +00:00
Chris Antol
bb9e14f93d [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours am: c66ea394a4 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: Ifed3d08a7a6bda4c32727d6b298dd71d5f437db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:40 +00:00
Chris Antol
43dd6d2c82 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours am: b14a76b7f8 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: Ic3335b63d8db8f3c83b089b965ff8eaaa4cfa20c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:27 +00:00
Chris Antol
84fed529a2 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours am: c2f70df823 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: I6fd8b1f57dad36bf77339a7f00fae134c1434b34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 02:18:23 +00:00
Chris Antol
cd0dbf0048 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours am: 0b4c1120ef -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: If90692fe73b063ea6ce13a5d7be6ca02a5783dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:25 +00:00
Chris Antol
c66ea394a4 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours am: 2d4f02e360 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: Ie6c3494f1e3afe5de2639294204178cbc8ca421c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:19 +00:00
Chris Antol
b14a76b7f8 [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev am: 0c15f71ece -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: I8360aa9ea4dccb569401cfac271b7f30d4faf196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:07 +00:00
Chris Antol
c2f70df823 [automerger skipped] Ignore fragment attr from ext authenticator resource am: e2dc98c21d -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 24e2f2d2f6 is already in history

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

Change-Id: Id94c41c0985dad28470519ff96b7ff19f61dc0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:56:00 +00:00
Chris Antol
dd1692a16d [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into tm-dev am: 4b073bf14c -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

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

Change-Id: I54aacf80026eda2fc70766a243e4ccfff216868f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:49:17 +00:00
Chris Antol
2d9969176b [automerger skipped] Ignore fragment attr from ext authenticator resource am: 24e2f2d2f6 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 7e0b376b11 is already in history

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

Change-Id: I3da5c4afe6754373d047f9e8a9fb186e16ec80c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:49:12 +00:00
Chris Antol
383cbae5a3 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668 am: 7a2e7aac88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I70b72fa0ac4f7dd5db7ff02e3edba7867263c6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:48:44 +00:00
Chris Antol
0b4c1120ef [automerger skipped] Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev am: fce0c57c01 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: I4b96938a53fb36a9fd67b80c1da853fab5dff0be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:48:19 +00:00
Chris Antol
2d4f02e360 [automerger skipped] Ignore fragment attr from ext authenticator resource am: abf11e7350 -s ours
am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 e2dc98c21d is already in history

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

Change-Id: I5335d5bdc6f1bbcd86466864e96c757b5a757433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:48:15 +00:00
Chris Antol
0c15f71ece Merge "Ignore fragment attr from ext authenticator resource" into sc-v2-dev 2024-06-21 01:29:23 +00:00
Chris Antol
4b073bf14c Merge "Ignore fragment attr from ext authenticator resource" into tm-dev 2024-06-21 01:28:56 +00:00
Chris Antol
fce0c57c01 Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev 2024-06-21 01:28:22 +00:00
Chris Antol
7a2e7aac88 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3 am: 6b5d026668
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I93a5ce93076055af691dc61cf7f2d32c45bd2fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 01:17:57 +00:00
Chris Antol
6b5d026668 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185 am: b6e9e08ae3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I0d6b47560df6c7df5e9e56b6fd3336dcc63da78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 00:55:00 +00:00
Chris Antol
b6e9e08ae3 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295

Change-Id: I2a62051844b3296e49fb6941b36af02c93a95803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-21 00:35:21 +00:00
Chris Antol
c5031de185 Merge "Ignore fragment attr from ext authenticator resource" into sc-dev 2024-06-21 00:14:16 +00:00
Chris Antol
2f0db305a6 RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
2024-06-18 17:33:30 +00:00
Chris Antol
b66997fc4e RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
2024-06-18 17:33:24 +00:00
Chris Antol
d83f47397e RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
2024-06-18 17:33:15 +00:00
Chris Antol
7f1c4df02d RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc)
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
2024-06-18 17:32:03 +00:00
Treehugger Robot
506fc66f7c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours am: 357d9ecbdb -s ours
am skip reason: contains skip directive

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

Change-Id: I3704d899f9346dbf3d5656cb1129c936420065be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:13:33 +00:00
Jason Chiu
23bcaf74e8 [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours am: 8e61964dec -s ours
am skip reason: contains skip directive

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

Change-Id: I6a2ca71c7e51e72934b6308e0bb406adffc27c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:13:28 +00:00
Treehugger Robot
ffb480aee4 [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d am: a339d8ea9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27712008

Change-Id: Ic0f5293649e322c4da6bbfcbce8486270436442e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 20:13:16 +00:00
Treehugger Robot
357d9ecbdb [automerger skipped] Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3 am: d0f5ccb499 -s ours am: 20f8ad98fb -s ours
am skip reason: contains skip directive

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

Change-Id: I4a44ebe4dcfb8b12ebcadef6c746c0d8145a63c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 19:47:03 +00:00
Jason Chiu
8e61964dec [automerger skipped] [RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274 am: d0a4db88bb -s ours am: e0b4c24d20 -s ours
am skip reason: contains skip directive

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

Change-Id: Ib30d02c3219aa0f4cb99ae0dc93de2a443133af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-12 19:46:56 +00:00
Treehugger Robot
a339d8ea9a [RESTRICT AUTOMERGE] Merge "Replace getCallingActivity() with getLaunchedFromPackage()" into sc-v2-dev am: 324e36b19d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546875

Bug: 333364513
Fix: 345375093
Change-Id: Ifdebf7a60f3695f83d8fa04e05f4dbd6e177f62b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 02:49:14 +00:00