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

Commit a0a47c44 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add @RequiresPermission and fix API naming"

parents c72a92eb ab196596

api/system-current.txt

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









  public class StatusBarManager {









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









    method public void setDisabledForSetup(boolean);









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









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









  }

















  public static final class StatusBarManager.DisableInfo {









    method public boolean areNoComponentsDisabled();









    method public boolean areAllComponentsEnabled();









    method public boolean isNavigateToHomeDisabled();









    method public boolean isNotificationPeekingDisabled();









    method public boolean isRecentsDisabled();
































core/java/android/app/StatusBarManager.java



+4
−1






























Original line number
Diff line number
Diff line







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







import android.annotation.IntDef;









import android.annotation.NonNull;









import android.annotation.Nullable;









import android.annotation.RequiresPermission;









import android.annotation.SystemApi;









import android.annotation.SystemService;









import android.annotation.UnsupportedAppUsage;








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







     * @hide









     */









    @SystemApi









    @RequiresPermission(android.Manifest.permission.STATUS_BAR)









    public void setDisabledForSetup(boolean disabled) {









        try {









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








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







     * @hide









     */









    @SystemApi









    @RequiresPermission(android.Manifest.permission.STATUS_BAR)









    @NonNull









    public DisableInfo getDisableInfo() {









        try {








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







         * @hide









         */









        @SystemApi









        public boolean areNoComponentsDisabled() {









        public boolean areAllComponentsEnabled() {









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









                    && !mSearch;









        }