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

Commit 4b1a1f13 authored by Yogisha Dixit's avatar Yogisha Dixit
Browse files

RESTRICT AUTOMERGE 

Add a hidden API to check if ambient display is suppressed for a token.

Added 1 method:
boolean isAmbientDisplaySuppressedForTokenByApp(String token, int appUid)

Context:
The Settings team is working on adding a string to the AOD settings page when ambient display is suppressed by Bedtime mode: b/168790245.

The current PowerManager#isAmbientDisplaySuppressedForToken(String token) method will only work if the calling app is also the app that suppressed the ambient display. That is, if Digital Wellbeing called suppressAmbientDisplay("winddown"), then isAmbientDisplaySuppressedForToken("winddown") will only return true for Digital Wellbeing. It will return false for Settings app

This CL adds a hidden API PowerManager#isAmbientDisplaySuppressedForTokenByApp(String token, int appUid) that will return true if the given app is suppressing ambient display with the given token. Settings can then call isAmbientDisplaySuppressedForTokenByApp("winddown", digitalWellbeingUid) to get whether ambient display is suppressed by Bedtime mode.

Test: atest FrameworksServicesTests:PowerManagerServiceTest
Bug: 169241595
Change-Id: I41aecc4ff0ab159d67e62193af27362a96c3174c
(cherry picked from commit 784b62a5)
parent 34407ea5

core/java/android/os/IPowerManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ interface IPowerManager 
    boolean isAmbientDisplaySuppressedForToken(String token);

    // returns whether ambient display is suppressed by any app with any token.

    boolean isAmbientDisplaySuppressed();

    // returns whether ambient display is suppressed by the given app with the given token.

    boolean isAmbientDisplaySuppressedForTokenByApp(String token, int appUid);



    // Forces the system to suspend even if there are held wakelocks.

    boolean forceSuspend();

core/java/android/os/PowerManager.java

+21 −0
Original line number Diff line number Diff line
@@ -2126,6 +2126,27 @@ public final class PowerManager { 
        }

    }



    /**

     * Returns true if ambient display is suppressed by the given {@code appUid} with the given

     * {@code token}.

     *

     * <p>This method will return false if {@link #isAmbientDisplayAvailable()} is false.

     *

     * @param token The identifier of the ambient display suppression.

     * @param appUid The uid of the app that suppressed ambient display.

     * @hide

     */

    @RequiresPermission(allOf = {

            android.Manifest.permission.READ_DREAM_STATE,

            android.Manifest.permission.READ_DREAM_SUPPRESSION })

    public boolean isAmbientDisplaySuppressedForTokenByApp(@NonNull String token, int appUid) {

        try {

            return mService.isAmbientDisplaySuppressedForTokenByApp(token, appUid);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Returns the reason the phone was last shutdown. Calling app must have the

     * {@link android.Manifest.permission#DEVICE_POWER} permission to request this information.

core/res/AndroidManifest.xml

+4 −0
Original line number Diff line number Diff line
@@ -4295,6 +4295,10 @@ 
    <permission android:name="android.permission.WRITE_DREAM_STATE"

        android:protectionLevel="signature|privileged" />



    <!-- @hide Allows applications to read whether ambient display is suppressed. -->

    <permission android:name="android.permission.READ_DREAM_SUPPRESSION"

        android:protectionLevel="signature" />



    <!-- @SystemApi Allow an application to read and write the cache partition.

         @hide -->

    <permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM"

services/core/java/com/android/server/power/PowerManagerService.java

+16 −0
Original line number Diff line number Diff line
@@ -5304,6 +5304,22 @@ public final class PowerManagerService extends SystemService 
            }

        }



        @Override // Binder call

        public boolean isAmbientDisplaySuppressedForTokenByApp(@NonNull String token, int appUid) {

            mContext.enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_DREAM_STATE, null);

            mContext.enforceCallingOrSelfPermission(

                    android.Manifest.permission.READ_DREAM_SUPPRESSION, null);



            final long ident = Binder.clearCallingIdentity();

            try {

                return isAmbientDisplayAvailable()

                        && mAmbientDisplaySuppressionController.isSuppressed(token, appUid);

            } finally {

                Binder.restoreCallingIdentity(ident);

            }

        }



        @Override // Binder call

        public boolean isAmbientDisplaySuppressed() {

            mContext.enforceCallingOrSelfPermission(

services/tests/servicestests/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS"/>

    <uses-permission android:name="android.permission.DUMP"/>

    <uses-permission android:name="android.permission.READ_DREAM_STATE"/>

    <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION"/>

    <uses-permission android:name="android.permission.WRITE_DREAM_STATE"/>

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>

    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"/>