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

Commit 9799e6e8 authored by sqian's avatar sqian
Browse files

Introduce system API for ActivityManager.updateMccMncConfiguration for Mainline 

Test: treehugger
Bug: 147381728
Bug: 138545688
Change-Id: Ieef1dbbab3b05fc166c3dbc53ed2507ef45d09d7
Merged-In: Ieef1dbbab3b05fc166c3dbc53ed2507ef45d09d7
(cherry picked from commit b9c9bfa6)
parent 365caf6f

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) public static void setPersistentVrThread(int);

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean switchUser(@NonNull android.os.UserHandle);

    method public void unregisterHomeVisibilityObserver(@NonNull android.app.HomeVisibilityObserver);

    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



+23
−0




























Original line number
Diff line number
Diff line








@@ -3870,6 +3870,29 @@ public class ActivityManager {













        return switchUser(user.getIdentifier());















    }





























    /**













     * Updates mcc mnc configuration and applies changes to the entire system.













     *













     * @param mcc mcc configuration to update.













     * @param mnc mnc configuration to update.













     * @throws RemoteException; IllegalArgumentException if mcc or mnc is null;













     * @return Returns {@code true} if the configuration was updated successfully;













     *         {@code false} otherwise.













     * @hide













     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION)













    public boolean updateMccMncConfiguration(@NonNull String mcc, @NonNull String mnc) {













        if (mcc == null || mnc == null) {













            throw new IllegalArgumentException("mcc or mnc cannot be null.");













        }













        try {













            return getService().updateMccMncConfiguration(mcc, mnc);













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }





























    /**















     * Logs out current current foreground user by switching to the system user and stopping the















     * user being switched from.

































core/java/android/app/IActivityManager.aidl



+10
−0




























Original line number
Diff line number
Diff line








@@ -188,6 +188,16 @@ interface IActivityManager {













     */















    @UnsupportedAppUsage















    boolean updateConfiguration(in Configuration values);













    /**













     * Updates mcc mnc configuration and applies changes to the entire system.













     *













     * @param mcc mcc configuration to update.













     * @param mnc mnc configuration to update.













     * @throws RemoteException; IllegalArgumentException if mcc or mnc is null.













     * @return Returns {@code true} if the configuration was updated;













     *         {@code false} otherwise.













     */













    boolean updateMccMncConfiguration(in String mcc, in String mnc);















    boolean stopServiceToken(in ComponentName className, in IBinder token, int startId);















    @UnsupportedAppUsage















    void setProcessLimit(int max);

































services/core/java/com/android/server/am/ActivityManagerService.java



+16
−0




























Original line number
Diff line number
Diff line








@@ -16065,6 +16065,22 @@ public class ActivityManagerService extends IActivityManager.Stub













        return mActivityTaskManager.updateConfiguration(values);















    }



























    @Override













    public boolean updateMccMncConfiguration(String mcc, String mnc) {













        int mccInt, mncInt;













        try {













            mccInt = Integer.parseInt(mcc);













            mncInt = Integer.parseInt(mnc);













        } catch (NumberFormatException | StringIndexOutOfBoundsException ex) {













            Slog.e(TAG, "Error parsing mcc: " + mcc + " mnc: " + mnc + ". ex=" + ex);













            return false;













        }













        Configuration config = new Configuration();













        config.mcc = mccInt;













        config.mnc = mncInt == 0 ? Configuration.MNC_ZERO : mncInt;













        return mActivityTaskManager.updateConfiguration(config);













    }



























    @Override















    public int getLaunchedFromUid(IBinder activityToken) {















        return mActivityTaskManager.getLaunchedFromUid(activityToken);