Merge "Update usage of ActivityManagerNative." (3b4d7272) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/BugreportPreference.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.settings;

		import android.app.ActivityManager;
		import android.app.ActivityManagerNative;
		import android.app.AlertDialog.Builder;
		import android.content.Context;
		import android.content.DialogInterface;
		@@ -97,7 +96,7 @@ public class BugreportPreference extends CustomDialogPreference {

		private void takeBugreport(int bugreportType) {
		try {
		ActivityManagerNative.getDefault().requestBugReport(bugreportType);
		ActivityManager.getService().requestBugReport(bugreportType);
		} catch (RemoteException e) {
		Log.e(TAG, "error taking bugreport (bugreportType=" + bugreportType + ")", e);
		}

src/com/android/settings/ConfirmDeviceCredentialBaseFragment.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package com.android.settings;

		import android.annotation.Nullable;
		import android.app.ActivityManager;
		import android.app.ActivityManagerNative;
		import android.app.ActivityOptions;
		import android.app.AlertDialog;
		import android.app.IActivityManager;
		@@ -213,7 +212,7 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
		int taskId = getActivity().getIntent().getIntExtra(Intent.EXTRA_TASK_ID, -1);
		if (taskId != -1) {
		try {
		IActivityManager activityManager = ActivityManagerNative.getDefault();
		IActivityManager activityManager = ActivityManager.getService();
		final ActivityOptions options = ActivityOptions.makeBasic();
		options.setLaunchStackId(ActivityManager.StackId.INVALID_STACK_ID);
		activityManager.startActivityFromRecents(taskId, options.toBundle());

src/com/android/settings/CredentialStorage.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -418,7 +418,7 @@ public final class CredentialStorage extends Activity {

		final int launchedFromUserId;
		try {
		int launchedFromUid = android.app.ActivityManagerNative.getDefault()
		int launchedFromUid = android.app.ActivityManager.getService()
		.getLaunchedFromUid(getActivityToken());
		if (launchedFromUid == -1) {
		Log.e(TAG, ACTION_INSTALL + " must be started with startActivityForResult");

src/com/android/settings/DevelopmentSettings.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package com.android.settings;

		import android.Manifest;
		import android.app.Activity;
		import android.app.ActivityManagerNative;
		import android.app.ActivityManager;
		import android.app.AlertDialog;
		import android.app.AppOpsManager;
		import android.app.AppOpsManager.PackageOps;
		@@ -807,7 +807,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment

		try {
		String wv_package = mWebViewUpdateService.getCurrentWebViewPackageName();
		ActivityManagerNative.getDefault().killPackageDependents(
		ActivityManager.getService().killPackageDependents(
		wv_package, UserHandle.USER_ALL);
		} catch(RemoteException e) {
		}
		@@ -865,7 +865,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment

		private void writeDebuggerOptions() {
		try {
		ActivityManagerNative.getDefault().setDebugApp(
		ActivityManager.getService().setDebugApp(
		mDebugApp, mWaitForDebugger.isChecked(), true);
		} catch (RemoteException ex) {
		}
		@@ -908,7 +908,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment

		private static void resetDebuggerOptions() {
		try {
		ActivityManagerNative.getDefault().setDebugApp(
		ActivityManager.getService().setDebugApp(
		null, false, true);
		} catch (RemoteException ex) {
		}
		@@ -1721,7 +1721,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment

		private void writeImmediatelyDestroyActivitiesOptions() {
		try {
		ActivityManagerNative.getDefault().setAlwaysFinish(
		ActivityManager.getService().setAlwaysFinish(
		mImmediatelyDestroyActivities.isChecked());
		} catch (RemoteException ex) {
		}
		@@ -1795,7 +1795,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment

		private void updateAppProcessLimitOptions() {
		try {
		int limit = ActivityManagerNative.getDefault().getProcessLimit();
		int limit = ActivityManager.getService().getProcessLimit();
		CharSequence[] values = mAppProcessLimit.getEntryValues();
		for (int i=0; i<values.length; i++) {
		int val = Integer.parseInt(values[i].toString());
		@@ -1817,7 +1817,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
		private void writeAppProcessLimitOptions(Object newValue) {
		try {
		int limit = newValue != null ? Integer.parseInt(newValue.toString()) : -1;
		ActivityManagerNative.getDefault().setProcessLimit(limit);
		ActivityManager.getService().setProcessLimit(limit);
		updateAppProcessLimitOptions();
		} catch (RemoteException e) {
		}

src/com/android/settings/DeviceAdminAdd.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -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());