Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 667e32a3 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Expose the open by default settings screen to apps" into sc-dev am: 5ae11b4a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13986993

Change-Id: Ib16bab6355c4a5be2efd053438f1841e509d50a8
parents d36f7394 5ae11b4a

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -34934,6 +34934,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";

core/java/android/provider/Settings.java

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+0 −6
Original line number Diff line number Diff line
@@ -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"