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

Commit c60545e6 authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Reexpose ActivityManager#updateMccMncConfiguration"

parents 3029206c c82d6aa9

core/api/module-lib-current.txt

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

core/api/test-current.txt

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

core/java/android/app/ActivityManager.java

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