PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update usage of ActivityManagerNative.

Browse Source 
Bug: 30977067
Test: N/A
Change-Id: I46e37a09cff059d2784a819bc2651d6973fbd268
This commit is contained in:
Sudheer Shanka
2016-11-10 15:30:14 -08:00
parent 28cd8cba41
commit acb1a61f3f
12 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/DeviceAdminAdd.java
View File

@@ -17,7 +17,7 @@
package com.android.settings;
import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.ActivityManager;
import android.app.AlertDialog;
import android.app.AppOpsManager;
import android.app.Dialog;
@@ -367,7 +367,7 @@ public class DeviceAdminAdd extends Activity {
try {
// Don't allow the admin to put a dialog up in front
// of us while we interact with the user.
ActivityManagerNative.getDefault().stopAppSwitches();
ActivityManager.getService().stopAppSwitches();
} catch (RemoteException e) {
}
mWaitingForRemoveMsg = true;
@@ -426,7 +426,7 @@ public class DeviceAdminAdd extends Activity {
mWaitingForRemoveMsg = false;
if (msg == null) {
try {
ActivityManagerNative.getDefault().resumeAppSwitches();
ActivityManager.getService().resumeAppSwitches();
} catch (RemoteException e) {
}
mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());
@@ -434,7 +434,7 @@ public class DeviceAdminAdd extends Activity {
} else {
try {
// Continue preventing anything from coming in front.
ActivityManagerNative.getDefault().stopAppSwitches();
ActivityManager.getService().stopAppSwitches();
} catch (RemoteException e) {
}
Bundle args = new Bundle();
@@ -466,7 +466,7 @@ public class DeviceAdminAdd extends Activity {
mAppOps.setMode(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg, mCurSysAppOpMode);
mAppOps.setMode(AppOpsManager.OP_TOAST_WINDOW, uid, pkg, mCurToastAppOpMode);
try {
ActivityManagerNative.getDefault().resumeAppSwitches();
ActivityManager.getService().resumeAppSwitches();
} catch (RemoteException e) {
}
}
@@ -494,7 +494,7 @@ public class DeviceAdminAdd extends Activity {
new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
try {
ActivityManagerNative.getDefault().resumeAppSwitches();
ActivityManager.getService().resumeAppSwitches();
} catch (RemoteException e) {
}
mDPM.removeActiveAdmin(mDeviceAdmin.getComponent());