diff options
| author | Arc Wang <arcwang@google.com> | 2021-09-27 02:56:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-27 02:56:29 +0000 |
| commit | 7bb0592299b97ccd9dc899dba10721ef1bc292db (patch) | |
| tree | 05c6d9a0bfb5ccb3e67c0e869a0b7872dc06b34d /core/java/android | |
| parent | 5b39a5111df2c5138dd2bf80f058aee681302121 (diff) | |
| parent | eff2796ff28f3d2b40c0b15385413a0cf8895f31 (diff) | |
Merge "Remove Settings#EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT" into sc-v2-dev am: 4a00a052da am: eff2796ff2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903207
Change-Id: Icae3e8eabcb5e111f3450d5ad948a33ce94033d8
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 918f2bd4120d..2d10adec0e26 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -35,7 +35,6 @@ import android.app.Application; import android.app.AutomaticZenRule; import android.app.NotificationChannel; import android.app.NotificationManager; -import android.app.PendingIntent; import android.app.SearchManager; import android.app.WallpaperManager; import android.compat.annotation.UnsupportedAppUsage; @@ -17771,9 +17770,6 @@ public final class Settings { * * Input: {@link #EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY} must be included to * specify a key that indicates the menu item which will be highlighted on settings home menu. - * - * Input: {@link #EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT} is optional. Apps - * can use the {@link PendingIntent} extra to launch into its private {@link Activity}. * <p> * Output: Nothing. */ @@ -17801,15 +17797,6 @@ public final class Settings { "android.provider.extra.SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY"; /** - * Activity Extra: Apps can use the {@link PendingIntent} extra to launch into its private - * {@link Activity}. - * <p> - * This is an optional extra field to {@link #ACTION_SETTINGS_LARGE_SCREEN_DEEP_LINK}. - */ - public static final String EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT = - "android.provider.extra.SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT"; - - /** * Performs a strict and comprehensive check of whether a calling package is allowed to * write/modify system settings, as the condition differs for pre-M, M+, and * privileged/preinstalled apps. If the provided uid does not match the |