Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af0d638e authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Add updateMccMncConfiguration as @TestApi for CTS"

parents c3e4dd37 a14185aa

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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 {

core/java/android/app/ActivityManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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) {