Update usage of ActivityManagerNative.

Bug: 30977067
Test: N/A
Change-Id: If76488d9e7b1a33f7f5c9d65eb9254d126ef02b6
This commit is contained in:
Sudheer Shanka
2016-11-10 16:58:56 -08:00
parent 98424ffc7f
commit 5b6205978e
7 changed files with 12 additions and 14 deletions

View File

@@ -17,7 +17,7 @@
package com.android.development;
import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.ActivityManager;
import android.app.IActivityController;
import android.app.IActivityManager;
import android.app.Service;
@@ -82,7 +82,7 @@ public class BadBehaviorActivity extends Activity {
public boolean activityStarting(Intent intent, String pkg) {
try {
ActivityManagerNative.getDefault().setActivityController(null, false);
ActivityManager.getService().setActivityController(null, false);
} catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", e);
}
@@ -241,7 +241,7 @@ public class BadBehaviorActivity extends Activity {
Intent intent = new Intent(BadBehaviorActivity.this, BadBehaviorActivity.class);
Log.i(TAG, "ANR system pressed -- about to engage");
try {
ActivityManagerNative.getDefault().setActivityController(
ActivityManager.getService().setActivityController(
new BadController(20000), false);
} catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", e);
@@ -256,7 +256,7 @@ public class BadBehaviorActivity extends Activity {
Intent intent = new Intent(BadBehaviorActivity.this, BadBehaviorActivity.class);
Log.i(TAG, "Wedge system pressed -- about to engage");
try {
ActivityManagerNative.getDefault().setActivityController(
ActivityManager.getService().setActivityController(
new BadController(300000), false);
} catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", e);

View File

@@ -21,7 +21,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.IActivityController;
import android.app.IActivityManager;
import android.app.Service;

View File

@@ -18,7 +18,6 @@
package com.android.development;
import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;

View File

@@ -16,7 +16,7 @@
package com.android.development;
import android.app.ActivityManagerNative;
import android.app.ActivityManager;
import android.app.IInstrumentationWatcher;
import android.app.ListActivity;
import android.content.ComponentName;
@@ -154,7 +154,7 @@ public class InstrumentationList extends ListActivity
profilingFile = "/tmp/trace/" + className + ".dmtrace";
}
try {
ActivityManagerNative.getDefault().
ActivityManager.getService().
startInstrumentation(className, profilingFile, 0, null, mWatcher, null,
UserHandle.myUserId(), null);
} catch (RemoteException ex) {