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

Commit 74dcb832 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Implement API feedback for Safety Center QS" into tm-dev am: d7af7fca 

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

Change-Id: I632596b01fb0808c7c263d47326cd015a1b4b1d6
parents bafaa050 d7af7fca

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -10329,7 +10329,6 @@ package android.content { 
    field public static final String ACTION_VIEW_LOCUS = "android.intent.action.VIEW_LOCUS";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_VIEW_PERMISSION_USAGE = "android.intent.action.VIEW_PERMISSION_USAGE";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_PERMISSION_USAGE) public static final String ACTION_VIEW_PERMISSION_USAGE_FOR_PERIOD = "android.intent.action.VIEW_PERMISSION_USAGE_FOR_PERIOD";

    field @RequiresPermission("android.permission.MANAGE_SENSOR_PRIVACY") public static final String ACTION_VIEW_SAFETY_HUB = "android.intent.action.VIEW_SAFETY_HUB";

    field public static final String ACTION_VOICE_COMMAND = "android.intent.action.VOICE_COMMAND";

    field @Deprecated public static final String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";

    field public static final String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3036,6 +3036,7 @@ package android.content { 
    field public static final String ACTION_USER_REMOVED = "android.intent.action.USER_REMOVED";

    field public static final String ACTION_USER_SWITCHED = "android.intent.action.USER_SWITCHED";

    field @RequiresPermission(android.Manifest.permission.START_VIEW_APP_FEATURES) public static final String ACTION_VIEW_APP_FEATURES = "android.intent.action.VIEW_APP_FEATURES";

    field @RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY) public static final String ACTION_VIEW_SAFETY_CENTER_QS = "android.intent.action.VIEW_SAFETY_CENTER_QS";

    field public static final String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";

    field public static final String CATEGORY_LEANBACK_SETTINGS = "android.intent.category.LEANBACK_SETTINGS";

    field public static final String EXTRA_CALLING_PACKAGE = "android.intent.extra.CALLING_PACKAGE";

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,7 @@ package android.hardware { 
    field public static final int DIALOG = 3; // 0x3

    field public static final int OTHER = 5; // 0x5

    field public static final int QS_TILE = 1; // 0x1

    field public static final int SAFETY_HUB = 6; // 0x6

    field public static final int SAFETY_CENTER = 6; // 0x6

    field public static final int SETTINGS = 2; // 0x2

    field public static final int SHELL = 4; // 0x4

  }

core/java/android/content/Intent.java

+6 −3
Original line number Diff line number Diff line
@@ -2054,7 +2054,7 @@ public class Intent implements Parcelable, Cloneable { 
            "android.intent.action.VIEW_PERMISSION_USAGE_FOR_PERIOD";



    /**

     * Activity action: Launch the Safety Hub UI.

     * Activity action: Launch the Safety Center Quick Settings UI.

     *

     * <p>

     * Input: Nothing.
@@ -2062,11 +2062,14 @@ public class Intent implements Parcelable, Cloneable { 
     * <p>

     * Output: Nothing.

     * </p>

     *

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    @RequiresPermission(Manifest.permission.MANAGE_SENSOR_PRIVACY)

    public static final String ACTION_VIEW_SAFETY_HUB =

            "android.intent.action.VIEW_SAFETY_HUB";

    public static final String ACTION_VIEW_SAFETY_CENTER_QS =

            "android.intent.action.VIEW_SAFETY_CENTER_QS";



    /**

     * Activity action: Launch UI to manage a default app.

core/java/android/hardware/SensorPrivacyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ public final class SensorPrivacyManager { 
        public static final int OTHER = SensorPrivacyToggleSourceProto.OTHER;



        /**

         * Constant for SAFETY_HUB.

         * Constant for SAFETY_CENTER.

         */

        public static final int SAFETY_HUB = SensorPrivacyToggleSourceProto.SAFETY_HUB;

        public static final int SAFETY_CENTER = SensorPrivacyToggleSourceProto.SAFETY_CENTER;



        /**

         * Source for toggling sensors
@@ -151,7 +151,7 @@ public final class SensorPrivacyManager { 
                DIALOG,

                SHELL,

                OTHER,

                SAFETY_HUB

                SAFETY_CENTER

        })

        @Retention(RetentionPolicy.SOURCE)

        public @interface Source {}
@@ -652,7 +652,7 @@ public final class SensorPrivacyManager { 
        String packageName = mContext.getOpPackageName();

        if (Objects.equals(packageName,

                mContext.getPackageManager().getPermissionControllerPackageName())) {

            return Sources.SAFETY_HUB;

            return Sources.SAFETY_CENTER;

        }

        return Sources.OTHER;

    }