From 501a606c11cc049eacd7ee08ebc101396c7df8df Mon Sep 17 00:00:00 2001 From: Shuo Qian Date: Thu, 27 Feb 2020 14:24:16 -0800 Subject: [PATCH] Add updateMccMncConfiguration as @TestApi for CTS Test: cts; https://paste.googleplex.com/5930499648258048 Bug: 147897445 Change-Id: I63288be1acd9e898548ced345799ac1ae69ce427 Merged-In: I63288be1acd9e898548ced345799ac1ae69ce427 --- api/test-current.txt | 1 + core/java/android/app/ActivityManager.java | 1 + 2 files changed, 2 insertions(+) diff --git a/api/test-current.txt b/api/test-current.txt index 4f4c82b43e706..c101f5726317b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -83,6 +83,7 @@ package android.app { 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.permission.MANAGE_USERS") public boolean switchUser(@NonNull android.os.UserHandle); + 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 dd4788e1146a9..1a92b758ab9f5 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -4243,6 +4243,7 @@ public class ActivityManager { * @hide */ @SystemApi + @TestApi @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String mcc, @NonNull String mnc) { if (mcc == null || mnc == null) {