Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reexpose ActivityManager#updateMccMncConfiguration

Browse Source 
Add the SystemApi tag back to updateMccMncConfiguration for Telephony
mainline.

Fixes: 172284754
Test: atest ActivityManager#testUpdateMccMncConfiguration
Change-Id: Id6a8639aef26c39fb23d9339142c42f7518fc074
This commit is contained in:
Hall Liu
2020-11-02 16:21:49 -08:00
parent 3b224617bc
commit c82d6aa915
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/module-lib-current.txt
View File

@@ -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 {

1
core/api/test-current.txt
View File

@@ -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

9
core/java/android/app/ActivityManager.java
View File

@@ -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) {