From c82d6aa9150ec3c2d3c129394e5e443e07536075 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Mon, 2 Nov 2020 16:21:49 -0800 Subject: [PATCH] Reexpose ActivityManager#updateMccMncConfiguration Add the SystemApi tag back to updateMccMncConfiguration for Telephony mainline. Fixes: 172284754 Test: atest ActivityManager#testUpdateMccMncConfiguration Change-Id: Id6a8639aef26c39fb23d9339142c42f7518fc074 --- core/api/module-lib-current.txt | 1 + core/api/test-current.txt | 1 + core/java/android/app/ActivityManager.java | 9 ++++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 40ac3cd85d98b..7085f7ba62cb5 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -4,6 +4,7 @@ package android.app { public class ActivityManager { method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void addHomeVisibilityListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.HomeVisibilityListener); method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void removeHomeVisibilityListener(@NonNull android.app.HomeVisibilityListener); + method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String); } public class AppOpsManager { diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 1fdb3e4a6fdeb..db45ec57eb81c 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -91,6 +91,7 @@ package android.app { method @RequiresPermission(android.Manifest.permission.RESET_APP_ERRORS) public void resetAppErrors(); method public static void resumeAppSwitches() throws android.os.RemoteException; method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List, int); + method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String); field public static final int PROCESS_CAPABILITY_ALL = 7; // 0x7 field public static final int PROCESS_CAPABILITY_ALL_EXPLICIT = 1; // 0x1 field public static final int PROCESS_CAPABILITY_ALL_IMPLICIT = 6; // 0x6 diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index bd51fc5a408f2..f9970dd8e3dba 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -4200,15 +4200,18 @@ public class ActivityManager { } /** - * Updates mcc mnc configuration and applies changes to the entire system. + * Updates the MCC (Mobile Country Code) and MNC (Mobile Network Code) in the + * system configuration. * - * @param mcc mcc configuration to update. - * @param mnc mnc configuration to update. + * @param mcc The new MCC. + * @param mnc The new MNC. * @throws RemoteException; IllegalArgumentException if mcc or mnc is null; * @return Returns {@code true} if the configuration was updated successfully; * {@code false} otherwise. * @hide */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @TestApi @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String mcc, @NonNull String mnc) { if (mcc == null || mnc == null) {