diff options
| author | 2021-03-25 02:20:37 +0000 | |
|---|---|---|
| committer | 2021-03-25 02:20:37 +0000 | |
| commit | 5ae11b4a58b0abfd1d2461b22a8a72008abf8079 (patch) | |
| tree | 599b06c2a50c53a08d29b76a302052f2c7f8254f | |
| parent | 660eb72df86ee31a4a2c25308a93d013428f23bd (diff) | |
| parent | b5ba585b39bff7c5c2977f950b4a63159dcfdfd8 (diff) | |
Merge "Expose the open by default settings screen to apps" into sc-dev
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 7d0378334816..14a87cc6ed8e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -34935,6 +34935,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_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 719c38392fb1..99f6399c49f1 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -470,8 +470,8 @@ public final class Settings { * to be shown, with the "package" scheme. That is "package:com.my.app". * <p> * Output: Nothing. - * @hide */ + @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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a539df78eaed..1521bc535e37 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -5429,12 +5429,6 @@ <permission android:name="android.permission.WATCH_APPOPS" android:protectionLevel="signature|privileged" /> - <!-- Allows an application to directly open the "Open by default" page inside a package's - Details screen. - @hide <p>Not for use by third-party applications. --> - <permission android:name="android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS" - android:protectionLevel="signature" /> - <!-- Allows hidden API checks to be disabled when starting a process. @hide <p>Not for use by third-party applications. --> <permission android:name="android.permission.DISABLE_HIDDEN_API_CHECKS" |