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

Commit cd28be71 authored by Bernardo Rufino's avatar Bernardo Rufino Committed by Automerger Merge Worker
Browse files

Merge "Adjust ACSD APIs" into sc-dev am: 04addcb1 

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

Change-Id: I9595e1f9bb1880577cec0de6e54da3aff1cb18a6
parents 2065b57a 04addcb1

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ package android { 
    field public static final String BIND_TV_REMOTE_SERVICE = "android.permission.BIND_TV_REMOTE_SERVICE";

    field public static final String BRICK = "android.permission.BRICK";

    field public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission.BRIGHTNESS_SLIDER_USAGE";

    field public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS = "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";

    field @Deprecated public static final String BROADCAST_NETWORK_PRIVILEGED = "android.permission.BROADCAST_NETWORK_PRIVILEGED";

    field public static final String CAMERA_DISABLE_TRANSMIT_LED = "android.permission.CAMERA_DISABLE_TRANSMIT_LED";

    field public static final String CAMERA_OPEN_CLOSE_LISTENER = "android.permission.CAMERA_OPEN_CLOSE_LISTENER";

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int, boolean);

    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();

    field public static final long DROP_CLOSE_SYSTEM_DIALOGS = 174664120L; // 0xa6929b8L

    field public static final long LOCK_DOWN_CLOSE_SYSTEM_DIALOGS = 174664365L; // 0xa692aadL

    field public static final int PROCESS_CAPABILITY_ALL = 15; // 0xf

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

core/java/android/app/ActivityManager.java

+0 −1
Original line number Diff line number Diff line
@@ -901,7 +901,6 @@ public class ActivityManager { 
     *

     * @hide

     */

    @TestApi

    @ChangeId

    public static final long DROP_CLOSE_SYSTEM_DIALOGS = 174664120L;

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -4484,7 +4484,7 @@ 
    <permission android:name="android.permission.FACTORY_TEST"

        android:protectionLevel="signature" />



    <!-- @hide @TestApi Allows an application to broadcast the intent {@link

    <!-- @hide @TestApi @SystemApi Allows an application to broadcast the intent {@link

         android.content.Intent#ACTION_CLOSE_SYSTEM_DIALOGS}.

         <p>Not for use by third-party applications.

    -->