Commit Graph

144241 Commits

Author SHA1 Message Date
Guojing Yuan
d2b68804d3 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: 9d5bbc8e9b -s ours am: 8d5e11d9d8 -s ours am: 444c871412 -s ours am: fb813e451a -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I417e7e577d3361b8018fb8a709e6d204df85f1fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:21:52 +00:00
Guojing Yuan
23914c8a5a [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: ab697f3776 -s ours am: 5c59d451ac -s ours am: f23d6835d9 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I1945fba42ff71421ddbdc81e489dcdb805a01b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:21:38 +00:00
Guojing Yuan
613f019fb2 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: 9d5bbc8e9b -s ours am: 8d5e11d9d8 -s ours am: 444c871412 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I210384ce88bc3586e0ef50e8c1d2f803c6ba4198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:15:10 +00:00
Guojing Yuan
fb813e451a [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: 9d5bbc8e9b -s ours am: 8d5e11d9d8 -s ours am: 444c871412 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Ib02afdae32996f315caf5e300afd0f56e6a9d9fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:08:41 +00:00
Guojing Yuan
f23d6835d9 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: ab697f3776 -s ours am: 5c59d451ac -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I7a6f80fb16ad53037b85c06722153029cce1110e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:08:25 +00:00
Guojing Yuan
444c871412 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: 9d5bbc8e9b -s ours am: 8d5e11d9d8 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I8c1abdad66ca8be3644ea67dde1cd77a87044a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:08:15 +00:00
Guojing Yuan
aa43306ed8 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: ab697f3776 -s ours am: 5c59d451ac -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I8c3d9d575f6d0caf9e3810cec5f1b9ef7965650e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 20:08:02 +00:00
Treehugger Robot
627538e100 Merge "Add piano and remove tent from zen icon picker" into main 2024-10-15 19:52:29 +00:00
Guojing Yuan
5c59d451ac [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: ab697f3776 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I8edbacc880f6e6a1c99c71d3394774175817a5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:50:39 +00:00
Guojing Yuan
8d5e11d9d8 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours am: 9d5bbc8e9b -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I7fa4e6833e674e1fdc6d000cddd5a3235837271c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:50:11 +00:00
Guojing Yuan
9d5bbc8e9b [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Iae70fb15fcd0613f74d0b23f351d9f5eba8a76fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:30:28 +00:00
Guojing Yuan
ab697f3776 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours am: d4a01ee0db -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I5cd6560809682c31f1255d4d852c01ac650f45f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:30:28 +00:00
Guojing Yuan
d4a01ee0db [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a am: c45030ba4b -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I355a696d03b58ea53a4a4a0485878d14eee2314c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 19:00:44 +00:00
Guojing Yuan
c45030ba4b [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c am: 268575fb3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247

Change-Id: Id7576ad8435bf12972833f0ed056a6edf991b77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 18:45:15 +00:00
Guojing Yuan
268575fb3a [CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247

Change-Id: I26b92140443f28084cb514da60e1febcf599dfc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 18:25:14 +00:00
Guojing Yuan
59cdc3e20c [CDM][NLS] Check if the NLS service has an intent-filter
Bug: 363248394
Test: CTS
Flag: EXEMPT bugfix
Change-Id: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
Merged-In: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
(cherry picked from commit 7ae59a42eb)
2024-10-15 17:14:05 +00:00
Marcus Ge
3ba451c4a3 Merge "[Contrast] Fix checkmark in RTL" into main 2024-10-15 17:09:38 +00:00
Riley Jones
8e0443822a Merge "Cleanup searchable items on Accessibility > System controls" into main 2024-10-15 16:52:04 +00:00
Alexander Roederer
36343c7358 Add piano and remove tent from zen icon picker
Bug: 372366178
Test: atest IconOptionsProviderImplTest + manual
Flag: android.app.modes_ui
Change-Id: Ic777cc4314014bca7b422244ed8861d09c8a3969
2024-10-15 16:18:49 +00:00
Treehugger Robot
07bcb127dd Merge "Clean up 24Q3 aconfig flag reset_mobile_network_settings" into main 2024-10-15 16:10:40 +00:00
Haijie Hong
068ac9d264 Merge "Fix multi-toggle flicker bug" into main 2024-10-15 14:50:12 +00:00
Jacky Wang
49677b7af2 Merge "[Catalyst] Network and Intenet screen migration" into main 2024-10-15 13:26:29 +00:00
Treehugger Robot
d5758d60d7 Merge "Fix flaky tests due to shared system property" into main 2024-10-15 12:09:31 +00:00
Jacky Wang
3ab6b197a9 Fix flaky tests due to shared system property
The system property is shared within JVM, change system property in a
test case might break test cases in another test class. To address the
issue, introduce SystemProperty helper class to back up and restore the
system properties in tests.

Bug: 373177618
Flag: EXEMPT Test only
Test: atest SettingsRoboTests
Change-Id: I15539ce5ac425f35571d796baa25f259df1b601f
2024-10-15 19:08:30 +08:00
Jason Chiu
9c9c0a3d94 [Catalyst] Network and Intenet screen migration
- Add a flag for the migration
- Add the skeleton of the screen

Test: atest NetworkDashboardScreenTest
Bug: 368355361
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Change-Id: I37622d318f2a52a7c60c9fa965b94fd135ce0b60
2024-10-15 18:32:31 +08:00
mxyyiyi
7bfa060c5f Take as Unrestricted Mode in the UI if current Mode is Unknown.
- Battery usage mode MODE_UNKNOWN is (1) apps in allowlist and (2) app's OP_RUN_ANY_IN_BACKGROUND = MODE_IGNORED.
For this case, mode should be displayed as Unrestricted on UI since it is in allowlist; and should be logged as unknown mode for the potential compatibility issues.

- After Backup & Restore, the MODE_UNKNOWN will be reset to Optimized(Default) Mode on target device.

Bug: 372831500
Test: manual
Test: atest BatteryOptimizeUtilsTest
Test: atest AppOptModeSharedPreferencesUtilsTest
Flag: EXEMPT for simple fix
Change-Id: Ic18e026f71a4a50ffa1711e2ca0782aeb8b33076
2024-10-15 15:53:29 +08:00
Haijie Hong
7a3baf7d2e Fix multi-toggle flicker bug
BUG: 343317785
Test: local tested
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ib5e700412c112ff6fa19b54f341fbd598c6b345c
2024-10-15 14:49:25 +08:00
Mill Chen
b923194def [Catalyst] Vibration and haptics screen migration
- Add a flag for vibration and haptics migration
- Add skeleton of vibration and haptics

Bug: 368360218
Test: atest VibrationIntensityScreenTest
Flag: com.android.settings.flags.catalyst_vibration_intensity_screen
Change-Id: I0117f570fe9bf92e61974984d00c0bd5be684fff
2024-10-15 04:44:09 +00:00
Dongzhuo Zhang
17476190b7 Merge "Add ContactsStorageSettingsActivity to handle the android.provider.action.SET_DEFAULT_ACCOUNT intent" into main 2024-10-15 04:26:06 +00:00
Yiling Chuang
fd699a753f Merge "Migrate Battery Saver" into main 2024-10-15 03:05:18 +00:00
Dongzhuo Zhang
538a01023a Add ContactsStorageSettingsActivity to handle the
android.provider.action.SET_DEFAULT_ACCOUNT intent

Test:Manually tested to trigger the contacts storage settings page using intent to start activity.
Bug: 368641291
Flag: com.android.settings.flags.enable_contacts_default_account_in_settings

Change-Id: I83db4c5751c6fec523298a82b82468180906075c
2024-10-15 02:59:21 +00:00
Andy Wickham
51a8a098a5 Merge "Move Contextual Search setting to AOSP." into main 2024-10-15 00:47:04 +00:00
Guojing Yuan
8d30101228 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: 0d8ed82e9c -s ours am: 65885fd60d -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Ica446b5e5743470995aac5c13a991b02611478b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 00:17:02 +00:00
Guojing Yuan
4f1a4e15ce [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours am: c048539b4f -s ours am: 99e4b9de4b -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Id812e359e896b3b9fc0908148f214282c782ee5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-15 00:16:48 +00:00
Guojing Yuan
65885fd60d [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: 0d8ed82e9c -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Ibe59854146bd50d0e87ddc5f53155d494c079537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:34 +00:00
Guojing Yuan
272531f1e2 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours am: e9a76fa03a -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Iae2dd0f9a4d5a8b68e639a8c35d94a345242c8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:29 +00:00
Guojing Yuan
99e4b9de4b [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours am: c048539b4f -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: I7b70769070b3eed4ce29664bd7aa42c5f9678011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:24 +00:00
Guojing Yuan
b082aed12e [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours am: 5a8b643ad8 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Ia7854f5ad2d3523924c5560bba4da1ff870e388f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:54:13 +00:00
Guojing Yuan
e9a76fa03a [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I5a54035fb62801252ff4386b95c21d08b5a699cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:46:38 +00:00
Guojing Yuan
0d8ed82e9c [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours am: ea96b4ab21 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: Ieb97938c211a577d538dc87cc414c39123186ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:46:21 +00:00
Guojing Yuan
ea96b4ab21 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8 am: 54142da21f -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 d440f2ef05 is already in history

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

Change-Id: I6611ffb97886d6bf5efb3c198370a2951c77eb58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:38:51 +00:00
Guojing Yuan
5a8b643ad8 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Ia11da90aa315f485db80da8bf16cf36032e8cb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:38:51 +00:00
Guojing Yuan
c048539b4f [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours am: d8dcbcd076 -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: I73162c7a274b7042632ae4c917ec489b407bde19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:38:35 +00:00
Guojing Yuan
d8dcbcd076 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 760d594cff -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: Id18c4027da722d4874b91aae22d19073f921f416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:19:57 +00:00
Guojing Yuan
54142da21f [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05 am: 120f2345b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: I83d612fbcc6ff78dd455ecf30d17d16f99900426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:19:28 +00:00
Guojing Yuan
120f2345b8 [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: I42468b1d2bfb94f7f5645a8e710ed67818a38317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:01:25 +00:00
Guojing Yuan
760d594cff [CDM][NLS] Check if the NLS service has an intent-filter am: d440f2ef05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29710883

Change-Id: Iab4e925157e013de4d2a34864856bff0b10ae065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 23:01:23 +00:00
Guojing Yuan
7d7d3c0d61 [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: edf497802d am: 8439a2542d -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 e4fe2f5b81 is already in history

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

Change-Id: I1377715343f89672b630eb7ee8f0de2e47dfc2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 22:50:26 +00:00
Guojing Yuan
8439a2542d [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: edf497802d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711106

Change-Id: I3270fd29d05b97b043ed2d46516f35ef0e9ef793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 22:25:04 +00:00
Guojing Yuan
b8f13aa47a [automerger skipped] [CDM][NLS] Check if the NLS service has an intent-filter am: e4fe2f5b81 am: a0924c7c6a -s ours
am skip reason: Merged-In Ib79c219cde8d73a218ceb7911f4552d43e384d8e with SHA-1 7ae59a42eb is already in history

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

Change-Id: Ie277d32fdb2afbdf99a63f4085041b41104da0c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-14 22:24:54 +00:00