summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson <chiuwinson@google.com> 2021-04-02 12:45:48 -0700
committer Winson <chiuwinson@google.com> 2021-04-02 12:47:43 -0700
commit0bcdb9897cfebe985fb51ec1f8c66e3cf5c0f24e (patch)
treeeaf3fb363555f9fde58ec72fa093d010df7f6e95
parenta9bb9e1b53336ca6c37fc98665d0a38ca1f57c5f (diff)
Change ACTION_APP_OPEN_BY_DEFAULT_SETTINGS to standard format
This was originally introduced as an @hide API, but was exposed as part of changes to app links. The old constant value was maintained, but it can be migrated to the standard format and Settings can just catch both. Bug: 184370492 Test: manual, test app that launches using action Change-Id: I904bd816da6c20a1dfdb207f8d4d486bb7be5cd5
-rw-r--r--core/api/current.txt2
-rw-r--r--core/java/android/provider/Settings.java3
2 files changed, 2 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 1299ce59253d..8d1f48e3e491 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -35049,7 +35049,7 @@ package android.provider {
field public static final String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";
field public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS";
field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";
- field public static final String ACTION_APP_OPEN_BY_DEFAULT_SETTINGS = "com.android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";
+ field public static final String ACTION_APP_OPEN_BY_DEFAULT_SETTINGS = "android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";
field public static final String ACTION_APP_SEARCH_SETTINGS = "android.settings.APP_SEARCH_SETTINGS";
field public static final String ACTION_APP_USAGE_SETTINGS = "android.settings.action.APP_USAGE_SETTINGS";
field public static final String ACTION_AUTO_ROTATE_SETTINGS = "android.settings.AUTO_ROTATE_SETTINGS";
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index ecb1700bf7d5..eb562b7067f2 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -471,10 +471,9 @@ public final class Settings {
* <p>
* Output: Nothing.
*/
- @SuppressLint("ActionValue")
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_APP_OPEN_BY_DEFAULT_SETTINGS =
- "com.android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";
+ "android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";
/**
* Activity Action: Show trusted credentials settings, opening to the user tab,