PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,909 Commits 1 Branch 0 Tags
06151a58c6cad27394c607765cb56b4d2aa31a4c
Commit Graph

125909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
901e7377cc [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: Id78bea040278ce2387b6ad844e112a37a2412424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:50 -08:00
Hao Dong
9cce9a26c7 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: I9cacdae71cb8cc67977e9e9ace2350cd4bb0ad93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:44 -08:00
Hao Dong
596ca04d69 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours am: 66f8db84d6 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: I65f0591d5cc3aaca0d4e88c7a7cd05993cbf334d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:22 -08:00
Hao Dong
9c190ed43b [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours am: 19c298d5a9 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: Ia6a803d7686a3eeff7a8912e429766f003d2beed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:55:17 -08:00
Hao Dong
66f8db84d6 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: a0b42f7f95 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: I6379e2bc68a751a031c4c1f5ae821553096fecba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:35:56 -08:00
Hao Dong
19c298d5a9 [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: 417970a8ca -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 2b7c1f1105 is already in history

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

Change-Id: Icdb092214251cff340514e664c57c23046e3c093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-09 09:35:50 -08:00
Hao Dong
a0b42f7f95 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev 2025-01-09 09:03:17 -08:00
Hao Dong
417970a8ca Set class name when createConfirmDeviceCredentialIntent() API is used. 
Flag: EXEMPT bugfix
Bug: 339532378
Test: manual test
Change-Id: I762f280def79d428ed9cf119ace5ccc2b6be2560
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
 2025-01-08 23:08:00 -08:00
Hao Dong
ba4746f0fe [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 am: 90fc883217 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 d158b1675a is already in history

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

Change-Id: Id9ca9553b0b6dc6d40df8b869f62cfc0b86ff0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-08 22:23:03 -08:00
Hao Dong
2688ddf907 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: Iefd9e1dd0a1558ab9b1c6af88f8905804b6cdb62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-08 21:58:09 -08:00
Hao Dong
90fc883217 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 5b67d6e863 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28784982

Change-Id: Ie407bca1d30057b2f69330d22368d408ec3978ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-08 21:57:58 -08:00
Hao Dong
5b67d6e863 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-dev 2025-01-08 21:34:50 -08:00
Hao Dong
f401662091 [automerger skipped] Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev am: ccd03aaeb9 -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9 is already in history

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

Change-Id: I89a740dd4e878a2678c87c48cc397825f96a378b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-08 20:07:02 -08:00
Hao Dong
6dc020526f [automerger skipped] Set class name when createConfirmDeviceCredentialIntent() API is used. am: d158b1675a -s ours 
am skip reason: Merged-In I762f280def79d428ed9cf119ace5ccc2b6be2560 with SHA-1 63eda7f3a9 is already in history

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

Change-Id: I8567eaa2465f9af1330ca8b3892be9d50cfb17e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-08 20:06:52 -08:00
Hao Dong
ccd03aaeb9 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev 2025-01-08 19:43:18 -08:00
Hao Dong
fe69b57d4c Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev am: cf5d961564 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28785157

Bug: 388628639
Change-Id: Ic1813245fa86ad9e3c6f5e19741f63cc8cb51816
Merged-In: I762f280def79d428ed9cf119ace5ccc2b6be2560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2025-01-08 19:37:17 -08:00
Fan Wu
201d7ffac4 Check the permission of the callingUid instead of the calling package 
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007)
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
 2025-01-08 18:58:41 -08:00
Fan Wu
63656485ea Check the permission of the callingUid instead of the calling package 
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007)
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
 2025-01-08 18:57:56 -08:00
Fan Wu
87645011fc Check the permission of the callingUid instead of the calling package 
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007)
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
 2025-01-08 18:57:33 -08:00
Fan Wu
353cfc1b08 Check the permission of the callingUid instead of the calling package 
Bug: 372671447
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e719575e92c1e6bd0b9088663e6c909bccf2b007)
Merged-In: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
Change-Id: Ib36c0a3ba482bcddd53c2c09409ea818e6f43cad
 2025-01-08 18:56:32 -08:00
Hao Dong
cf5d961564 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-dev 2025-01-08 17:38:41 -08:00
Hao Dong
c1b2d7c933 Merge "Set class name when createConfirmDeviceCredentialIntent() API is used." into udc-qpr-dev 2025-01-08 16:09:23 -08:00
Matías Hernández
c97cd9e805 Remove incorrect call to Window.addFlags with a system flag 
The same flag is being (correctly) added in onCreate, so on top of being wrong this was also completely unnecessary.

Bug: 368579654
Test: atest NotificationAccessConfirmationActivityTest
Flag: EXEMPT bugfix

Change-Id: I539fca77a1d136bdd0e4892993020884430b8a4e
Merged-In: I539fca77a1d136bdd0e4892993020884430b8a4e
(cherry picked from commit e0510a62eb)
 2025-01-07 04:49:20 -08:00
Mill Chen
b1e4cd09ff Add default Sound Picker package name 
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
 2024-12-26 23:02:14 -08:00
Mill Chen
cf52112bcb Add default Sound Picker package name 
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
 2024-12-26 23:02:01 -08:00
Mill Chen
94681e3436 Add default Sound Picker package name 
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
 2024-12-26 23:01:48 -08:00
Mill Chen
be15ba86a7 Add default Sound Picker package name 
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
 2024-12-26 23:01:26 -08:00
Mill Chen
89a32bb7d2 Add default Sound Picker package name 
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
 2024-12-26 23:01:07 -08:00
Mill Chen
7a2366b0f1 Add default Sound Picker package name 
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
 2024-12-26 23:00:47 -08:00
Mill Chen
354e1faf76 Add default Sound Picker package name 
To avoid implicit intents, make intents launch explicitly.


Bug: 333344157
Test: Build
Change-Id: I905c0f3ddaf0f488ff2fc3bf1747b6df0d802504
Merged-In: Ie19cbceb89842a75a180898abcce81b63c18d46c
 2024-12-23 10:02:40 -08:00
Chaohui Wang
169fa08b6d [automerger skipped] Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b am: 3c8101a303 -s ours 
am skip reason: Merged-In I2af7b53a75fe5c6915dd9781406039822789c18c with SHA-1 87dbf9c4b8 is already in history

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

Change-Id: I6d243e343e2dab99e14e6459e882db36b1fc9dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-04 02:34:07 +00:00
Chaohui Wang
3c8101a303 Merge "[Safer intents] App Time Spent Preference" into udc-dev am: 0691d3040b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30341738

Change-Id: Iaed38eeb96a64f84330b2115372c8bd7a5728d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-04 02:09:43 +00:00
Chaohui Wang
d5881e2dfc Merge "[Safer intents] App Time Spent Preference" into udc-qpr-dev 2024-12-04 01:27:30 +00:00
Chaohui Wang
0691d3040b Merge "[Safer intents] App Time Spent Preference" into udc-dev 2024-12-04 01:27:28 +00:00
Treehugger Robot
e0f038e080 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 6f5e87739b -s ours am: e37a2247f1 -s ours am: 955fef7066 -s ours am: 4b46ccbb01 -s ours 
am skip reason: contains skip directive

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

Change-Id: If3ae95173e3a277226a799c177a1af18e22bf70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:26:40 +00:00
Adam Bookatz
5f1ee315ea [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: dad028a675 -s ours am: 055a2bca93 -s ours am: 351ece5890 -s ours am: 5f3b94784d -s ours 
am skip reason: contains skip directive

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

Change-Id: I6db700458189d1b1d200454df517ef62e4d0c00b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:26:37 +00:00
Treehugger Robot
e481c7e5ef [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: 559b96d9b6 -s ours am: 8ab0f1de3c -s ours am: 0c1c752f7d -s ours am: c5f6c73e35 -s ours 
am skip reason: contains skip directive

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

Change-Id: I18962c4804de97b845d07780da27e88da6ad5d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:26:27 +00:00
Adam Bookatz
c68f235125 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: aa291510b8 -s ours am: 37173a8dfb -s ours am: 6329c66f26 -s ours am: 0fdc0440e7 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie91a5e3644c86996f7481068412512a18b97de5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:26:24 +00:00
Treehugger Robot
c454b40019 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: cf4b80e413 -s ours am: 2060250a81 -s ours am: f371a98737 -s ours am: a0094fdcc6 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ic0de4b5ff95fa0ce601af91e73d82bcedab115f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:26:14 +00:00
Adam Bookatz
f06fc9edd7 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: bb96e81f34 -s ours am: 1db07ae91a -s ours am: 3a58103327 -s ours am: 226634c104 -s ours 
am skip reason: contains skip directive

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

Change-Id: I7047c0dd10504b48f88ef8b04cac84b28950c46d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:26:10 +00:00
Treehugger Robot
db4d5eb010 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 76c8e3526a -s ours am: ac9402af41 -s ours am: f6b7dbd34f -s ours 
am skip reason: contains skip directive

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

Change-Id: I691986191ae35005ddc6abc91ae2f323d31da4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:26:00 +00:00
Adam Bookatz
c5cb31c0fa [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: 9678e0dd04 -s ours am: bfb7b3d085 -s ours am: 0fd038d3a2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2a57d0ab7aaeb202d89d5b6cd34fad8804d116e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:25:55 +00:00
Treehugger Robot
656bb6d927 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: a5078949a1 -s ours am: 7d9e99e5b4 -s ours am: 3910f63d05 -s ours 
am skip reason: contains skip directive

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

Change-Id: I8036c7ca5606e19248f1af623c9f0d478253f5e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:25:45 +00:00
Adam Bookatz
7ee9c00352 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: 647c3b30a7 -s ours am: a1cf0740a7 -s ours am: 50a9158019 -s ours 
am skip reason: contains skip directive

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

Change-Id: I39a166b5863b2e11fbd33925009fcb6f9f0c3461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:25:41 +00:00
Treehugger Robot
ac2f435940 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-qpr1-dev am: 8cfbd8aa9b -s ours am: 24dc9f533a -s ours am: 329fd334c3 -s ours am: 6f3dce1580 -s ours am: a0cd22a37e -s ours am: f619b55b25 -s ours 
am skip reason: contains skip directive

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

Change-Id: Id517bb805cfab1d323ef55c87c3f759a862f852e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:25:29 +00:00
Adam Bookatz
956fed579c [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 6f1c499e57 -s ours am: 1a45fcee73 -s ours am: 1596e41a75 -s ours am: 9608452666 -s ours am: 71f3587b1c -s ours am: bd3fbd5d19 -s ours 
am skip reason: contains skip directive

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

Change-Id: I9ca7ffc835f6ec3053bf55c6cc010fe406541443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:25:23 +00:00
Treehugger Robot
4b46ccbb01 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-v2-dev am: b937941549 -s ours am: cfaac63123 -s ours am: 6f5e87739b -s ours am: e37a2247f1 -s ours am: 955fef7066 -s ours 
am skip reason: contains skip directive

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

Change-Id: I7cba4d7e0084d5b4cfda1aaa0cba3204141867c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:12:54 +00:00
Adam Bookatz
5f3b94784d [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 4901c86b76 -s ours am: 20bee2e84b -s ours am: dad028a675 -s ours am: 055a2bca93 -s ours am: 351ece5890 -s ours 
am skip reason: contains skip directive

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

Change-Id: Iff03e82fc30728c0d4f9c746fc6371b686902529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:12:50 +00:00
Treehugger Robot
c5f6c73e35 [automerger skipped] Merge "Don't let profiles open the UserSettings overflow [DO NOT MERGE]" into sc-dev am: ead69f3d43 -s ours am: ad1e470fc0 -s ours am: 2112cc5ef9 -s ours am: 3764a4cb26 -s ours am: 559b96d9b6 -s ours am: 8ab0f1de3c -s ours am: 0c1c752f7d -s ours 
am skip reason: contains skip directive

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

Change-Id: I219b937f4a069ca585b294f8fd035b5ce96f51e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:12:40 +00:00
Adam Bookatz
0fdc0440e7 [automerger skipped] Don't let profiles open the UserSettings overflow [DO NOT MERGE] am: 44a35ac07b -s ours am: 9d81e7d2e5 -s ours am: d5e5daf68e -s ours am: 80f4a4d681 -s ours am: aa291510b8 -s ours am: 37173a8dfb -s ours am: 6329c66f26 -s ours 
am skip reason: contains skip directive

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

Change-Id: I6f7e5eb2505fba35a62e5265f5fd08139655d104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-12-03 22:12:37 +00:00