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

Commit ab993e20 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Add updateMccMncConfiguration as @TestApi for CTS" into rvc-dev-plus-aosp

parents ea1edb14 1f324f69

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,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<java.lang.String>, 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

core/java/android/app/ActivityManager.java

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