From ab196596fc9eefadcf0020e6e30c2da0b3ee039e Mon Sep 17 00:00:00 2001
From: Evan Laird <evanlaird@google.com>
Date: Tue, 26 Feb 2019 17:21:32 -0500
Subject: 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
---
 core/java/android/app/StatusBarManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'core/java/android/app/StatusBarManager.java')

diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java
index af0366801275..9ff363dddc3c 100644
--- a/core/java/android/app/StatusBarManager.java
+++ b/core/java/android/app/StatusBarManager.java
@@ -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;
         }
-- 
cgit v1.2.3