From a14185aad4c454b24fcff73ef4efdded6f50d19f Mon Sep 17 00:00:00 2001
From: sqian <shuoq@google.com>
Date: Tue, 10 Mar 2020 22:57:43 +0000
Subject: [PATCH] Add updateMccMncConfiguration as @TestApi for CTS

Test: cts; https://paste.googleplex.com/5930499648258048
Bug: 147897445
Change-Id: I63288be1acd9e898548ced345799ac1ae69ce427
Merged-In: I63288be1acd9e898548ced345799ac1ae69ce427
(cherry picked from commit 3d873cf7d0dafde39793313b0b532a0bd163705f)
---
 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 0c7db06bc0ba0..9883e9ca80a46 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -62,6 +62,7 @@ package android.app {
     method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
     method public static void resumeAppSwitches() throws android.os.RemoteException;
     method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);
+    method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);
   }
 
   public static interface ActivityManager.OnUidImportanceListener {
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index ae1b0ccf4b6dc..1e50077e1dc9f 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -3881,6 +3881,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) {