commit 780b2f753e59443d0a1a0df2ed1f6ac8db5cdaf3
author Hall Liu <hallliu@google.com> Fri Sep 18 19:12:58 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 18 19:12:58 2020 +0000
tree cceb9acf36e57ee106167183a5a896b5c9758383
parent bea4e46ffbbef60326c8994b8a875847145783f6
parent 3dbee7e17caefebb88b97c82146a41716c18493c

Merge "Expose StatusBarManager#setDisabledForSimNetworkLock"

api/module-lib-current.txt

diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt
index 4f0e2cd..50d68db 100644
--- a/api/module-lib-current.txt
+++ b/api/module-lib-current.txt
@@ -10,6 +10,10 @@
     field public static final String ACTION_NOTIFICATION_LISTENER_ENABLED_CHANGED = "android.app.action.NOTIFICATION_LISTENER_ENABLED_CHANGED";
   }
 
+  public class StatusBarManager {
+    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSimNetworkLock(boolean);
+  }
+
 }
 
 package android.content.rollback {

core/java/android/app/StatusBarManager.java

diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java
index 1329fa4..4ff9e8d 100644
--- a/core/java/android/app/StatusBarManager.java
+++ b/core/java/android/app/StatusBarManager.java
@@ -400,6 +400,7 @@
      * @hide
      */
     @TestApi
+    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
     @RequiresPermission(android.Manifest.permission.STATUS_BAR)
     public void setDisabledForSimNetworkLock(boolean disabled) {
         try {

non-updatable-api/module-lib-current.txt

diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt
index 63b98cb..ae576d4 100644
--- a/non-updatable-api/module-lib-current.txt
+++ b/non-updatable-api/module-lib-current.txt
@@ -10,6 +10,10 @@
     field public static final String ACTION_NOTIFICATION_LISTENER_ENABLED_CHANGED = "android.app.action.NOTIFICATION_LISTENER_ENABLED_CHANGED";
   }
 
+  public class StatusBarManager {
+    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSimNetworkLock(boolean);
+  }
+
 }
 
 package android.content.rollback {