From 3dbee7e17caefebb88b97c82146a41716c18493c Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Tue, 15 Sep 2020 15:25:46 -0700 Subject: [PATCH] Expose StatusBarManager#setDisabledForSimNetworkLock Expose method for use by Telephony when it moves over to a mainline module. Fixes: 168647030 Test: atest android.app.cts.StatusBarManagerTest Change-Id: I88807ff0e46acce67f683b71ea8621719e6fe6ac --- api/module-lib-current.txt | 4 ++++ core/java/android/app/StatusBarManager.java | 1 + non-updatable-api/module-lib-current.txt | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt index c12d897b9d726..484949e5dea63 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 1329fa45bb507..4ff9e8d58c3ae 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 f7f42d0a59562..9a37589d82816 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 {