diff options
| author | Arc Wang <arcwang@google.com> | 2021-09-27 02:28:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-09-27 02:28:02 +0000 |
| commit | 4a00a052daf91f8e835bd1686bb10916587cf33b (patch) | |
| tree | 617165deec7ad7454aa9be5599a1754739caed22 /core/java | |
| parent | 3cbec410eeed1cfe31f4cff43d6acff09935244a (diff) | |
| parent | 6f7d870b56c43e213f1b2a8725ed1b4b123115c0 (diff) | |
Merge "Remove Settings#EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_PENDING_INTENT" into sc-v2-dev
Diffstat (limited to 'core/java')
| -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 f59d86e9175a..7472cca7fbd6 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; @@ -16976,9 +16975,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. */ @@ -17006,15 +17002,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 |