From b5ba585b39bff7c5c2977f950b4a63159dcfdfd8 Mon Sep 17 00:00:00 2001 From: Winson Date: Wed, 24 Mar 2021 12:15:58 -0700 Subject: [PATCH] Expose the open by default settings screen to apps With the changes for app links v2, apps need a way to link users into the domain selection screen if the app relies on opening web links for some functionality. To achieve that, this exposes the existing action, ACTION_APP_OPEN_BY_DEFAULT_SETTINGS, from android.provider.Settings and removes the permission needed to launch the relevant Activity, since it's no longer required. Note that this will also require a change to remove the enforcement from the Activity declaration, which will be a follow up. Bug: 178648367 Test: none, unhide API Change-Id: I73231b9b4686ee67490ffe1526542b2f59c8089b --- core/api/current.txt | 1 + core/java/android/provider/Settings.java | 2 +- 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 bb501e89b3b35..9292fd56bf980 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -34889,6 +34889,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 71ffa92a81bb5..a067f6d3f87a6 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". *

* 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 5aaf1fcafe1ba..fb375f4be761a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -5411,12 +5411,6 @@ - - -