Commit Graph

142863 Commits

Author SHA1 Message Date
Treehugger Robot
25c58a6e50 Merge "Clean up EuiccPreferenceController" into main 2024-08-26 07:59:04 +00:00
SongFerng Wang
71d9d362b2 Merge "Modify the preferredSimDialogFragment" into main 2024-08-26 07:20:30 +00:00
Treehugger Robot
9c44e35d02 Merge "Refine WifiDetailsSettingsActivity" into main 2024-08-26 02:25:19 +00:00
Treehugger Robot
ba055aa8c2 Merge "Add log for enable/disable zen mode" into main 2024-08-23 18:38:19 +00:00
Rambo Wang
deadbda614 Merge "Turn off RILD reset in Reset Network Settings Flow" into main 2024-08-23 18:20:01 +00:00
Michał Brzeziński
f7222611d9 Merge "Launching touchpad tutorial as user 0" into main 2024-08-23 15:45:13 +00:00
Rambo Wang
dd7d18ec8a Turn off RILD reset in Reset Network Settings Flow
The CL temporarily removes RILD reset in the flow and plans to bring it back when a more reliable solution is available.

Resetting RID in the flow may cause device failure to camp on the default cellular network.

The interface used to reset RILD in the flow was designed for telephony process silent restart feature. The implementation doesn't  work well together with other reset options (e.g. nvResetConfig).

Bug: 356272264
Test: Execute feature test plan, including regression test
Flag: com.android.internal.telephony.flags.reset_mobile_network_settings
Change-Id: I955bcb0b151f27dc73c03a580c0144bea9e3bfa3
2024-08-23 15:17:21 +00:00
Weng Su
a21fbfa612 Refine WifiDetailsSettingsActivity
- Use the parameter's intent to avoid re-creating it in getIntent()

Bug: 349180072
Flag: EXEMPT bugfix
Test: Manual testing
Change-Id: Ia3549eccf22e30c4fd1ae011c51cf7840c76b1e5
2024-08-23 17:41:10 +08:00
songferngwang
b6be744bc6 Modify the preferredSimDialogFragment
After the telephony flag resetPrimarySimDefaultValues on, the telephony
set the preferred default subscription to remaining sim. Therefore, here
can ask whether the user uses [remaining SIM] for mobile data or not

Bug: 349783684
Test: remove the sim card, and settings show "use mobile data" dialog
Flag: EXEMPT bugfix
Change-Id: I5e3399e777bf1e8ef7998074082e55635eb23eb4
2024-08-23 09:24:21 +00:00
Treehugger Robot
f94d376104 Merge "Avoid launching Wi-Fi details settings if WifiEntry key is lost" into main 2024-08-23 07:48:57 +00:00
Treehugger Robot
bd74edd186 Merge "Add metrics for driving and bedtime interstitials" into main 2024-08-23 02:59:26 +00:00
Weng Su
64987b0bea Avoid launching Wi-Fi details settings if WifiEntry key is lost
- When restarting Wi-Fi details settings from the recent apps, the extra data of the sent Intent may be lost, resulting in the loss of the necessary WifiEntry key

- Don't launch Wi-Fi details settings and remove it from recent apps in the above case

Fix: 349180072
Flag: EXEMPT bugfix
Test: Manual testing
Change-Id: Ifa9718b0197ab27b77c24b706f7974a664980fba
2024-08-23 06:19:39 +08:00
Matías Hernández
f2f2da6147 Merge "Update Modes List if modes change in the background" into main 2024-08-22 18:49:18 +00:00
Matías Hernández
47db8abc89 Merge "Don't observe Modes changes if MODES_UI is disabled" into main 2024-08-22 18:13:32 +00:00
Matías Hernández
d8603124d1 Don't observe Modes changes if MODES_UI is disabled
The ZenModesLinkPreferenceController is present in the Notifications and Sound screens, and although isAvailable() is false when MODES_UI is not enabled, it was still registering the listener for Settings changes, and calling updateState().

Thus, Settings would (likely) crash if Zen settings change while the user is in one of those screens, due to not finding the manual rule.

Fixes: 360498255
Test: atest ZenSettingsObserverTest
Flag: android.app.modes_ui
Change-Id: I7741809fd0028aace6ac58992be965701e64a2e3
2024-08-22 17:48:53 +00:00
Matías Hernández
8c50cdc72a Update Modes List if modes change in the background
Fixes: 361518126
Test: manual
Flag: android.app.modes_ui
Change-Id: Ia00025adbb89ddc9163a9c50582cbcbd524231bb
2024-08-22 19:31:22 +02:00
Michal Brzezinski
38dd287e01 Launching touchpad tutorial as user 0
It's required to properly intercept touchpad gestures which is happening
in process of user 0. By default activity was launched in the current
user process.
Also targeting sysui package directly with intent.

Bug: 361518125
Test: launch touchpad tutorial with HSUM and see touchpad gestures intercepted
Flag: com.android.systemui.shared.new_touchpad_gestures_tutorial
Change-Id: I904df93758e49a7b10cf6d7a5398550405daafbb
2024-08-22 15:41:39 +00:00
Yuri Lin
4327d5e873 Merge "Add interstitial layout for larger screen devices" into main 2024-08-22 15:37:42 +00:00
Chaohui Wang
29f56b0b54 Clean up EuiccPreferenceController
Bug: 356684993
Flag: EXEMPT clean up
Test: manual - on mobile settings
Change-Id: I44856cf82f97c69d74dd2c8ba6e0c815498a7520
2024-08-22 12:09:32 +08:00
Treehugger Robot
06ee3f96d1 Merge "Refine Wi-Fi privacy settings" into main 2024-08-22 03:05:42 +00:00
Treehugger Robot
bfa4960538 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: 5b8bb48fc6 -s ours am: d90f00aff4 -s ours am: e34bd50427 -s ours am: 86f9295c86 -s ours am: dcd38287ae -s ours
am skip reason: contains skip directive

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

Change-Id: Idc53ff0957863cbec82b2a6599ebfa11998dd42c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:19:53 +00:00
Daniel Norman
72b2327a32 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 6c194ed71e -s ours am: 47427c64ff -s ours am: 91b4b2c0bd -s ours am: acd7fb4b53 -s ours am: e64cd13fbe -s ours
am skip reason: contains skip directive

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

Change-Id: I34d5ef0cf75ad84c7c3837cab4f56347d1cd2d5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:19:47 +00:00
Treehugger Robot
1dc8b7613c [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: f7ccd80017 -s ours am: f9db36fedf -s ours am: 51dd7de1fe -s ours am: 6c53ddee77 -s ours
am skip reason: contains skip directive

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

Change-Id: I0021545a5d176ee5a819eb4ecbab3e5924892879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:19:34 +00:00
Daniel Norman
25e62d76e5 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 5f56bce0a2 -s ours am: 7f93229f04 -s ours am: 2526a670a2 -s ours am: 704407f94b -s ours
am skip reason: contains skip directive

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

Change-Id: I333655ba96ddb2e52d1e61d87af0571757b0a15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:19:29 +00:00
Daniel Norman
e659fc098a [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours am: 460b6479b3 -s ours am: a19dd67e4a -s ours am: e821db45ad -s ours am: d30b1abe45 -s ours
am skip reason: contains skip directive

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

Change-Id: I4e41d77dba9a2709cdae9183dd61128044840a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:19:17 +00:00
Daniel Norman
a48c6fd5d3 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef am: 1a28bf00d3 -s ours am: 128786e8c6 -s ours am: f0a4e568dd -s ours am: fec7c06edf -s ours
am skip reason: contains skip directive

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

Change-Id: Ib4aeb334638020712d166a28dcb4ada7c3040db5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:18:56 +00:00
Treehugger Robot
dcd38287ae [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: 5b8bb48fc6 -s ours am: d90f00aff4 -s ours am: e34bd50427 -s ours am: 86f9295c86 -s ours
am skip reason: contains skip directive

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

Change-Id: I9eefa29242fd76dc75226628d4a214dbd9d4633e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:18:41 +00:00
Daniel Norman
e64cd13fbe [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 6c194ed71e -s ours am: 47427c64ff -s ours am: 91b4b2c0bd -s ours am: acd7fb4b53 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia2914d0e986bfe6de61497c1e32173f259685c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:18:38 +00:00
Treehugger Robot
6c53ddee77 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: f7ccd80017 -s ours am: f9db36fedf -s ours am: 51dd7de1fe -s ours
am skip reason: contains skip directive

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

Change-Id: I13bbc4ccdf5d33898882fb337ae03f05002e18a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:18:24 +00:00
Daniel Norman
704407f94b [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 5f56bce0a2 -s ours am: 7f93229f04 -s ours am: 2526a670a2 -s ours
am skip reason: contains skip directive

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

Change-Id: I5fcb1540f0726d85dd3bf7e8a6ed9a064dc3218a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:18:21 +00:00
Treehugger Robot
64da452619 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: 5b8bb48fc6 -s ours am: d90f00aff4 -s ours am: e34bd50427 -s ours am: 1f67a3b801 -s ours
am skip reason: contains skip directive

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

Change-Id: I732ac26435ccfbcb1beb2e1113f1f8375e385e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:13:29 +00:00
Daniel Norman
74c8603b0b [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 6c194ed71e -s ours am: 47427c64ff -s ours am: 91b4b2c0bd -s ours am: adc0b398d6 -s ours
am skip reason: contains skip directive

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

Change-Id: I92c966f306a217bcf84b889412fdd1824be95180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:13:24 +00:00
Treehugger Robot
d04277a59f [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: f7ccd80017 -s ours am: f9db36fedf -s ours am: 9ad6ead380 -s ours
am skip reason: contains skip directive

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

Change-Id: I5d02e91b7ac0def8e0961611b5d642e0a17175ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:13:08 +00:00
Daniel Norman
688e896e1e [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 5f56bce0a2 -s ours am: 7f93229f04 -s ours am: 5e1b0a001d -s ours
am skip reason: contains skip directive

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

Change-Id: I2d1e6ce2974c9a3dbc441fd5b3de3ac3bd891e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:13:04 +00:00
Daniel Norman
a20f69cceb [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours am: 460b6479b3 -s ours am: a19dd67e4a -s ours am: 4f88f6fc76 -s ours
am skip reason: contains skip directive

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

Change-Id: Icd3f4ee0ccbb36494b97b43900435748071da4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:49 +00:00
Treehugger Robot
86f9295c86 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: 5b8bb48fc6 -s ours am: d90f00aff4 -s ours am: e34bd50427 -s ours
am skip reason: contains skip directive

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

Change-Id: Idd2b3fe25c4be7a3db4705f12108767bab1ba1e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:35 +00:00
Daniel Norman
acd7fb4b53 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 6c194ed71e -s ours am: 47427c64ff -s ours am: 91b4b2c0bd -s ours
am skip reason: contains skip directive

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

Change-Id: I8f2ca32dbb2fe3eab51d779aeedcbd11aaeadc2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:31 +00:00
Daniel Norman
962a7102d7 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef am: 1a28bf00d3 -s ours am: 128786e8c6 -s ours am: cc01e7ca47 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie222673cfa483f30ada794a44a456e00bfec32ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:23 +00:00
Treehugger Robot
51dd7de1fe [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: f7ccd80017 -s ours am: f9db36fedf -s ours
am skip reason: contains skip directive

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

Change-Id: I5010d29971617523082703ae52f9a82737e60338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:16 +00:00
Daniel Norman
2526a670a2 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 5f56bce0a2 -s ours am: 7f93229f04 -s ours
am skip reason: contains skip directive

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

Change-Id: I73c3cb5dc2c6ada9cf8e132152c91051f9859547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:12 +00:00
Daniel Norman
d30b1abe45 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 1bcc404958 -s ours am: 8024751b9e -s ours am: 1dde2be0b7 -s ours am: 460b6479b3 -s ours am: a19dd67e4a -s ours am: e821db45ad -s ours
am skip reason: contains skip directive

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

Change-Id: I8879456738396fe0d673f53c6aa06b1124a65073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:09 +00:00
Treehugger Robot
1f67a3b801 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: 5b8bb48fc6 -s ours am: d90f00aff4 -s ours am: e34bd50427 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia681d36949cb0d5551393e40fc7c6725e42f7cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:09 +00:00
Daniel Norman
adc0b398d6 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 6c194ed71e -s ours am: 47427c64ff -s ours am: 91b4b2c0bd -s ours
am skip reason: contains skip directive

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

Change-Id: I79d5fe15bc3d3a8ec28c86cf92ad2dc9d07c90c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:12:07 +00:00
Treehugger Robot
9ad6ead380 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: f7ccd80017 -s ours am: f9db36fedf -s ours
am skip reason: contains skip directive

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

Change-Id: Ifc463bfb66b5ef4ca50136f9e49d3d7180c70989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:11:54 +00:00
Daniel Norman
5e1b0a001d [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 5f56bce0a2 -s ours am: 7f93229f04 -s ours
am skip reason: contains skip directive

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

Change-Id: I373ebc51b446ed22070d31fa5c648b81a7242037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:11:51 +00:00
Daniel Norman
fec7c06edf [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: 398ab19923 am: 51113ad5ef am: 1a28bf00d3 -s ours am: 128786e8c6 -s ours am: f0a4e568dd -s ours
am skip reason: contains skip directive

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

Change-Id: I3b5a9639b3741b3cda70c5958cb757f33f0c73f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:11:48 +00:00
Treehugger Robot
e34bd50427 [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: 5b8bb48fc6 -s ours am: d90f00aff4 -s ours
am skip reason: contains skip directive

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

Change-Id: I59336d3136b63b12cbec406e5f55479ad9be0094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:11:36 +00:00
Daniel Norman
91b4b2c0bd [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 6c194ed71e -s ours am: 47427c64ff -s ours
am skip reason: contains skip directive

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

Change-Id: I3e9484e962e272c43879f677ad122d45cb2564a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:11:32 +00:00
Treehugger Robot
f9db36fedf [automerger skipped] Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e am: 0830cf7fbe -s ours am: 8d6f3c4660 -s ours am: ab7326276b -s ours am: f7ccd80017 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia30d7402a79fb24355a102286071aa60d5258905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:06:30 +00:00
Daniel Norman
7f93229f04 [automerger skipped] RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0 am: 41efccc461 -s ours am: 0044ecdb7d -s ours am: 4583de745f -s ours am: 5f56bce0a2 -s ours
am skip reason: contains skip directive

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

Change-Id: I65b629a5d4c1ca066b0e0dba094a27b4610384bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 01:06:26 +00:00