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

Commit c2a86ef8 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "Remove WAKEUP_SURFACE_FLINGER permission as SystemAPI"

parents e92047f6 367553a3

core/api/system-current.txt

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

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

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

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

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

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

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

core/java/android/view/SurfaceControl.java

+4 −0
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@ import static android.view.SurfaceControlProto.HASH_CODE; 
import static android.view.SurfaceControlProto.LAYER_ID;

import static android.view.SurfaceControlProto.NAME;



import android.Manifest;

import android.annotation.CallbackExecutor;

import android.annotation.FloatRange;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.Size;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;
@@ -3166,6 +3168,7 @@ public final class SurfaceControl implements Parcelable { 
          *

          * @hide

          */

        @RequiresPermission(Manifest.permission.WAKEUP_SURFACE_FLINGER)

        public Transaction setEarlyWakeupStart() {

            nativeSetEarlyWakeupStart(mNativeObject);

            return this;
@@ -3176,6 +3179,7 @@ public final class SurfaceControl implements Parcelable { 
         *

         * @hide

         */

        @RequiresPermission(Manifest.permission.WAKEUP_SURFACE_FLINGER)

        public Transaction setEarlyWakeupEnd() {

            nativeSetEarlyWakeupEnd(mNativeObject);

            return this;

core/res/AndroidManifest.xml

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

        android:protectionLevel="signature|recents" />



    <!-- @SystemApi Allows an application to provide hints to SurfaceFlinger that can influence

    <!-- Allows an application to provide hints to SurfaceFlinger that can influence

         its wakes up time to compose the next frame. This is a subset of the capabilities granted

         by {@link #ACCESS_SURFACE_FLINGER}.

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