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

Commit ab196596 authored by Evan Laird's avatar Evan Laird
Browse files

Add @RequiresPermission and fix API naming 

StatusBarManager#setDisabledForSetup() requires
android.Manifest.permission.STATUS_BAR, and is now documented that way.

Also rename areNoComponentsDisabled to areAllComponentsEnabled so it
reads better

Bug: 126376147
Test: atest GtsStatusBarHostTestCases
Change-Id: I59b113a2568463541dfbd46f505489aa94aac9d9
parent 8ecdef27

api/system-current.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -565,12 +565,12 @@ package android.app { 
  }

  }











  public class StatusBarManager {




  public class StatusBarManager {








    method @NonNull public android.app.StatusBarManager.DisableInfo getDisableInfo();




    method @NonNull @RequiresPermission(android.Manifest.permission.STATUS_BAR) public android.app.StatusBarManager.DisableInfo getDisableInfo();








    method public void setDisabledForSetup(boolean);




    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean);








  }




  }


















  public static final class StatusBarManager.DisableInfo {




  public static final class StatusBarManager.DisableInfo {








    method public boolean areNoComponentsDisabled();




    method public boolean areAllComponentsEnabled();








    method public boolean isNavigateToHomeDisabled();




    method public boolean isNavigateToHomeDisabled();








    method public boolean isNotificationPeekingDisabled();




    method public boolean isNotificationPeekingDisabled();








    method public boolean isRecentsDisabled();




    method public boolean isRecentsDisabled();
































core/java/android/app/StatusBarManager.java



+4
−1






























Original line number
Original line
Diff line number
Diff line







@@ -19,6 +19,7 @@ package android.app;






import android.annotation.IntDef;




import android.annotation.IntDef;








import android.annotation.NonNull;




import android.annotation.NonNull;








import android.annotation.Nullable;




import android.annotation.Nullable;










import android.annotation.RequiresPermission;








import android.annotation.SystemApi;




import android.annotation.SystemApi;








import android.annotation.SystemService;




import android.annotation.SystemService;








import android.annotation.UnsupportedAppUsage;




import android.annotation.UnsupportedAppUsage;








@@ -365,6 +366,7 @@ public class StatusBarManager {






     * @hide




     * @hide








     */




     */








    @SystemApi




    @SystemApi










    @RequiresPermission(android.Manifest.permission.STATUS_BAR)








    public void setDisabledForSetup(boolean disabled) {




    public void setDisabledForSetup(boolean disabled) {








        try {




        try {








            final int userId = Binder.getCallingUserHandle().getIdentifier();




            final int userId = Binder.getCallingUserHandle().getIdentifier();








@@ -388,6 +390,7 @@ public class StatusBarManager {






     * @hide




     * @hide








     */




     */








    @SystemApi




    @SystemApi










    @RequiresPermission(android.Manifest.permission.STATUS_BAR)








    @NonNull




    @NonNull








    public DisableInfo getDisableInfo() {




    public DisableInfo getDisableInfo() {








        try {




        try {








@@ -520,7 +523,7 @@ public class StatusBarManager {






         * @hide




         * @hide








         */




         */








        @SystemApi




        @SystemApi








        public boolean areNoComponentsDisabled() {




        public boolean areAllComponentsEnabled() {








            return !mStatusBarExpansion && !mNavigateHome && !mNotificationPeeking && !mRecents




            return !mStatusBarExpansion && !mNavigateHome && !mNotificationPeeking && !mRecents








                    && !mSearch;




                    && !mSearch;








        }




        }