diff options
| author | 2020-09-18 19:12:58 +0000 | |
|---|---|---|
| committer | 2020-09-18 19:12:58 +0000 | |
| commit | 780b2f753e59443d0a1a0df2ed1f6ac8db5cdaf3 (patch) | |
| tree | cceb9acf36e57ee106167183a5a896b5c9758383 | |
| parent | bea4e46ffbbef60326c8994b8a875847145783f6 (diff) | |
| parent | 3dbee7e17caefebb88b97c82146a41716c18493c (diff) | |
Merge "Expose StatusBarManager#setDisabledForSimNetworkLock"
| -rw-r--r-- | api/module-lib-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/app/StatusBarManager.java | 1 | ||||
| -rw-r--r-- | non-updatable-api/module-lib-current.txt | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index 4f0e2cd3c768..50d68db56a28 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -10,6 +10,10 @@ package android.app { 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 { diff --git a/core/java/android/app/StatusBarManager.java b/core/java/android/app/StatusBarManager.java index 1329fa45bb50..4ff9e8d58c3a 100644 --- a/core/java/android/app/StatusBarManager.java +++ b/core/java/android/app/StatusBarManager.java @@ -400,6 +400,7 @@ public class StatusBarManager { * @hide */ @TestApi + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSimNetworkLock(boolean disabled) { try { diff --git a/non-updatable-api/module-lib-current.txt b/non-updatable-api/module-lib-current.txt index 63b98cb5bd6a..ae576d4e01ad 100644 --- a/non-updatable-api/module-lib-current.txt +++ b/non-updatable-api/module-lib-current.txt @@ -10,6 +10,10 @@ package android.app { 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 { |