diff options
111 files changed, 463 insertions, 516 deletions
diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTest.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTest.java index 88cb8e6c75aa..f56c76332faa 100644 --- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTest.java +++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTest.java @@ -16,7 +16,6 @@ package android.multiuser; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.app.IStopUserCallback; import android.app.UserSwitchObserver; @@ -86,7 +85,7 @@ public class UserLifecycleTest { final Context context = InstrumentationRegistry.getContext(); mUm = UserManager.get(context); mAm = context.getSystemService(ActivityManager.class); - mIam = ActivityManagerNative.getDefault(); + mIam = ActivityManager.getService(); mState = mPerfStatusReporter.getBenchmarkState(); mUsersToRemove = new ArrayList<>(); } @@ -249,7 +248,7 @@ public class UserLifecycleTest { private void registerUserSwitchObserver(final CountDownLatch switchLatch, final CountDownLatch bootCompleteLatch, final int userId) throws Exception { - ActivityManagerNative.getDefault().registerUserSwitchObserver( + ActivityManager.getService().registerUserSwitchObserver( new UserSwitchObserver() { @Override public void onUserSwitchComplete(int newUserId) throws RemoteException { diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index 470a0faf82fc..f003061cec3a 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -23,7 +23,6 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID; import android.app.ActivityManager; import android.app.ActivityManager.StackInfo; -import android.app.ActivityManagerNative; import android.app.IActivityContainer; import android.app.IActivityController; import android.app.IActivityManager; @@ -108,7 +107,7 @@ public class Am extends BaseCommand { @Override public void onRun() throws Exception { - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); if (mAm == null) { System.err.println(NO_SYSTEM_ERROR_CODE); throw new AndroidException("Can't connect to activity manager; is the system running?"); diff --git a/cmds/content/src/com/android/commands/content/Content.java b/cmds/content/src/com/android/commands/content/Content.java index 132a4f82767a..63641a8e38f4 100644 --- a/cmds/content/src/com/android/commands/content/Content.java +++ b/cmds/content/src/com/android/commands/content/Content.java @@ -16,7 +16,7 @@ package com.android.commands.content; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ContentProviderHolder; import android.app.IActivityManager; import android.content.ContentValues; @@ -433,7 +433,7 @@ public class Content { public final void execute() { String providerName = mUri.getAuthority(); try { - IActivityManager activityManager = ActivityManagerNative.getDefault(); + IActivityManager activityManager = ActivityManager.getService(); IContentProvider provider = null; IBinder token = new Binder(); try { diff --git a/cmds/dpm/src/com/android/commands/dpm/Dpm.java b/cmds/dpm/src/com/android/commands/dpm/Dpm.java index 31c742153f24..3ac70d668198 100644 --- a/cmds/dpm/src/com/android/commands/dpm/Dpm.java +++ b/cmds/dpm/src/com/android/commands/dpm/Dpm.java @@ -16,7 +16,7 @@ package com.android.commands.dpm; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.app.admin.DevicePolicyManager; import android.app.admin.IDevicePolicyManager; @@ -117,7 +117,7 @@ public final class Dpm extends BaseCommand { mUserId = parseInt(arg); } if (mUserId == UserHandle.USER_CURRENT) { - IActivityManager activityManager = ActivityManagerNative.getDefault(); + IActivityManager activityManager = ActivityManager.getService(); try { mUserId = activityManager.getCurrentUser().id; } catch (RemoteException e) { diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java index 718f1414c93d..50f46f4007d3 100644 --- a/cmds/pm/src/com/android/commands/pm/Pm.java +++ b/cmds/pm/src/com/android/commands/pm/Pm.java @@ -24,7 +24,6 @@ import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATIO import android.accounts.IAccountManager; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.PackageInstallObserver; import android.content.ComponentName; import android.content.Context; @@ -1191,7 +1190,7 @@ public final class Pm { ClearDataObserver obs = new ClearDataObserver(); try { - ActivityManagerNative.getDefault().clearApplicationUserData(pkg, obs, userId); + ActivityManager.getService().clearApplicationUserData(pkg, obs, userId); synchronized (obs) { while (!obs.finished) { try { diff --git a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/ShellUiAutomatorBridge.java b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/ShellUiAutomatorBridge.java index 86811665d9c6..32b45953fc77 100644 --- a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/ShellUiAutomatorBridge.java +++ b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/ShellUiAutomatorBridge.java @@ -16,7 +16,7 @@ package com.android.uiautomator.core; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ContentProviderHolder; import android.app.IActivityManager; import android.app.UiAutomation; @@ -56,7 +56,7 @@ public class ShellUiAutomatorBridge extends UiAutomatorBridge { try { IContentProvider provider = null; Cursor cursor = null; - IActivityManager activityManager = ActivityManagerNative.getDefault(); + IActivityManager activityManager = ActivityManager.getService(); String providerName = Settings.Secure.CONTENT_URI.getAuthority(); IBinder token = new Binder(); try { diff --git a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java index ddeb8e786271..d98b4ff3e69a 100644 --- a/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java +++ b/cmds/uiautomator/library/testrunner-src/com/android/uiautomator/core/UiAutomationShellWrapper.java @@ -2,7 +2,6 @@ package com.android.uiautomator.core; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.IActivityController; import android.app.IActivityManager; import android.app.UiAutomation; @@ -44,7 +43,7 @@ public class UiAutomationShellWrapper { * @see {@link ActivityManager#isUserAMonkey()} */ public void setRunAsMonkey(boolean isSet) { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); if (am == null) { throw new RuntimeException("Can't manage monkey status; is the system running?"); } diff --git a/compiled-classes-phone b/compiled-classes-phone index 33e3e0437aa6..03b568458c1c 100644 --- a/compiled-classes-phone +++ b/compiled-classes-phone @@ -174,9 +174,6 @@ android.app.ActivityManager$TaskThumbnailInfo android.app.ActivityManager$TaskThumbnailInfo$1 android.app.ActivityManagerInternal android.app.ActivityManagerInternal$SleepToken -android.app.ActivityManagerNative -android.app.ActivityManagerNative$1 -android.app.ActivityManagerProxy android.app.ActivityOptions android.app.ActivityOptions$OnAnimationFinishedListener android.app.ActivityOptions$OnAnimationStartedListener diff --git a/core/java/android/accounts/ChooseTypeAndAccountActivity.java b/core/java/android/accounts/ChooseTypeAndAccountActivity.java index aed7a3693717..8c71f50d3f02 100644 --- a/core/java/android/accounts/ChooseTypeAndAccountActivity.java +++ b/core/java/android/accounts/ChooseTypeAndAccountActivity.java @@ -18,7 +18,7 @@ package android.accounts; import com.google.android.collect.Sets; import android.app.Activity; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.Intent; import android.os.Bundle; import android.os.IBinder; @@ -141,8 +141,8 @@ public class ChooseTypeAndAccountActivity extends Activity try { IBinder activityToken = getActivityToken(); - mCallingUid = ActivityManagerNative.getDefault().getLaunchedFromUid(activityToken); - mCallingPackage = ActivityManagerNative.getDefault().getLaunchedFromPackage( + mCallingUid = ActivityManager.getService().getLaunchedFromUid(activityToken); + mCallingPackage = ActivityManager.getService().getLaunchedFromPackage( activityToken); if (mCallingUid != 0 && mCallingPackage != null) { Bundle restrictions = UserManager.get(this) diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 6f53f13662be..64e5dfc66bce 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -1313,7 +1313,7 @@ public class Activity extends ContextThemeWrapper public boolean isVoiceInteractionRoot() { try { return mVoiceInteractor != null - && ActivityManagerNative.getDefault().isRootVoiceInteraction(mToken); + && ActivityManager.getService().isRootVoiceInteraction(mToken); } catch (RemoteException e) { } return false; @@ -1336,7 +1336,7 @@ public class Activity extends ContextThemeWrapper */ public boolean isLocalVoiceInteractionSupported() { try { - return ActivityManagerNative.getDefault().supportsLocalVoiceInteraction(); + return ActivityManager.getService().supportsLocalVoiceInteraction(); } catch (RemoteException re) { } return false; @@ -1350,7 +1350,7 @@ public class Activity extends ContextThemeWrapper */ public void startLocalVoiceInteraction(Bundle privateOptions) { try { - ActivityManagerNative.getDefault().startLocalVoiceInteraction(mToken, privateOptions); + ActivityManager.getService().startLocalVoiceInteraction(mToken, privateOptions); } catch (RemoteException re) { } } @@ -1379,7 +1379,7 @@ public class Activity extends ContextThemeWrapper */ public void stopLocalVoiceInteraction() { try { - ActivityManagerNative.getDefault().stopLocalVoiceInteraction(mToken); + ActivityManager.getService().stopLocalVoiceInteraction(mToken); } catch (RemoteException re) { } } @@ -1798,7 +1798,7 @@ public class Activity extends ContextThemeWrapper */ public boolean showAssist(Bundle args) { try { - return ActivityManagerNative.getDefault().showAssistFromActivity(mToken, args); + return ActivityManager.getService().showAssistFromActivity(mToken, args); } catch (RemoteException e) { } return false; @@ -1914,7 +1914,7 @@ public class Activity extends ContextThemeWrapper if (mDoReportFullyDrawn) { mDoReportFullyDrawn = false; try { - ActivityManagerNative.getDefault().reportActivityFullyDrawn(mToken); + ActivityManager.getService().reportActivityFullyDrawn(mToken); } catch (RemoteException e) { } } @@ -1940,7 +1940,7 @@ public class Activity extends ContextThemeWrapper */ public boolean isInMultiWindowMode() { try { - return ActivityManagerNative.getDefault().isInMultiWindowMode(mToken); + return ActivityManager.getService().isInMultiWindowMode(mToken); } catch (RemoteException e) { } return false; @@ -1965,7 +1965,7 @@ public class Activity extends ContextThemeWrapper */ public boolean isInPictureInPictureMode() { try { - return ActivityManagerNative.getDefault().isInPictureInPictureMode(mToken); + return ActivityManager.getService().isInPictureInPictureMode(mToken); } catch (RemoteException e) { } return false; @@ -1977,7 +1977,7 @@ public class Activity extends ContextThemeWrapper */ public void enterPictureInPictureMode() { try { - ActivityManagerNative.getDefault().enterPictureInPictureMode(mToken); + ActivityManager.getService().enterPictureInPictureMode(mToken); } catch (RemoteException e) { } } @@ -3037,7 +3037,7 @@ public class Activity extends ContextThemeWrapper */ @Override public void exitFreeformMode() throws RemoteException { - ActivityManagerNative.getDefault().exitFreeformMode(mToken); + ActivityManager.getService().exitFreeformMode(mToken); } /** Returns the current stack Id for the window. @@ -3045,7 +3045,7 @@ public class Activity extends ContextThemeWrapper */ @Override public int getWindowStackId() throws RemoteException { - return ActivityManagerNative.getDefault().getActivityStackId(mToken); + return ActivityManager.getService().getActivityStackId(mToken); } /** @@ -4533,7 +4533,7 @@ public class Activity extends ContextThemeWrapper fillInIntent.prepareToLeaveProcess(this); resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver()); } - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivityIntentSender(mMainThread.getApplicationThread(), intent, fillInIntent, resolvedType, mToken, who, requestCode, flagsMask, flagsValues, options); @@ -4763,7 +4763,7 @@ public class Activity extends ContextThemeWrapper } intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(this); - result = ActivityManagerNative.getDefault() + result = ActivityManager.getService() .startActivity(mMainThread.getApplicationThread(), getBasePackageName(), intent, intent.resolveTypeIfNeeded(getContentResolver()), mToken, mEmbeddedID, requestCode, ActivityManager.START_FLAG_ONLY_IF_NEEDED, @@ -4834,7 +4834,7 @@ public class Activity extends ContextThemeWrapper try { intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(this); - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .startNextMatchingActivity(mToken, intent, options); } catch (RemoteException e) { // Empty @@ -5032,7 +5032,7 @@ public class Activity extends ContextThemeWrapper */ public void overridePendingTransition(int enterAnim, int exitAnim) { try { - ActivityManagerNative.getDefault().overridePendingTransition( + ActivityManager.getService().overridePendingTransition( mToken, getPackageName(), enterAnim, exitAnim); } catch (RemoteException e) { } @@ -5157,7 +5157,7 @@ public class Activity extends ContextThemeWrapper @Nullable public String getCallingPackage() { try { - return ActivityManagerNative.getDefault().getCallingPackage(mToken); + return ActivityManager.getService().getCallingPackage(mToken); } catch (RemoteException e) { return null; } @@ -5180,7 +5180,7 @@ public class Activity extends ContextThemeWrapper @Nullable public ComponentName getCallingActivity() { try { - return ActivityManagerNative.getDefault().getCallingActivity(mToken); + return ActivityManager.getService().getCallingActivity(mToken); } catch (RemoteException e) { return null; } @@ -5265,7 +5265,7 @@ public class Activity extends ContextThemeWrapper throw new IllegalStateException("Must be called from main thread"); } try { - ActivityManagerNative.getDefault().requestActivityRelaunch(mToken); + ActivityManager.getService().requestActivityRelaunch(mToken); } catch (RemoteException e) { } } @@ -5287,7 +5287,7 @@ public class Activity extends ContextThemeWrapper if (resultData != null) { resultData.prepareToLeaveProcess(this); } - if (ActivityManagerNative.getDefault() + if (ActivityManager.getService() .finishActivity(mToken, resultCode, resultData, finishTask)) { mFinished = true; } @@ -5330,7 +5330,7 @@ public class Activity extends ContextThemeWrapper throw new IllegalStateException("Can not be called to deliver a result"); } try { - if (ActivityManagerNative.getDefault().finishActivityAffinity(mToken)) { + if (ActivityManager.getService().finishActivityAffinity(mToken)) { mFinished = true; } } catch (RemoteException e) { @@ -5376,7 +5376,7 @@ public class Activity extends ContextThemeWrapper public void finishActivity(int requestCode) { if (mParent == null) { try { - ActivityManagerNative.getDefault() + ActivityManager.getService() .finishSubActivity(mToken, mEmbeddedID, requestCode); } catch (RemoteException e) { // Empty @@ -5396,7 +5396,7 @@ public class Activity extends ContextThemeWrapper */ public void finishActivityFromChild(@NonNull Activity child, int requestCode) { try { - ActivityManagerNative.getDefault() + ActivityManager.getService() .finishSubActivity(mToken, child.mEmbeddedID, requestCode); } catch (RemoteException e) { // Empty @@ -5424,7 +5424,7 @@ public class Activity extends ContextThemeWrapper */ public boolean releaseInstance() { try { - return ActivityManagerNative.getDefault().releaseActivityInstance(mToken); + return ActivityManager.getService().releaseActivityInstance(mToken); } catch (RemoteException e) { // Empty } @@ -5514,7 +5514,7 @@ public class Activity extends ContextThemeWrapper try { data.prepareToLeaveProcess(this); IIntentSender target = - ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.getService().getIntentSender( ActivityManager.INTENT_SENDER_ACTIVITY_RESULT, packageName, mParent == null ? mToken : mParent.mToken, mEmbeddedID, requestCode, new Intent[] { data }, null, flags, null, @@ -5539,7 +5539,7 @@ public class Activity extends ContextThemeWrapper public void setRequestedOrientation(@ActivityInfo.ScreenOrientation int requestedOrientation) { if (mParent == null) { try { - ActivityManagerNative.getDefault().setRequestedOrientation( + ActivityManager.getService().setRequestedOrientation( mToken, requestedOrientation); } catch (RemoteException e) { // Empty @@ -5562,7 +5562,7 @@ public class Activity extends ContextThemeWrapper public int getRequestedOrientation() { if (mParent == null) { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getRequestedOrientation(mToken); } catch (RemoteException e) { // Empty @@ -5581,7 +5581,7 @@ public class Activity extends ContextThemeWrapper */ public int getTaskId() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getTaskForActivity(mToken, false); } catch (RemoteException e) { return -1; @@ -5596,7 +5596,7 @@ public class Activity extends ContextThemeWrapper */ public boolean isTaskRoot() { try { - return ActivityManagerNative.getDefault().getTaskForActivity(mToken, true) >= 0; + return ActivityManager.getService().getTaskForActivity(mToken, true) >= 0; } catch (RemoteException e) { return false; } @@ -5615,7 +5615,7 @@ public class Activity extends ContextThemeWrapper */ public boolean moveTaskToBack(boolean nonRoot) { try { - return ActivityManagerNative.getDefault().moveActivityTaskToBack( + return ActivityManager.getService().moveActivityTaskToBack( mToken, nonRoot); } catch (RemoteException e) { // Empty @@ -5786,7 +5786,7 @@ public class Activity extends ContextThemeWrapper } } try { - ActivityManagerNative.getDefault().setTaskDescription(mToken, mTaskDescription); + ActivityManager.getService().setTaskDescription(mToken, mTaskDescription); } catch (RemoteException e) { } } @@ -6049,7 +6049,7 @@ public class Activity extends ContextThemeWrapper */ public boolean isImmersive() { try { - return ActivityManagerNative.getDefault().isImmersive(mToken); + return ActivityManager.getService().isImmersive(mToken); } catch (RemoteException e) { return false; } @@ -6067,7 +6067,7 @@ public class Activity extends ContextThemeWrapper return false; } try { - return ActivityManagerNative.getDefault().isTopOfTask(getActivityToken()); + return ActivityManager.getService().isTopOfTask(getActivityToken()); } catch (RemoteException e) { return false; } @@ -6093,7 +6093,7 @@ public class Activity extends ContextThemeWrapper public void convertFromTranslucent() { try { mTranslucentCallback = null; - if (ActivityManagerNative.getDefault().convertFromTranslucent(mToken)) { + if (ActivityManager.getService().convertFromTranslucent(mToken)) { WindowManagerGlobal.getInstance().changeCanvasOpacity(mToken, true); } } catch (RemoteException e) { @@ -6132,7 +6132,7 @@ public class Activity extends ContextThemeWrapper boolean drawComplete; try { mTranslucentCallback = callback; - mChangeCanvasToTranslucent = ActivityManagerNative.getDefault().convertToTranslucent( + mChangeCanvasToTranslucent = ActivityManager.getService().convertToTranslucent( mToken, options == null ? null : options.toBundle()); WindowManagerGlobal.getInstance().changeCanvasOpacity(mToken, false); drawComplete = true; @@ -6178,7 +6178,7 @@ public class Activity extends ContextThemeWrapper ActivityOptions getActivityOptions() { try { return ActivityOptions.fromBundle( - ActivityManagerNative.getDefault().getActivityOptions(mToken)); + ActivityManager.getService().getActivityOptions(mToken)); } catch (RemoteException e) { } return null; @@ -6222,7 +6222,7 @@ public class Activity extends ContextThemeWrapper visible = false; } try { - mVisibleBehind = ActivityManagerNative.getDefault() + mVisibleBehind = ActivityManager.getService() .requestVisibleBehind(mToken, visible) && visible; } catch (RemoteException e) { mVisibleBehind = false; @@ -6263,7 +6263,7 @@ public class Activity extends ContextThemeWrapper @SystemApi public boolean isBackgroundVisibleBehind() { try { - return ActivityManagerNative.getDefault().isBackgroundVisibleBehind(mToken); + return ActivityManager.getService().isBackgroundVisibleBehind(mToken); } catch (RemoteException e) { } return false; @@ -6320,7 +6320,7 @@ public class Activity extends ContextThemeWrapper */ public void setImmersive(boolean i) { try { - ActivityManagerNative.getDefault().setImmersive(mToken, i); + ActivityManager.getService().setImmersive(mToken, i); } catch (RemoteException e) { // pass } @@ -6384,7 +6384,7 @@ public class Activity extends ContextThemeWrapper public void setVrModeEnabled(boolean enabled, @NonNull ComponentName requestedComponent) throws PackageManager.NameNotFoundException { try { - if (ActivityManagerNative.getDefault().setVrMode(mToken, enabled, requestedComponent) + if (ActivityManager.getService().setVrMode(mToken, enabled, requestedComponent) != 0) { throw new PackageManager.NameNotFoundException( requestedComponent.flattenToString()); @@ -6505,7 +6505,7 @@ public class Activity extends ContextThemeWrapper if (info.taskAffinity == null) { return false; } - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .shouldUpRecreateTask(mToken, info.taskAffinity); } catch (RemoteException e) { return false; @@ -6558,7 +6558,7 @@ public class Activity extends ContextThemeWrapper } try { upIntent.prepareToLeaveProcess(this); - return ActivityManagerNative.getDefault().navigateUpTo(mToken, upIntent, + return ActivityManager.getService().navigateUpTo(mToken, upIntent, resultCode, resultData); } catch (RemoteException e) { return false; @@ -7074,7 +7074,7 @@ public class Activity extends ContextThemeWrapper */ public void startLockTask() { try { - ActivityManagerNative.getDefault().startLockTaskModeByToken(mToken); + ActivityManager.getService().startLockTaskModeByToken(mToken); } catch (RemoteException e) { } } @@ -7098,7 +7098,7 @@ public class Activity extends ContextThemeWrapper */ public void stopLockTask() { try { - ActivityManagerNative.getDefault().stopLockTaskMode(); + ActivityManager.getService().stopLockTaskMode(); } catch (RemoteException e) { } } @@ -7110,7 +7110,7 @@ public class Activity extends ContextThemeWrapper */ public void showLockTaskEscapeMessage() { try { - ActivityManagerNative.getDefault().showLockTaskEscapeMessage(mToken); + ActivityManager.getService().showLockTaskEscapeMessage(mToken); } catch (RemoteException e) { } } diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index c55d3b8208d7..65f74d17f16c 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -36,6 +36,7 @@ import com.android.internal.app.procstats.ProcessStats; import com.android.internal.os.RoSystemProperties; import com.android.internal.os.TransferPipe; import com.android.internal.util.FastPrintWriter; +import com.android.server.LocalServices; import android.content.ComponentName; import android.content.Context; @@ -89,6 +90,8 @@ public class ActivityManager { private final Context mContext; private final Handler mHandler; + private static volatile boolean sSystemReady = false; + static final class UidObserver extends IUidObserver.Stub { final OnUidImportanceListener mListener; @@ -826,7 +829,7 @@ public class ActivityManager { /** @hide */ public int getFrontActivityScreenCompatMode() { try { - return ActivityManagerNative.getDefault().getFrontActivityScreenCompatMode(); + return getService().getFrontActivityScreenCompatMode(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -835,7 +838,7 @@ public class ActivityManager { /** @hide */ public void setFrontActivityScreenCompatMode(int mode) { try { - ActivityManagerNative.getDefault().setFrontActivityScreenCompatMode(mode); + getService().setFrontActivityScreenCompatMode(mode); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -844,7 +847,7 @@ public class ActivityManager { /** @hide */ public int getPackageScreenCompatMode(String packageName) { try { - return ActivityManagerNative.getDefault().getPackageScreenCompatMode(packageName); + return getService().getPackageScreenCompatMode(packageName); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -853,7 +856,7 @@ public class ActivityManager { /** @hide */ public void setPackageScreenCompatMode(String packageName, int mode) { try { - ActivityManagerNative.getDefault().setPackageScreenCompatMode(packageName, mode); + getService().setPackageScreenCompatMode(packageName, mode); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -862,7 +865,7 @@ public class ActivityManager { /** @hide */ public boolean getPackageAskScreenCompat(String packageName) { try { - return ActivityManagerNative.getDefault().getPackageAskScreenCompat(packageName); + return getService().getPackageAskScreenCompat(packageName); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -871,7 +874,7 @@ public class ActivityManager { /** @hide */ public void setPackageAskScreenCompat(String packageName, boolean ask) { try { - ActivityManagerNative.getDefault().setPackageAskScreenCompat(packageName, ask); + getService().setPackageAskScreenCompat(packageName, ask); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1166,7 +1169,7 @@ public class ActivityManager { public static Bitmap loadTaskDescriptionIcon(String iconFilename, int userId) { if (iconFilename != null) { try { - return ActivityManagerNative.getDefault().getTaskDescriptionIcon(iconFilename, + return getService().getTaskDescriptionIcon(iconFilename, userId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1555,7 +1558,7 @@ public class ActivityManager { public List<RecentTaskInfo> getRecentTasks(int maxNum, int flags) throws SecurityException { try { - return ActivityManagerNative.getDefault().getRecentTasks(maxNum, + return getService().getRecentTasks(maxNum, flags, UserHandle.myUserId()).getList(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1580,7 +1583,7 @@ public class ActivityManager { public List<RecentTaskInfo> getRecentTasksForUser(int maxNum, int flags, int userId) throws SecurityException { try { - return ActivityManagerNative.getDefault().getRecentTasks(maxNum, + return getService().getRecentTasks(maxNum, flags, userId).getList(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1726,7 +1729,7 @@ public class ActivityManager { ArrayList<AppTask> tasks = new ArrayList<AppTask>(); List<IBinder> appTasks; try { - appTasks = ActivityManagerNative.getDefault().getAppTasks(mContext.getPackageName()); + appTasks = getService().getAppTasks(mContext.getPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1751,7 +1754,7 @@ public class ActivityManager { private void ensureAppTaskThumbnailSizeLocked() { if (mAppTaskThumbnailSize == null) { try { - mAppTaskThumbnailSize = ActivityManagerNative.getDefault().getAppTaskThumbnailSize(); + mAppTaskThumbnailSize = getService().getAppTaskThumbnailSize(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1816,7 +1819,7 @@ public class ActivityManager { description = new TaskDescription(); } try { - return ActivityManagerNative.getDefault().addAppTask(activity.getActivityToken(), + return getService().addAppTask(activity.getActivityToken(), intent, description, thumbnail); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1859,7 +1862,7 @@ public class ActivityManager { public List<RunningTaskInfo> getRunningTasks(int maxNum) throws SecurityException { try { - return ActivityManagerNative.getDefault().getTasks(maxNum, 0); + return getService().getTasks(maxNum, 0); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1875,7 +1878,7 @@ public class ActivityManager { */ public boolean removeTask(int taskId) throws SecurityException { try { - return ActivityManagerNative.getDefault().removeTask(taskId); + return getService().removeTask(taskId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2043,7 +2046,7 @@ public class ActivityManager { /** @hide */ public TaskThumbnail getTaskThumbnail(int id) throws SecurityException { try { - return ActivityManagerNative.getDefault().getTaskThumbnail(id); + return getService().getTaskThumbnail(id); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2052,7 +2055,7 @@ public class ActivityManager { /** @hide */ public boolean isInHomeStack(int taskId) { try { - return ActivityManagerNative.getDefault().isInHomeStack(taskId); + return getService().isInHomeStack(taskId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2101,7 +2104,7 @@ public class ActivityManager { */ public void moveTaskToFront(int taskId, int flags, Bundle options) { try { - ActivityManagerNative.getDefault().moveTaskToFront(taskId, flags, options); + getService().moveTaskToFront(taskId, flags, options); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2286,7 +2289,7 @@ public class ActivityManager { public List<RunningServiceInfo> getRunningServices(int maxNum) throws SecurityException { try { - return ActivityManagerNative.getDefault() + return getService() .getServices(maxNum, 0); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2301,7 +2304,7 @@ public class ActivityManager { public PendingIntent getRunningServiceControlPanel(ComponentName service) throws SecurityException { try { - return ActivityManagerNative.getDefault() + return getService() .getRunningServiceControlPanel(service); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2406,7 +2409,7 @@ public class ActivityManager { */ public void getMemoryInfo(MemoryInfo outInfo) { try { - ActivityManagerNative.getDefault().getMemoryInfo(outInfo); + getService().getMemoryInfo(outInfo); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2545,7 +2548,7 @@ public class ActivityManager { */ public boolean clearApplicationUserData(String packageName, IPackageDataObserver observer) { try { - return ActivityManagerNative.getDefault().clearApplicationUserData(packageName, + return getService().clearApplicationUserData(packageName, observer, UserHandle.myUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2579,7 +2582,7 @@ public class ActivityManager { */ public ParceledListSlice<UriPermission> getGrantedUriPermissions(String packageName) { try { - return ActivityManagerNative.getDefault().getGrantedUriPermissions(packageName, + return getService().getGrantedUriPermissions(packageName, UserHandle.myUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2597,7 +2600,7 @@ public class ActivityManager { */ public void clearGrantedUriPermissions(String packageName) { try { - ActivityManagerNative.getDefault().clearGrantedUriPermissions(packageName, + getService().clearGrantedUriPermissions(packageName, UserHandle.myUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -2718,7 +2721,7 @@ public class ActivityManager { */ public List<ProcessErrorStateInfo> getProcessesInErrorState() { try { - return ActivityManagerNative.getDefault().getProcessesInErrorState(); + return getService().getProcessesInErrorState(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3055,7 +3058,7 @@ public class ActivityManager { */ public List<ApplicationInfo> getRunningExternalApplications() { try { - return ActivityManagerNative.getDefault().getRunningExternalApplications(); + return getService().getRunningExternalApplications(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3071,7 +3074,7 @@ public class ActivityManager { */ public boolean setProcessMemoryTrimLevel(String process, int userId, int level) { try { - return ActivityManagerNative.getDefault().setProcessMemoryTrimLevel(process, userId, + return getService().setProcessMemoryTrimLevel(process, userId, level); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3090,7 +3093,7 @@ public class ActivityManager { */ public List<RunningAppProcessInfo> getRunningAppProcesses() { try { - return ActivityManagerNative.getDefault().getRunningAppProcesses(); + return getService().getRunningAppProcesses(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3208,7 +3211,7 @@ public class ActivityManager { */ static public void getMyMemoryState(RunningAppProcessInfo outState) { try { - ActivityManagerNative.getDefault().getMyMemoryState(outState); + getService().getMyMemoryState(outState); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3227,7 +3230,7 @@ public class ActivityManager { */ public Debug.MemoryInfo[] getProcessMemoryInfo(int[] pids) { try { - return ActivityManagerNative.getDefault().getProcessMemoryInfo(pids); + return getService().getProcessMemoryInfo(pids); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3260,7 +3263,7 @@ public class ActivityManager { */ public void killBackgroundProcesses(String packageName) { try { - ActivityManagerNative.getDefault().killBackgroundProcesses(packageName, + getService().killBackgroundProcesses(packageName, UserHandle.myUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3278,7 +3281,7 @@ public class ActivityManager { @RequiresPermission(Manifest.permission.KILL_UID) public void killUid(int uid, String reason) { try { - ActivityManagerNative.getDefault().killUid(UserHandle.getAppId(uid), + getService().killUid(UserHandle.getAppId(uid), UserHandle.getUserId(uid), reason); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3306,7 +3309,7 @@ public class ActivityManager { */ public void forceStopPackageAsUser(String packageName, int userId) { try { - ActivityManagerNative.getDefault().forceStopPackage(packageName, userId); + getService().forceStopPackage(packageName, userId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3325,7 +3328,7 @@ public class ActivityManager { */ public ConfigurationInfo getDeviceConfigurationInfo() { try { - return ActivityManagerNative.getDefault().getDeviceConfigurationInfo(); + return getService().getDeviceConfigurationInfo(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3415,7 +3418,7 @@ public class ActivityManager { */ public static boolean isUserAMonkey() { try { - return ActivityManagerNative.getDefault().isUserAMonkey(); + return getService().isUserAMonkey(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3537,7 +3540,7 @@ public class ActivityManager { return userId; } try { - return ActivityManagerNative.getDefault().handleIncomingUser(callingPid, + return getService().handleIncomingUser(callingPid, callingUid, userId, allowAll, requireFull, name, callerPackage); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3552,7 +3555,7 @@ public class ActivityManager { public static int getCurrentUser() { UserInfo ui; try { - ui = ActivityManagerNative.getDefault().getCurrentUser(); + ui = getService().getCurrentUser(); return ui != null ? ui.id : 0; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3565,7 +3568,7 @@ public class ActivityManager { */ public boolean switchUser(int userid) { try { - return ActivityManagerNative.getDefault().switchUser(userid); + return getService().switchUser(userid); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3580,8 +3583,8 @@ public class ActivityManager { int currentUser = ActivityManager.getCurrentUser(); if (currentUser != UserHandle.USER_SYSTEM) { try { - ActivityManagerNative.getDefault().switchUser(UserHandle.USER_SYSTEM); - ActivityManagerNative.getDefault().stopUser(currentUser, /* force= */ false, null); + getService().switchUser(UserHandle.USER_SYSTEM); + getService().stopUser(currentUser, /* force= */ false, null); } catch (RemoteException e) { e.rethrowFromSystemServer(); } @@ -3608,7 +3611,7 @@ public class ActivityManager { */ public boolean isUserRunning(int userId) { try { - return ActivityManagerNative.getDefault().isUserRunning(userId, 0); + return getService().isUserRunning(userId, 0); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3617,7 +3620,7 @@ public class ActivityManager { /** {@hide} */ public boolean isVrModePackageEnabled(ComponentName component) { try { - return ActivityManagerNative.getDefault().isVrModePackageEnabled(component); + return getService().isVrModePackageEnabled(component); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3662,6 +3665,23 @@ public class ActivityManager { /** * @hide */ + public static boolean isSystemReady() { + if (!sSystemReady) { + if (ActivityThread.isSystem()) { + sSystemReady = + LocalServices.getService(ActivityManagerInternal.class).isSystemReady(); + } else { + // Since this is being called from outside system server, system should be + // ready by now. + sSystemReady = true; + } + } + return sSystemReady; + } + + /** + * @hide + */ public static void broadcastStickyIntent(Intent intent, int userId) { broadcastStickyIntent(intent, AppOpsManager.OP_NONE, userId); } @@ -3771,7 +3791,7 @@ public class ActivityManager { */ public void setWatchHeapLimit(long pssSize) { try { - ActivityManagerNative.getDefault().setDumpHeapDebugLimit(null, 0, pssSize, + getService().setDumpHeapDebugLimit(null, 0, pssSize, mContext.getPackageName()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3791,7 +3811,7 @@ public class ActivityManager { */ public void clearWatchHeapLimit() { try { - ActivityManagerNative.getDefault().setDumpHeapDebugLimit(null, 0, 0, null); + getService().setDumpHeapDebugLimit(null, 0, 0, null); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3802,7 +3822,7 @@ public class ActivityManager { */ public void startLockTaskMode(int taskId) { try { - ActivityManagerNative.getDefault().startLockTaskModeById(taskId); + getService().startLockTaskModeById(taskId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3813,7 +3833,7 @@ public class ActivityManager { */ public void stopLockTaskMode() { try { - ActivityManagerNative.getDefault().stopLockTaskMode(); + getService().stopLockTaskMode(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3841,7 +3861,7 @@ public class ActivityManager { */ public int getLockTaskModeState() { try { - return ActivityManagerNative.getDefault().getLockTaskModeState(); + return getService().getLockTaskModeState(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3859,7 +3879,7 @@ public class ActivityManager { */ public static void setVrThread(int tid) { try { - ActivityManagerNative.getDefault().setVrThread(tid); + getService().setVrThread(tid); } catch (RemoteException e) { // pass } diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index cabdd4b6ac00..c09403c29943 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -16,11 +16,7 @@ package android.app; import android.content.Intent; -import android.os.Debug; import android.os.IBinder; -import android.util.Log; - -import com.android.server.LocalServices; /** * {@hide} @@ -28,8 +24,6 @@ import com.android.server.LocalServices; */ @Deprecated public abstract class ActivityManagerNative { - private final static String TAG = "ActivityManagerNative"; - /** * Cast a Binder object into an activity manager interface, generating * a proxy if needed. @@ -55,21 +49,9 @@ public abstract class ActivityManagerNative { * @deprecated use ActivityManagerInternal.isSystemReady instead. */ static public boolean isSystemReady() { - if (!sSystemReady) { - if (ActivityThread.isSystem()) { - sSystemReady = - LocalServices.getService(ActivityManagerInternal.class).isSystemReady(); - } else { - // Since this is being called from outside system server, system should be - // ready by now. - sSystemReady = true; - } - } - return sSystemReady; + return ActivityManager.isSystemReady(); } - static volatile boolean sSystemReady = false; - /** * @deprecated use ActivityManager.broadcastStickyIntent instead. */ diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 8dd4c9c3a8d2..79ace08e1ef2 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -1800,7 +1800,7 @@ public final class ActivityThread { } if (a != null) { mNewActivities = null; - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); ActivityClientRecord prev; do { if (localLOGV) Slog.v( @@ -2712,7 +2712,7 @@ public final class ActivityThread { private Context createBaseContextForActivity(ActivityClientRecord r, final Activity activity) { int displayId = Display.DEFAULT_DISPLAY; try { - displayId = ActivityManagerNative.getDefault().getActivityDisplayId(r.token); + displayId = ActivityManager.getService().getActivityDisplayId(r.token); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2792,7 +2792,7 @@ public final class ActivityThread { } else { // If there was an error, for any reason, tell the activity manager to stop us. try { - ActivityManagerNative.getDefault() + ActivityManager.getService() .finishActivity(r.token, Activity.RESULT_CANCELED, null, Activity.DONT_FINISH_TASK_WITH_ACTIVITY); } catch (RemoteException ex) { @@ -2822,7 +2822,7 @@ public final class ActivityThread { } } try { - ActivityManagerNative.getDefault().reportSizeConfigurations(r.token, + ActivityManager.getService().reportSizeConfigurations(r.token, horizontal.copyKeys(), vertical.copyKeys(), smallest.copyKeys()); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); @@ -2931,7 +2931,7 @@ public final class ActivityThread { structure = new AssistStructure(); } mLastAssistStructures.add(new WeakReference<>(structure)); - IActivityManager mgr = ActivityManagerNative.getDefault(); + IActivityManager mgr = ActivityManager.getService(); try { mgr.reportAssistContextExtras(cmd.requestToken, data, structure, content, referrer); } catch (RemoteException e) { @@ -2970,7 +2970,7 @@ public final class ActivityThread { } } try { - ActivityManagerNative.getDefault().backgroundResourcesReleased(token); + ActivityManager.getService().backgroundResourcesReleased(token); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3069,7 +3069,7 @@ public final class ActivityThread { LoadedApk packageInfo = getPackageInfoNoCheck( data.info.applicationInfo, data.compatInfo); - IActivityManager mgr = ActivityManagerNative.getDefault(); + IActivityManager mgr = ActivityManager.getService(); BroadcastReceiver receiver; try { @@ -3195,7 +3195,7 @@ public final class ActivityThread { // tell the OS that we're live now try { - ActivityManagerNative.getDefault().backupAgentCreated(packageName, binder); + ActivityManager.getService().backupAgentCreated(packageName, binder); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3252,11 +3252,11 @@ public final class ActivityThread { Application app = packageInfo.makeApplication(false, mInstrumentation); service.attach(context, this, data.info.name, data.token, app, - ActivityManagerNative.getDefault()); + ActivityManager.getService()); service.onCreate(); mServices.put(data.token, service); try { - ActivityManagerNative.getDefault().serviceDoneExecuting( + ActivityManager.getService().serviceDoneExecuting( data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3281,11 +3281,11 @@ public final class ActivityThread { try { if (!data.rebind) { IBinder binder = s.onBind(data.intent); - ActivityManagerNative.getDefault().publishService( + ActivityManager.getService().publishService( data.token, data.intent, binder); } else { s.onRebind(data.intent); - ActivityManagerNative.getDefault().serviceDoneExecuting( + ActivityManager.getService().serviceDoneExecuting( data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0); } ensureJitEnabled(); @@ -3311,10 +3311,10 @@ public final class ActivityThread { boolean doRebind = s.onUnbind(data.intent); try { if (doRebind) { - ActivityManagerNative.getDefault().unbindFinished( + ActivityManager.getService().unbindFinished( data.token, data.intent, doRebind); } else { - ActivityManagerNative.getDefault().serviceDoneExecuting( + ActivityManager.getService().serviceDoneExecuting( data.token, SERVICE_DONE_EXECUTING_ANON, 0, 0); } } catch (RemoteException ex) { @@ -3397,7 +3397,7 @@ public final class ActivityThread { QueuedWork.waitToFinish(); try { - ActivityManagerNative.getDefault().serviceDoneExecuting( + ActivityManager.getService().serviceDoneExecuting( data.token, SERVICE_DONE_EXECUTING_START, data.startId, res); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3428,7 +3428,7 @@ public final class ActivityThread { QueuedWork.waitToFinish(); try { - ActivityManagerNative.getDefault().serviceDoneExecuting( + ActivityManager.getService().serviceDoneExecuting( token, SERVICE_DONE_EXECUTING_STOP, 0, 0); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3550,7 +3550,7 @@ public final class ActivityThread { boolean willBeVisible = !a.mStartedActivity; if (!willBeVisible) { try { - willBeVisible = ActivityManagerNative.getDefault().willActivityBeVisible( + willBeVisible = ActivityManager.getService().willActivityBeVisible( a.getActivityToken()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -3638,7 +3638,7 @@ public final class ActivityThread { // Tell the activity manager we have resumed. if (reallyResume) { try { - ActivityManagerNative.getDefault().activityResumed(token); + ActivityManager.getService().activityResumed(token); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } @@ -3648,7 +3648,7 @@ public final class ActivityThread { // If an exception was thrown when trying to resume, then // just end this activity. try { - ActivityManagerNative.getDefault() + ActivityManager.getService() .finishActivity(token, Activity.RESULT_CANCELED, null, Activity.DONT_FINISH_TASK_WITH_ACTIVITY); } catch (RemoteException ex) { @@ -3737,7 +3737,7 @@ public final class ActivityThread { // Tell the activity manager we have paused. if (!dontReport) { try { - ActivityManagerNative.getDefault().activityPaused(token); + ActivityManager.getService().activityPaused(token); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } @@ -3835,7 +3835,7 @@ public final class ActivityThread { // Tell activity manager we have been stopped. try { if (DEBUG_MEMORY_TRIM) Slog.v(TAG, "Reporting activity stopped: " + activity); - ActivityManagerNative.getDefault().activityStopped( + ActivityManager.getService().activityStopped( activity.token, state, persistentState, description); } catch (RemoteException ex) { if (ex instanceof TransactionTooLargeException @@ -4090,7 +4090,7 @@ public final class ActivityThread { // Tell activity manager we slept. try { - ActivityManagerNative.getDefault().activitySlept(r.token); + ActivityManager.getService().activitySlept(r.token); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } @@ -4344,7 +4344,7 @@ public final class ActivityThread { } if (finishing) { try { - ActivityManagerNative.getDefault().activityDestroyed(token); + ActivityManager.getService().activityDestroyed(token); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } @@ -4386,7 +4386,7 @@ public final class ActivityThread { // For each relaunch request, activity manager expects an answer if (!r.onlyLocalRequest && fromServer) { try { - ActivityManagerNative.getDefault().activityRelaunched(token); + ActivityManager.getService().activityRelaunched(token); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4512,7 +4512,7 @@ public final class ActivityThread { if (r == null) { if (!tmp.onlyLocalRequest) { try { - ActivityManagerNative.getDefault().activityRelaunched(tmp.token); + ActivityManager.getService().activityRelaunched(tmp.token); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -4585,7 +4585,7 @@ public final class ActivityThread { if (!tmp.onlyLocalRequest) { try { - ActivityManagerNative.getDefault().activityRelaunched(r.token); + ActivityManager.getService().activityRelaunched(r.token); if (r.window != null) { r.window.reportActivityRelaunched(); } @@ -4950,7 +4950,7 @@ public final class ActivityThread { Debug.dumpNativeHeap(dhd.fd.getFileDescriptor()); } try { - ActivityManagerNative.getDefault().dumpHeapFinished(dhd.path); + ActivityManager.getService().dumpHeapFinished(dhd.path); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5294,7 +5294,7 @@ public final class ActivityThread { Slog.w(TAG, "Application " + data.info.getPackageName() + " is waiting for the debugger on port 8100..."); - IActivityManager mgr = ActivityManagerNative.getDefault(); + IActivityManager mgr = ActivityManager.getService(); try { mgr.showWaitingForDebugger(mAppThread, true); } catch (RemoteException ex) { @@ -5488,12 +5488,12 @@ public final class ActivityThread { } /*package*/ final void finishInstrumentation(int resultCode, Bundle results) { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); if (mProfiler.profileFile != null && mProfiler.handlingProfiling && mProfiler.profileFd == null) { Debug.stopMethodTracing(); } - //Slog.i(TAG, "am: " + ActivityManagerNative.getDefault() + //Slog.i(TAG, "am: " + ActivityManager.getService() // + ", app thr: " + mAppThread); try { am.finishInstrumentation(mAppThread, resultCode, results); @@ -5524,7 +5524,7 @@ public final class ActivityThread { } try { - ActivityManagerNative.getDefault().publishContentProviders( + ActivityManager.getService().publishContentProviders( getApplicationThread(), results); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); @@ -5546,7 +5546,7 @@ public final class ActivityThread { // be re-entrant in the case where the provider is in the same process. ContentProviderHolder holder = null; try { - holder = ActivityManagerNative.getDefault().getContentProvider( + holder = ActivityManager.getService().getContentProvider( getApplicationThread(), auth, userId, stable); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); @@ -5592,7 +5592,7 @@ public final class ActivityThread { + prc.holder.info.name + ": unstableDelta=" + unstableDelta); } - ActivityManagerNative.getDefault().refContentProvider( + ActivityManager.getService().refContentProvider( prc.holder.connection, 1, unstableDelta); } catch (RemoteException e) { //do nothing content provider object is dead any way @@ -5621,7 +5621,7 @@ public final class ActivityThread { Slog.v(TAG, "incProviderRef: Now unstable - " + prc.holder.info.name); } - ActivityManagerNative.getDefault().refContentProvider( + ActivityManager.getService().refContentProvider( prc.holder.connection, 0, 1); } catch (RemoteException e) { //do nothing content provider object is dead any way @@ -5695,7 +5695,7 @@ public final class ActivityThread { Slog.v(TAG, "releaseProvider: No longer stable w/lastRef=" + lastRef + " - " + prc.holder.info.name); } - ActivityManagerNative.getDefault().refContentProvider( + ActivityManager.getService().refContentProvider( prc.holder.connection, -1, lastRef ? 1 : 0); } catch (RemoteException e) { //do nothing content provider object is dead any way @@ -5719,7 +5719,7 @@ public final class ActivityThread { Slog.v(TAG, "releaseProvider: No longer unstable - " + prc.holder.info.name); } - ActivityManagerNative.getDefault().refContentProvider( + ActivityManager.getService().refContentProvider( prc.holder.connection, 0, -1); } catch (RemoteException e) { //do nothing content provider object is dead any way @@ -5783,10 +5783,10 @@ public final class ActivityThread { try { if (DEBUG_PROVIDER) { - Slog.v(TAG, "removeProvider: Invoking ActivityManagerNative." + Slog.v(TAG, "removeProvider: Invoking ActivityManagerService." + "removeContentProvider(" + prc.holder.info.name + ")"); } - ActivityManagerNative.getDefault().removeContentProvider( + ActivityManager.getService().removeContentProvider( prc.holder.connection, false); } catch (RemoteException e) { //do nothing content provider object is dead any way @@ -5820,7 +5820,7 @@ public final class ActivityThread { // it knows it is dead (so we don't race with its death // notification). try { - ActivityManagerNative.getDefault().unstableProviderDied( + ActivityManager.getService().unstableProviderDied( prc.holder.connection); } catch (RemoteException e) { //do nothing content provider object is dead any way @@ -5834,7 +5834,7 @@ public final class ActivityThread { ProviderRefCount prc = mProviderRefCountMap.get(provider); if (prc != null) { try { - ActivityManagerNative.getDefault() + ActivityManager.getService() .appNotRespondingViaProvider(prc.holder.connection); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -5992,7 +5992,7 @@ public final class ActivityThread { if (!noReleaseNeeded) { incProviderRefLocked(prc, stable); try { - ActivityManagerNative.getDefault().removeContentProvider( + ActivityManager.getService().removeContentProvider( holder.connection, stable); } catch (RemoteException e) { //do nothing content provider object is dead any way @@ -6029,7 +6029,7 @@ public final class ActivityThread { android.ddm.DdmHandleAppName.setAppName("<pre-initialized>", UserHandle.myUserId()); RuntimeInit.setApplicationObject(mAppThread.asBinder()); - final IActivityManager mgr = ActivityManagerNative.getDefault(); + final IActivityManager mgr = ActivityManager.getService(); try { mgr.attachApplication(mAppThread); } catch (RemoteException ex) { diff --git a/core/java/android/app/ActivityView.java b/core/java/android/app/ActivityView.java index cada1b854a8e..29b83dc3b315 100644 --- a/core/java/android/app/ActivityView.java +++ b/core/java/android/app/ActivityView.java @@ -152,7 +152,7 @@ public class ActivityView extends ViewGroup { try { mActivityContainer = new ActivityContainerWrapper( - ActivityManagerNative.getDefault().createVirtualActivityContainer( + ActivityManager.getService().createVirtualActivityContainer( mActivity.getActivityToken(), new ActivityContainerCallback(this))); } catch (RemoteException e) { throw new RuntimeException("ActivityView: Unable to create ActivityContainer. " diff --git a/core/java/android/app/AppImportanceMonitor.java b/core/java/android/app/AppImportanceMonitor.java index e0d0d8d77778..b5cbeeb0d729 100644 --- a/core/java/android/app/AppImportanceMonitor.java +++ b/core/java/android/app/AppImportanceMonitor.java @@ -86,7 +86,7 @@ public class AppImportanceMonitor { }; ActivityManager am = (ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE); try { - ActivityManagerNative.getDefault().registerProcessObserver(mProcessObserver); + ActivityManager.getService().registerProcessObserver(mProcessObserver); } catch (RemoteException e) { } List<ActivityManager.RunningAppProcessInfo> apps = am.getRunningAppProcesses(); diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index c5180fd39c7d..970e9ac226c0 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -798,7 +798,7 @@ class ContextImpl extends Context { @Override public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) { try { - ActivityManagerNative.getDefault().startActivityAsUser( + ActivityManager.getService().startActivityAsUser( mMainThread.getApplicationThread(), getBasePackageName(), intent, intent.resolveTypeIfNeeded(getContentResolver()), null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, options, @@ -860,7 +860,7 @@ class ContextImpl extends Context { fillInIntent.prepareToLeaveProcess(this); resolvedType = fillInIntent.resolveTypeIfNeeded(getContentResolver()); } - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivityIntentSender(mMainThread.getApplicationThread(), intent, fillInIntent, resolvedType, null, null, 0, flagsMask, flagsValues, options); @@ -879,7 +879,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, false, getUserId()); @@ -896,7 +896,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE, null, false, false, getUserId()); @@ -911,7 +911,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE, null, false, false, getUserId()); @@ -928,7 +928,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE, options, false, false, getUserId()); @@ -945,7 +945,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false, getUserId()); @@ -962,7 +962,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE, null, true, false, getUserId()); @@ -1025,7 +1025,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, rd, initialCode, initialData, initialExtras, receiverPermissions, appOp, options, true, false, getUserId()); @@ -1039,7 +1039,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent(mMainThread.getApplicationThread(), + ActivityManager.getService().broadcastIntent(mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, false, user.getIdentifier()); } catch (RemoteException e) { @@ -1061,7 +1061,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, AppOpsManager.OP_NONE, options, false, false, user.getIdentifier()); @@ -1078,7 +1078,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, receiverPermissions, appOp, null, false, false, user.getIdentifier()); @@ -1129,7 +1129,7 @@ class ContextImpl extends Context { : new String[] {receiverPermission}; try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, rd, initialCode, initialData, initialExtras, receiverPermissions, appOp, options, true, false, user.getIdentifier()); @@ -1145,7 +1145,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, true, getUserId()); @@ -1181,7 +1181,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, rd, initialCode, initialData, initialExtras, null, AppOpsManager.OP_NONE, null, true, true, getUserId()); @@ -1200,7 +1200,7 @@ class ContextImpl extends Context { } try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().unbroadcastIntent( + ActivityManager.getService().unbroadcastIntent( mMainThread.getApplicationThread(), intent, getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1213,7 +1213,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, null, false, true, user.getIdentifier()); @@ -1228,7 +1228,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, null, Activity.RESULT_OK, null, null, null, AppOpsManager.OP_NONE, options, false, true, user.getIdentifier()); @@ -1263,7 +1263,7 @@ class ContextImpl extends Context { String resolvedType = intent.resolveTypeIfNeeded(getContentResolver()); try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().broadcastIntent( + ActivityManager.getService().broadcastIntent( mMainThread.getApplicationThread(), intent, resolvedType, rd, initialCode, initialData, initialExtras, null, AppOpsManager.OP_NONE, null, true, true, user.getIdentifier()); @@ -1282,7 +1282,7 @@ class ContextImpl extends Context { } try { intent.prepareToLeaveProcess(this); - ActivityManagerNative.getDefault().unbroadcastIntent( + ActivityManager.getService().unbroadcastIntent( mMainThread.getApplicationThread(), intent, user.getIdentifier()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1329,7 +1329,7 @@ class ContextImpl extends Context { } } try { - final Intent intent = ActivityManagerNative.getDefault().registerReceiver( + final Intent intent = ActivityManager.getService().registerReceiver( mMainThread.getApplicationThread(), mBasePackageName, rd, filter, broadcastPermission, userId); if (intent != null) { @@ -1348,7 +1348,7 @@ class ContextImpl extends Context { IIntentReceiver rd = mPackageInfo.forgetReceiverDispatcher( getOuterContext(), receiver); try { - ActivityManagerNative.getDefault().unregisterReceiver(rd); + ActivityManager.getService().unregisterReceiver(rd); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1391,7 +1391,7 @@ class ContextImpl extends Context { try { validateServiceIntent(service); service.prepareToLeaveProcess(this); - ComponentName cn = ActivityManagerNative.getDefault().startService( + ComponentName cn = ActivityManager.getService().startService( mMainThread.getApplicationThread(), service, service.resolveTypeIfNeeded( getContentResolver()), getOpPackageName(), user.getIdentifier()); if (cn != null) { @@ -1420,7 +1420,7 @@ class ContextImpl extends Context { try { validateServiceIntent(service); service.prepareToLeaveProcess(this); - int res = ActivityManagerNative.getDefault().stopService( + int res = ActivityManager.getService().stopService( mMainThread.getApplicationThread(), service, service.resolveTypeIfNeeded(getContentResolver()), user.getIdentifier()); if (res < 0) { @@ -1492,7 +1492,7 @@ class ContextImpl extends Context { flags |= BIND_WAIVE_PRIORITY; } service.prepareToLeaveProcess(this); - int res = ActivityManagerNative.getDefault().bindService( + int res = ActivityManager.getService().bindService( mMainThread.getApplicationThread(), getActivityToken(), service, service.resolveTypeIfNeeded(getContentResolver()), sd, flags, getOpPackageName(), user.getIdentifier()); @@ -1515,7 +1515,7 @@ class ContextImpl extends Context { IServiceConnection sd = mPackageInfo.forgetServiceDispatcher( getOuterContext(), conn); try { - ActivityManagerNative.getDefault().unbindService(sd); + ActivityManager.getService().unbindService(sd); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -1531,7 +1531,7 @@ class ContextImpl extends Context { if (arguments != null) { arguments.setAllowFds(false); } - return ActivityManagerNative.getDefault().startInstrumentation( + return ActivityManager.getService().startInstrumentation( className, profileFile, 0, arguments, null, null, getUserId(), null /* ABI override */); } catch (RemoteException e) { @@ -1556,7 +1556,7 @@ class ContextImpl extends Context { } try { - return ActivityManagerNative.getDefault().checkPermission( + return ActivityManager.getService().checkPermission( permission, pid, uid); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1571,7 +1571,7 @@ class ContextImpl extends Context { } try { - return ActivityManagerNative.getDefault().checkPermissionWithToken( + return ActivityManager.getService().checkPermissionWithToken( permission, pid, uid, callerToken); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1656,7 +1656,7 @@ class ContextImpl extends Context { @Override public void grantUriPermission(String toPackage, Uri uri, int modeFlags) { try { - ActivityManagerNative.getDefault().grantUriPermission( + ActivityManager.getService().grantUriPermission( mMainThread.getApplicationThread(), toPackage, ContentProvider.getUriWithoutUserId(uri), modeFlags, resolveUserId(uri)); } catch (RemoteException e) { @@ -1667,7 +1667,7 @@ class ContextImpl extends Context { @Override public void revokeUriPermission(Uri uri, int modeFlags) { try { - ActivityManagerNative.getDefault().revokeUriPermission( + ActivityManager.getService().revokeUriPermission( mMainThread.getApplicationThread(), ContentProvider.getUriWithoutUserId(uri), modeFlags, resolveUserId(uri)); } catch (RemoteException e) { @@ -1678,7 +1678,7 @@ class ContextImpl extends Context { @Override public int checkUriPermission(Uri uri, int pid, int uid, int modeFlags) { try { - return ActivityManagerNative.getDefault().checkUriPermission( + return ActivityManager.getService().checkUriPermission( ContentProvider.getUriWithoutUserId(uri), pid, uid, modeFlags, resolveUserId(uri), null); } catch (RemoteException e) { @@ -1690,7 +1690,7 @@ class ContextImpl extends Context { @Override public int checkUriPermission(Uri uri, int pid, int uid, int modeFlags, IBinder callerToken) { try { - return ActivityManagerNative.getDefault().checkUriPermission( + return ActivityManager.getService().checkUriPermission( ContentProvider.getUriWithoutUserId(uri), pid, uid, modeFlags, resolveUserId(uri), callerToken); } catch (RemoteException e) { diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java index f934a9f5d826..cc7981c24027 100644 --- a/core/java/android/app/Instrumentation.java +++ b/core/java/android/app/Instrumentation.java @@ -1505,7 +1505,7 @@ public class Instrumentation { try { intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(who); - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivity(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mEmbeddedID : null, @@ -1565,7 +1565,7 @@ public class Instrumentation { intents[i].prepareToLeaveProcess(who); resolvedTypes[i] = intents[i].resolveTypeIfNeeded(who.getContentResolver()); } - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivities(whoThread, who.getBasePackageName(), intents, resolvedTypes, token, options, userId); checkStartActivityResult(result, intents[0]); @@ -1624,7 +1624,7 @@ public class Instrumentation { try { intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(who); - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivity(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target, requestCode, 0, null, options); @@ -1684,7 +1684,7 @@ public class Instrumentation { try { intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(who); - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivityAsUser(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mEmbeddedID : null, @@ -1723,7 +1723,7 @@ public class Instrumentation { try { intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(who); - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivityAsCaller(whoThread, who.getBasePackageName(), intent, intent.resolveTypeIfNeeded(who.getContentResolver()), token, target != null ? target.mEmbeddedID : null, diff --git a/core/java/android/app/LoadedApk.java b/core/java/android/app/LoadedApk.java index 7754244cae8e..a38377e67709 100644 --- a/core/java/android/app/LoadedApk.java +++ b/core/java/android/app/LoadedApk.java @@ -452,7 +452,7 @@ public final class LoadedApk { if (mRegisterPackage) { try { - ActivityManagerNative.getDefault().addPackageDependency(mPackageName); + ActivityManager.getService().addPackageDependency(mPackageName); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -891,7 +891,7 @@ public final class LoadedApk { StrictMode.onIntentReceiverLeaked(leak); } try { - ActivityManagerNative.getDefault().unregisterReceiver( + ActivityManager.getService().unregisterReceiver( rd.getIIntentReceiver()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -917,7 +917,7 @@ public final class LoadedApk { StrictMode.onServiceConnectionLeaked(leak); } try { - ActivityManagerNative.getDefault().unbindService( + ActivityManager.getService().unbindService( sd.getIServiceConnection()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); @@ -1046,7 +1046,7 @@ public final class LoadedApk { // behalf so that the system's broadcast sequence can continue. if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG, "Finishing broadcast to unregistered receiver"); - IActivityManager mgr = ActivityManagerNative.getDefault(); + IActivityManager mgr = ActivityManager.getService(); try { if (extras != null) { extras.setAllowFds(false); @@ -1095,7 +1095,7 @@ public final class LoadedApk { + " mOrderedHint=" + ordered); } - final IActivityManager mgr = ActivityManagerNative.getDefault(); + final IActivityManager mgr = ActivityManager.getService(); final Intent intent = mCurIntent; if (intent == null) { Log.wtf(TAG, "Null intent being dispatched, mDispatched=" + mDispatched); @@ -1209,7 +1209,7 @@ public final class LoadedApk { } if (intent == null || !mActivityThread.post(args)) { if (mRegistered && ordered) { - IActivityManager mgr = ActivityManagerNative.getDefault(); + IActivityManager mgr = ActivityManager.getService(); if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG, "Finishing sync broadcast to " + mReceiver); args.sendFinished(mgr); diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index cfa242be02aa..02d5705f90fc 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -339,7 +339,7 @@ public final class PendingIntent implements Parcelable { intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(context); IIntentSender target = - ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.getService().getIntentSender( ActivityManager.INTENT_SENDER_ACTIVITY, packageName, null, null, requestCode, new Intent[] { intent }, resolvedType != null ? new String[] { resolvedType } : null, @@ -364,7 +364,7 @@ public final class PendingIntent implements Parcelable { intent.migrateExtraStreamToClipData(); intent.prepareToLeaveProcess(context); IIntentSender target = - ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.getService().getIntentSender( ActivityManager.INTENT_SENDER_ACTIVITY, packageName, null, null, requestCode, new Intent[] { intent }, resolvedType != null ? new String[] { resolvedType } : null, @@ -481,7 +481,7 @@ public final class PendingIntent implements Parcelable { } try { IIntentSender target = - ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.getService().getIntentSender( ActivityManager.INTENT_SENDER_ACTIVITY, packageName, null, null, requestCode, intents, resolvedTypes, flags, options, UserHandle.myUserId()); @@ -507,7 +507,7 @@ public final class PendingIntent implements Parcelable { } try { IIntentSender target = - ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.getService().getIntentSender( ActivityManager.INTENT_SENDER_ACTIVITY, packageName, null, null, requestCode, intents, resolvedTypes, flags, options, user.getIdentifier()); @@ -559,7 +559,7 @@ public final class PendingIntent implements Parcelable { try { intent.prepareToLeaveProcess(context); IIntentSender target = - ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.getService().getIntentSender( ActivityManager.INTENT_SENDER_BROADCAST, packageName, null, null, requestCode, new Intent[] { intent }, resolvedType != null ? new String[] { resolvedType } : null, @@ -602,7 +602,7 @@ public final class PendingIntent implements Parcelable { try { intent.prepareToLeaveProcess(context); IIntentSender target = - ActivityManagerNative.getDefault().getIntentSender( + ActivityManager.getService().getIntentSender( ActivityManager.INTENT_SENDER_SERVICE, packageName, null, null, requestCode, new Intent[] { intent }, resolvedType != null ? new String[] { resolvedType } : null, @@ -629,7 +629,7 @@ public final class PendingIntent implements Parcelable { */ public void cancel() { try { - ActivityManagerNative.getDefault().cancelIntentSender(mTarget); + ActivityManager.getService().cancelIntentSender(mTarget); } catch (RemoteException e) { } } @@ -833,7 +833,7 @@ public final class PendingIntent implements Parcelable { String resolvedType = intent != null ? intent.resolveTypeIfNeeded(context.getContentResolver()) : null; - int res = ActivityManagerNative.getDefault().sendIntentSender( + int res = ActivityManager.getService().sendIntentSender( mTarget, code, intent, resolvedType, onFinished != null ? new FinishedDispatcher(this, onFinished, handler) @@ -853,7 +853,7 @@ public final class PendingIntent implements Parcelable { @Deprecated public String getTargetPackage() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getPackageForIntentSender(mTarget); } catch (RemoteException e) { // Should never happen. @@ -882,7 +882,7 @@ public final class PendingIntent implements Parcelable { @Nullable public String getCreatorPackage() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getPackageForIntentSender(mTarget); } catch (RemoteException e) { // Should never happen. @@ -910,7 +910,7 @@ public final class PendingIntent implements Parcelable { */ public int getCreatorUid() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getUidForIntentSender(mTarget); } catch (RemoteException e) { // Should never happen. @@ -941,7 +941,7 @@ public final class PendingIntent implements Parcelable { @Nullable public UserHandle getCreatorUserHandle() { try { - int uid = ActivityManagerNative.getDefault() + int uid = ActivityManager.getService() .getUidForIntentSender(mTarget); return uid > 0 ? new UserHandle(UserHandle.getUserId(uid)) : null; } catch (RemoteException e) { @@ -956,7 +956,7 @@ public final class PendingIntent implements Parcelable { */ public boolean isTargetedToPackage() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .isIntentSenderTargetedToPackage(mTarget); } catch (RemoteException e) { // Should never happen. @@ -970,7 +970,7 @@ public final class PendingIntent implements Parcelable { */ public boolean isActivity() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .isIntentSenderAnActivity(mTarget); } catch (RemoteException e) { // Should never happen. @@ -984,7 +984,7 @@ public final class PendingIntent implements Parcelable { */ public Intent getIntent() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getIntentForIntentSender(mTarget); } catch (RemoteException e) { // Should never happen. @@ -998,7 +998,7 @@ public final class PendingIntent implements Parcelable { */ public String getTag(String prefix) { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getTagForIntentSender(mTarget, prefix); } catch (RemoteException e) { // Should never happen. diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index ee6a3acb6eee..c529e4ba1678 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -946,7 +946,7 @@ public class SearchManager try { Intent intent = new Intent(Intent.ACTION_ASSIST); if (inclContext) { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); Bundle extras = am.getAssistContextExtras(ActivityManager.ASSIST_CONTEXT_BASIC); if (extras != null) { intent.replaceExtras(extras); diff --git a/core/java/android/app/UiAutomation.java b/core/java/android/app/UiAutomation.java index b859418867c5..54cc4a096772 100644 --- a/core/java/android/app/UiAutomation.java +++ b/core/java/android/app/UiAutomation.java @@ -768,7 +768,7 @@ public final class UiAutomation { throwIfNotConnectedLocked(); } try { - ActivityManagerNative.getDefault().setUserIsMonkey(enable); + ActivityManager.getService().setUserIsMonkey(enable); } catch (RemoteException re) { Log.e(LOG_TAG, "Error while setting run as monkey!", re); } diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java index 10e6fb233249..231dacefa5a1 100644 --- a/core/java/android/content/BroadcastReceiver.java +++ b/core/java/android/content/BroadcastReceiver.java @@ -16,7 +16,7 @@ package android.content; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ActivityThread; import android.app.IActivityManager; import android.app.QueuedWork; @@ -366,7 +366,7 @@ public abstract class BroadcastReceiver { */ public final void finish() { if (mType == TYPE_COMPONENT) { - final IActivityManager mgr = ActivityManagerNative.getDefault(); + final IActivityManager mgr = ActivityManager.getService(); if (QueuedWork.hasPendingWork()) { // If this is a broadcast component, we need to make sure any // queued work is complete before telling AM we are done, so @@ -393,7 +393,7 @@ public abstract class BroadcastReceiver { } else if (mOrderedHint && mType != TYPE_UNREGISTERED) { if (ActivityThread.DEBUG_BROADCAST) Slog.i(ActivityThread.TAG, "Finishing broadcast to " + mToken); - final IActivityManager mgr = ActivityManagerNative.getDefault(); + final IActivityManager mgr = ActivityManager.getService(); sendFinished(mgr); } } @@ -519,7 +519,7 @@ public abstract class BroadcastReceiver { * Context#startService(Intent)} for more information. */ public IBinder peekService(Context myContext, Intent service) { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); IBinder binder = null; try { service.prepareToLeaveProcess(myContext); diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 705c091a6423..d7f683336f8b 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -23,7 +23,7 @@ import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.TestApi; import android.annotation.UserIdInt; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ActivityThread; import android.app.AppGlobals; import android.content.pm.PackageManager.NameNotFoundException; @@ -397,7 +397,7 @@ public abstract class ContentResolver { } try { - String type = ActivityManagerNative.getDefault().getProviderMimeType( + String type = ActivityManager.getService().getProviderMimeType( ContentProvider.getUriWithoutUserId(url), resolveUserId(url)); return type; } catch (RemoteException e) { @@ -1849,7 +1849,7 @@ public abstract class ContentResolver { @Intent.AccessUriMode int modeFlags) { Preconditions.checkNotNull(uri, "uri"); try { - ActivityManagerNative.getDefault().takePersistableUriPermission( + ActivityManager.getService().takePersistableUriPermission( ContentProvider.getUriWithoutUserId(uri), modeFlags, resolveUserId(uri)); } catch (RemoteException e) { } @@ -1867,7 +1867,7 @@ public abstract class ContentResolver { @Intent.AccessUriMode int modeFlags) { Preconditions.checkNotNull(uri, "uri"); try { - ActivityManagerNative.getDefault().releasePersistableUriPermission( + ActivityManager.getService().releasePersistableUriPermission( ContentProvider.getUriWithoutUserId(uri), modeFlags, resolveUserId(uri)); } catch (RemoteException e) { } @@ -1885,7 +1885,7 @@ public abstract class ContentResolver { */ public @NonNull List<UriPermission> getPersistedUriPermissions() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getPersistedUriPermissions(mPackageName, true).getList(); } catch (RemoteException e) { throw new RuntimeException("Activity manager has died", e); @@ -1901,7 +1901,7 @@ public abstract class ContentResolver { */ public @NonNull List<UriPermission> getOutgoingPersistedUriPermissions() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getPersistedUriPermissions(mPackageName, false).getList(); } catch (RemoteException e) { throw new RuntimeException("Activity manager has died", e); diff --git a/core/java/android/content/IntentSender.java b/core/java/android/content/IntentSender.java index 32ca6c2d4bac..4adb5b7ab557 100644 --- a/core/java/android/content/IntentSender.java +++ b/core/java/android/content/IntentSender.java @@ -16,7 +16,7 @@ package android.content; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.os.Bundle; import android.os.RemoteException; import android.os.Handler; @@ -187,7 +187,7 @@ public class IntentSender implements Parcelable { String resolvedType = intent != null ? intent.resolveTypeIfNeeded(context.getContentResolver()) : null; - int res = ActivityManagerNative.getDefault().sendIntentSender(mTarget, + int res = ActivityManager.getService().sendIntentSender(mTarget, code, intent, resolvedType, onFinished != null ? new FinishedDispatcher(this, onFinished, handler) @@ -207,7 +207,7 @@ public class IntentSender implements Parcelable { @Deprecated public String getTargetPackage() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getPackageForIntentSender(mTarget); } catch (RemoteException e) { // Should never happen. @@ -226,7 +226,7 @@ public class IntentSender implements Parcelable { */ public String getCreatorPackage() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getPackageForIntentSender(mTarget); } catch (RemoteException e) { // Should never happen. @@ -245,7 +245,7 @@ public class IntentSender implements Parcelable { */ public int getCreatorUid() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getUidForIntentSender(mTarget); } catch (RemoteException e) { // Should never happen. @@ -266,7 +266,7 @@ public class IntentSender implements Parcelable { */ public UserHandle getCreatorUserHandle() { try { - int uid = ActivityManagerNative.getDefault() + int uid = ActivityManager.getService() .getUidForIntentSender(mTarget); return uid > 0 ? new UserHandle(UserHandle.getUserId(uid)) : null; } catch (RemoteException e) { diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index f17fd55bd22a..cdf7013deb26 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -19,7 +19,7 @@ package android.hardware.fingerprint; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.Context; import android.os.Binder; import android.os.CancellationSignal; @@ -892,7 +892,7 @@ public class FingerprintManager { private int getCurrentUserId() { try { - return ActivityManagerNative.getDefault().getCurrentUser().id; + return ActivityManager.getService().getCurrentUser().id; } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index e9a39360c7bf..ef79b666741a 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -17,7 +17,6 @@ package android.os; import android.animation.ValueAnimator; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.ActivityThread; import android.app.ApplicationErrorReport; import android.app.IActivityManager; @@ -1606,7 +1605,7 @@ public final class StrictMode { public void run() { Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND); try { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); if (am == null) { Log.d(TAG, "No activity manager; failed to Dropbox violation."); } else { @@ -1943,7 +1942,7 @@ public final class StrictMode { // We restore the current policy below, in the finally block. setThreadPolicyMask(0); - ActivityManagerNative.getDefault().handleApplicationStrictModeViolation( + ActivityManager.getService().handleApplicationStrictModeViolation( RuntimeInit.getApplicationObject(), violationMaskSubset, info); diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 15dd282880e4..50eb7cf5e647 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -26,7 +26,6 @@ import android.annotation.UserIdInt; import android.annotation.WorkerThread; import android.app.Activity; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; @@ -983,7 +982,7 @@ public class UserManager { public boolean isUserRunning(int userId) { // TODO Switch to using UMS internal isUserRunning try { - return ActivityManagerNative.getDefault().isUserRunning(userId, 0); + return ActivityManager.getService().isUserRunning(userId, 0); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); } @@ -999,7 +998,7 @@ public class UserManager { public boolean isUserRunningOrStopping(UserHandle user) { try { // TODO: reconcile stopped vs stopping? - return ActivityManagerNative.getDefault().isUserRunning( + return ActivityManager.getService().isUserRunning( user.getIdentifier(), ActivityManager.FLAG_OR_STOPPED); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); @@ -1016,7 +1015,7 @@ public class UserManager { @Deprecated public boolean isUserRunningAndLocked(UserHandle user) { try { - return ActivityManagerNative.getDefault().isUserRunning( + return ActivityManager.getService().isUserRunning( user.getIdentifier(), ActivityManager.FLAG_AND_LOCKED); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); @@ -1033,7 +1032,7 @@ public class UserManager { @Deprecated public boolean isUserRunningAndUnlocked(UserHandle user) { try { - return ActivityManagerNative.getDefault().isUserRunning( + return ActivityManager.getService().isUserRunning( user.getIdentifier(), ActivityManager.FLAG_AND_UNLOCKED); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); @@ -1080,7 +1079,7 @@ public class UserManager { /** {@hide} */ public boolean isUserUnlocked(@UserIdInt int userId) { try { - return ActivityManagerNative.getDefault().isUserRunning(userId, + return ActivityManager.getService().isUserRunning(userId, ActivityManager.FLAG_AND_UNLOCKED); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 0bb84cca174a..5012215cf55b 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -18,7 +18,7 @@ package android.view; import android.annotation.IntDef; import android.annotation.NonNull; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Bitmap; @@ -921,7 +921,7 @@ public final class ThreadedRenderer { private static void initSched(Context context, long renderProxy) { try { int tid = nGetRenderThreadTid(renderProxy); - ActivityManagerNative.getDefault().setRenderThread(tid); + ActivityManager.getService().setRenderThread(tid); } catch (Throwable t) { Log.w(LOG_TAG, "Failed to set scheduler for RenderThread", t); } diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index cdd8b6a4a5c7..1ff8fb0bd8ee 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -26,7 +26,7 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY; import android.Manifest; import android.animation.LayoutTransition; import android.annotation.NonNull; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ResourcesManager; import android.content.ClipData; import android.content.ClipDescription; @@ -7084,7 +7084,7 @@ public final class ViewRootImpl implements ViewParent, private static int checkCallingPermission(String permission) { try { - return ActivityManagerNative.getDefault().checkPermission( + return ActivityManager.getService().checkPermission( permission, Binder.getCallingPid(), Binder.getCallingUid()); } catch (RemoteException e) { return PackageManager.PERMISSION_DENIED; diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index f4ea90b27274..c14789506888 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -17,8 +17,8 @@ package android.webkit; import android.annotation.SystemApi; +import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.Application; import android.content.Context; @@ -292,7 +292,7 @@ public final class WebViewFactory { // killed if the package info goes out-of-date. Trace.traceBegin(Trace.TRACE_TAG_WEBVIEW, "ActivityManager.addPackageDependency()"); try { - ActivityManagerNative.getDefault().addPackageDependency( + ActivityManager.getService().addPackageDependency( response.packageInfo.packageName); } finally { Trace.traceEnd(Trace.TRACE_TAG_WEBVIEW); diff --git a/core/java/com/android/internal/app/HeavyWeightSwitcherActivity.java b/core/java/com/android/internal/app/HeavyWeightSwitcherActivity.java index 83ad9dc661f2..459071b5dc15 100644 --- a/core/java/com/android/internal/app/HeavyWeightSwitcherActivity.java +++ b/core/java/com/android/internal/app/HeavyWeightSwitcherActivity.java @@ -19,7 +19,7 @@ package com.android.internal.app; import com.android.internal.R; import android.app.Activity; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.Intent; import android.content.IntentSender; import android.content.pm.ApplicationInfo; @@ -122,7 +122,7 @@ public class HeavyWeightSwitcherActivity extends Activity { private OnClickListener mSwitchOldListener = new OnClickListener() { public void onClick(View v) { try { - ActivityManagerNative.getDefault().moveTaskToFront(mCurTask, 0, null); + ActivityManager.getService().moveTaskToFront(mCurTask, 0, null); } catch (RemoteException e) { } finish(); @@ -132,7 +132,7 @@ public class HeavyWeightSwitcherActivity extends Activity { private OnClickListener mSwitchNewListener = new OnClickListener() { public void onClick(View v) { try { - ActivityManagerNative.getDefault().finishHeavyWeightApp(); + ActivityManager.getService().finishHeavyWeightApp(); } catch (RemoteException e) { } try { diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index 015e60dd2a7d..0b27c60d3480 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -19,7 +19,7 @@ package com.android.internal.app; import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY; import android.app.Activity; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ActivityThread; import android.app.AppGlobals; import android.app.admin.DevicePolicyManager; @@ -110,9 +110,9 @@ public class IntentForwarderActivity extends Activity { int launchedFromUid = -1; String launchedFromPackage = "?"; try { - launchedFromUid = ActivityManagerNative.getDefault().getLaunchedFromUid( + launchedFromUid = ActivityManager.getService().getLaunchedFromUid( getActivityToken()); - launchedFromPackage = ActivityManagerNative.getDefault().getLaunchedFromPackage( + launchedFromPackage = ActivityManager.getService().getLaunchedFromPackage( getActivityToken()); } catch (RemoteException ignored) { } diff --git a/core/java/com/android/internal/app/LocalePicker.java b/core/java/com/android/internal/app/LocalePicker.java index 472f583fa075..9936ed5c6491 100644 --- a/core/java/com/android/internal/app/LocalePicker.java +++ b/core/java/com/android/internal/app/LocalePicker.java @@ -18,7 +18,7 @@ package com.android.internal.app; import com.android.internal.R; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.app.ListFragment; import android.app.backup.BackupManager; @@ -269,7 +269,7 @@ public class LocalePicker extends ListFragment { */ public static void updateLocales(LocaleList locales) { try { - final IActivityManager am = ActivityManagerNative.getDefault(); + final IActivityManager am = ActivityManager.getService(); final Configuration config = am.getConfiguration(); config.setLocales(locales); @@ -290,7 +290,7 @@ public class LocalePicker extends ListFragment { */ public static LocaleList getLocales() { try { - return ActivityManagerNative.getDefault() + return ActivityManager.getService() .getConfiguration().getLocales(); } catch (RemoteException e) { // If something went wrong diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 72a40b7dcb45..dd8ef180e19c 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -35,7 +35,6 @@ import com.android.internal.R; import com.android.internal.content.PackageMonitor; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.content.ComponentName; import android.content.Context; @@ -245,7 +244,7 @@ public class ResolverActivity extends Activity { setProfileSwitchMessageId(intent.getContentUserHint()); try { - mLaunchedFromUid = ActivityManagerNative.getDefault().getLaunchedFromUid( + mLaunchedFromUid = ActivityManager.getService().getLaunchedFromUid( getActivityToken()); } catch (RemoteException e) { mLaunchedFromUid = -1; @@ -864,7 +863,7 @@ public class ResolverActivity extends Activity { } catch (RuntimeException e) { String launchedFromPackage; try { - launchedFromPackage = ActivityManagerNative.getDefault().getLaunchedFromPackage( + launchedFromPackage = ActivityManager.getService().getLaunchedFromPackage( getActivityToken()); } catch (RemoteException e2) { launchedFromPackage = "??"; diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java index e57a224d1440..304c31d54776 100644 --- a/core/java/com/android/internal/os/RuntimeInit.java +++ b/core/java/com/android/internal/os/RuntimeInit.java @@ -16,7 +16,7 @@ package com.android.internal.os; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ActivityThread; import android.app.ApplicationErrorReport; import android.os.Build; @@ -113,7 +113,7 @@ public class RuntimeInit { } // Bring up crash dialog, wait for it to be dismissed - ActivityManagerNative.getDefault().handleApplicationCrash( + ActivityManager.getService().handleApplicationCrash( mApplicationObject, new ApplicationErrorReport.ParcelableCrashInfo(e)); } catch (Throwable t2) { if (t2 instanceof DeadObjectException) { @@ -379,7 +379,7 @@ public class RuntimeInit { */ public static void wtf(String tag, Throwable t, boolean system) { try { - if (ActivityManagerNative.getDefault().handleApplicationWtf( + if (ActivityManager.getService().handleApplicationWtf( mApplicationObject, tag, system, new ApplicationErrorReport.ParcelableCrashInfo(t))) { // The Activity Manager has already written us off -- now exit. diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 50621f482d4f..2a004cfb2d40 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -21,7 +21,7 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; import static android.view.WindowManager.LayoutParams.*; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.SearchManager; import android.os.UserHandle; @@ -3715,9 +3715,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } public static void sendCloseSystemWindows(Context context, String reason) { - if (ActivityManagerNative.isSystemReady()) { + if (ActivityManager.isSystemReady()) { try { - ActivityManagerNative.getDefault().closeSystemDialogs(reason); + ActivityManager.getService().closeSystemDialogs(reason); } catch (RemoteException e) { } } diff --git a/core/java/com/android/internal/policy/PipMotionHelper.java b/core/java/com/android/internal/policy/PipMotionHelper.java index 05434423e9c2..944cd323b295 100644 --- a/core/java/com/android/internal/policy/PipMotionHelper.java +++ b/core/java/com/android/internal/policy/PipMotionHelper.java @@ -18,7 +18,7 @@ package com.android.internal.policy; import android.animation.RectEvaluator; import android.animation.ValueAnimator; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.graphics.Rect; import android.os.Handler; @@ -51,7 +51,7 @@ public class PipMotionHelper { public void resizeToBounds(Rect toBounds) { mHandler.post(() -> { if (mActivityManager == null) { - mActivityManager = ActivityManagerNative.getDefault(); + mActivityManager = ActivityManager.getService(); } try { mActivityManager.resizePinnedStack(toBounds, null /* tempPinnedTaskBounds */); diff --git a/core/tests/coretests/src/android/app/activity/BroadcastTest.java b/core/tests/coretests/src/android/app/activity/BroadcastTest.java index f28ba7e07ff8..e9e8bfcb09c5 100644 --- a/core/tests/coretests/src/android/app/activity/BroadcastTest.java +++ b/core/tests/coretests/src/android/app/activity/BroadcastTest.java @@ -17,7 +17,7 @@ package android.app.activity; import android.app.Activity; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -304,10 +304,10 @@ public class BroadcastTest extends ActivityTestsBase { public void testSetSticky() throws Exception { Intent intent = new Intent(LaunchpadActivity.BROADCAST_STICKY1, null); intent.putExtra("test", LaunchpadActivity.DATA_1); - ActivityManagerNative.getDefault().unbroadcastIntent(null, intent, + ActivityManager.getService().unbroadcastIntent(null, intent, UserHandle.myUserId()); - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.myUserId()); + ActivityManager.broadcastStickyIntent(intent, UserHandle.myUserId()); addIntermediate("finished-broadcast"); IntentFilter filter = new IntentFilter(LaunchpadActivity.BROADCAST_STICKY1); @@ -319,9 +319,9 @@ public class BroadcastTest extends ActivityTestsBase { public void testClearSticky() throws Exception { Intent intent = new Intent(LaunchpadActivity.BROADCAST_STICKY1, null); intent.putExtra("test", LaunchpadActivity.DATA_1); - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.myUserId()); + ActivityManager.broadcastStickyIntent(intent, UserHandle.myUserId()); - ActivityManagerNative.getDefault().unbroadcastIntent( + ActivityManager.getService().unbroadcastIntent( null, new Intent(LaunchpadActivity.BROADCAST_STICKY1, null), UserHandle.myUserId()); addIntermediate("finished-unbroadcast"); @@ -334,10 +334,10 @@ public class BroadcastTest extends ActivityTestsBase { public void testReplaceSticky() throws Exception { Intent intent = new Intent(LaunchpadActivity.BROADCAST_STICKY1, null); intent.putExtra("test", LaunchpadActivity.DATA_1); - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.myUserId()); + ActivityManager.broadcastStickyIntent(intent, UserHandle.myUserId()); intent.putExtra("test", LaunchpadActivity.DATA_2); - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.myUserId()); + ActivityManager.broadcastStickyIntent(intent, UserHandle.myUserId()); addIntermediate("finished-broadcast"); IntentFilter filter = new IntentFilter(LaunchpadActivity.BROADCAST_STICKY1); @@ -351,7 +351,7 @@ public class BroadcastTest extends ActivityTestsBase { public void testReceiveSticky() throws Exception { Intent intent = new Intent(LaunchpadActivity.BROADCAST_STICKY1, null); intent.putExtra("test", LaunchpadActivity.DATA_1); - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.myUserId()); + ActivityManager.broadcastStickyIntent(intent, UserHandle.myUserId()); runLaunchpad(LaunchpadActivity.BROADCAST_STICKY1); } @@ -361,10 +361,10 @@ public class BroadcastTest extends ActivityTestsBase { public void testReceive2Sticky() throws Exception { Intent intent = new Intent(LaunchpadActivity.BROADCAST_STICKY1, null); intent.putExtra("test", LaunchpadActivity.DATA_1); - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.myUserId()); + ActivityManager.broadcastStickyIntent(intent, UserHandle.myUserId()); intent = new Intent(LaunchpadActivity.BROADCAST_STICKY2, null); intent.putExtra("test", LaunchpadActivity.DATA_2); - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.myUserId()); + ActivityManager.broadcastStickyIntent(intent, UserHandle.myUserId()); runLaunchpad(LaunchpadActivity.BROADCAST_STICKY2); } diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java index d12417b47fec..e3ab05d81de7 100644 --- a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java +++ b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java @@ -16,7 +16,7 @@ package com.android.keyguard; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; @@ -171,7 +171,7 @@ public class EmergencyButton extends Button { // should be the equivalent to the old userActivity(EMERGENCY_CALL_TIMEOUT) mPowerManager.userActivity(SystemClock.uptimeMillis(), true); try { - ActivityManagerNative.getDefault().stopSystemLockTaskMode(); + ActivityManager.getService().stopSystemLockTaskMode(); } catch (RemoteException e) { Slog.w(LOG_TAG, "Failed to stop app pinning"); } diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 66e56e0b47ad..6a2949a5ed9f 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -28,7 +28,6 @@ import static android.os.BatteryManager.EXTRA_PLUGGED; import static android.os.BatteryManager.EXTRA_STATUS; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.PendingIntent; import android.app.UserSwitchObserver; @@ -459,7 +458,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { try { final int userId; try { - userId = ActivityManagerNative.getDefault().getCurrentUser().id; + userId = ActivityManager.getService().getCurrentUser().id; } catch (RemoteException e) { Log.e(TAG, "Failed to get current user id: ", e); return; @@ -1088,7 +1087,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { mSubscriptionManager.addOnSubscriptionsChangedListener(mSubscriptionListener); try { - ActivityManagerNative.getDefault().registerUserSwitchObserver( + ActivityManager.getService().registerUserSwitchObserver( new UserSwitchObserver() { @Override public void onUserSwitching(int newUserId, IRemoteCallback reply) { diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index bf48e5de1da3..1c517733eb2c 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -16,7 +16,7 @@ package com.android.providers.settings; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.app.backup.IBackupManager; import android.content.ContentResolver; @@ -343,7 +343,7 @@ public class SettingsHelper { if (loc == null) return; // Couldn't find the saved locale in this version of the software try { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); Configuration config = am.getConfiguration(); config.locale = loc; // indicate this isn't some passing default - the user wants this remembered diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java index 169b01f66881..461573f81789 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsService.java @@ -16,7 +16,7 @@ package com.android.providers.settings; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.IContentProvider; import android.content.pm.PackageManager; import android.database.Cursor; @@ -190,7 +190,7 @@ final public class SettingsService extends Binder { if (mUser == UserHandle.USER_CURRENT) { try { - mUser = ActivityManagerNative.getDefault().getCurrentUser().id; + mUser = ActivityManager.getService().getCurrentUser().id; } catch (RemoteException e) { throw new RuntimeException("Failed in IPC", e); } diff --git a/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java b/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java index 9a64a41df4ea..3a8536b8127e 100644 --- a/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/GuestResumeSessionReceiver.java @@ -16,7 +16,7 @@ package com.android.systemui; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -66,7 +66,7 @@ public class GuestResumeSessionReceiver extends BroadcastReceiver { UserInfo currentUser; try { - currentUser = ActivityManagerNative.getDefault().getCurrentUser(); + currentUser = ActivityManager.getService().getCurrentUser(); } catch (RemoteException e) { return; } @@ -96,7 +96,7 @@ public class GuestResumeSessionReceiver extends BroadcastReceiver { UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE); UserInfo currentUser; try { - currentUser = ActivityManagerNative.getDefault().getCurrentUser(); + currentUser = ActivityManager.getService().getCurrentUser(); } catch (RemoteException e) { Log.e(TAG, "Couldn't wipe session because ActivityManager is dead"); return; @@ -122,12 +122,12 @@ public class GuestResumeSessionReceiver extends BroadcastReceiver { try { if (newGuest == null) { Log.e(TAG, "Could not create new guest, switching back to system user"); - ActivityManagerNative.getDefault().switchUser(UserHandle.USER_SYSTEM); + ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM); userManager.removeUser(currentUser.id); WindowManagerGlobal.getWindowManagerService().lockNow(null /* options */); return; } - ActivityManagerNative.getDefault().switchUser(newGuest.id); + ActivityManager.getService().switchUser(newGuest.id); userManager.removeUser(currentUser.id); } catch (RemoteException e) { Log.e(TAG, "Couldn't wipe session because ActivityManager or WindowManager is dead"); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 8f1a943d98ff..34dc63f12427 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -23,7 +23,6 @@ import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STR import android.app.Activity; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.PendingIntent; import android.app.SearchManager; @@ -1619,7 +1618,7 @@ public class KeyguardViewMediator extends SystemUI { private void updateActivityLockScreenState() { Trace.beginSection("KeyguardViewMediator#updateActivityLockScreenState"); try { - ActivityManagerNative.getDefault().setLockScreenShown(mShowing); + ActivityManager.getService().setLockScreenShown(mShowing); } catch (RemoteException e) { } Trace.endSection(); @@ -1681,7 +1680,7 @@ public class KeyguardViewMediator extends SystemUI { // Don't actually hide the Keyguard at the moment, wait for window // manager until it tells us it's safe to do so with // startKeyguardExitAnimation. - ActivityManagerNative.getDefault().keyguardGoingAway(flags); + ActivityManager.getService().keyguardGoingAway(flags); } catch (RemoteException e) { Log.e(TAG, "Error while calling WindowManager", e); } diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java index 7b8d27eef8b4..43cfa3249a90 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java @@ -16,7 +16,7 @@ package com.android.systemui.pip.phone; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; import android.view.IWindowManager; @@ -44,7 +44,7 @@ public class PipManager { */ public void initialize(Context context) { mContext = context; - mActivityManager = ActivityManagerNative.getDefault(); + mActivityManager = ActivityManager.getService(); mWindowManager = WindowManagerGlobal.getWindowManagerService(); mMenuController = new PipMenuActivityController(context, mActivityManager, mWindowManager); diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java index 5b93aa2ca930..a6226565c4f9 100644 --- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java @@ -16,9 +16,9 @@ package com.android.systemui.pip.tv; +import android.app.ActivityManager; import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityManager.StackInfo; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -208,7 +208,7 @@ public class PipManager { mInitialized = true; mContext = context; - mActivityManager = ActivityManagerNative.getDefault(); + mActivityManager = ActivityManager.getService(); mWindowManager = WindowManagerGlobal.getWindowManagerService(); SystemServicesProxy.getInstance(context).registerTaskStackListener(mTaskStackListener); IntentFilter intentFilter = new IntentFilter(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java index b961055c6fed..cf75c4f50bb6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java +++ b/packages/SystemUI/src/com/android/systemui/recents/ScreenPinningRequest.java @@ -19,7 +19,6 @@ package com.android.systemui.recents; import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -117,7 +116,7 @@ public class ScreenPinningRequest implements View.OnClickListener { public void onClick(View v) { if (v.getId() == R.id.screen_pinning_ok_button || mRequestWindow == v) { try { - ActivityManagerNative.getDefault().startSystemLockTaskMode(taskId); + ActivityManager.getService().startSystemLockTaskMode(taskId); } catch (RemoteException e) {} } clearPrompt(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index ea9714f697ff..2272a728cc54 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -25,7 +25,6 @@ import static android.app.ActivityManager.StackId.PINNED_STACK_ID; import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDOWS_SUPPORT; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.ActivityOptions; import android.app.AppGlobals; import android.app.IActivityManager; @@ -157,7 +156,7 @@ public class SystemServicesProxy { /** * Implementation of {@link android.app.ITaskStackListener} to listen task stack changes from - * ActivityManagerNative. + * ActivityManagerService. * This simply passes callbacks to listeners through {@link H}. * */ private android.app.TaskStackListener mTaskStackListener = new android.app.TaskStackListener() { @@ -207,7 +206,7 @@ public class SystemServicesProxy { private SystemServicesProxy(Context context) { mAccm = AccessibilityManager.getInstance(context); mAm = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); - mIam = ActivityManagerNative.getDefault(); + mIam = ActivityManager.getService(); mPm = context.getPackageManager(); mIpm = AppGlobals.getPackageManager(); mAssistUtils = new AssistUtils(context); diff --git a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java index 2684722a9d84..19eefec2ad8b 100644 --- a/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java +++ b/packages/SystemUI/src/com/android/systemui/shortcut/ShortcutKeyDispatcher.java @@ -18,7 +18,6 @@ package com.android.systemui.shortcut; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.content.ComponentName; import android.content.Context; @@ -59,7 +58,7 @@ public class ShortcutKeyDispatcher extends SystemUI private ShortcutKeyServiceProxy mShortcutKeyServiceProxy = new ShortcutKeyServiceProxy(this); private IWindowManager mWindowManagerService = WindowManagerGlobal.getWindowManagerService(); - private IActivityManager mActivityManager = ActivityManagerNative.getDefault(); + private IActivityManager mActivityManager = ActivityManager.getService(); protected final long META_MASK = ((long) KeyEvent.META_META_ON) << Integer.SIZE; protected final long ALT_MASK = ((long) KeyEvent.META_ALT_ON) << Integer.SIZE; diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java index ef32f7e8777e..c24512649c2f 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java @@ -19,7 +19,7 @@ package com.android.systemui.stackdivider; import static android.app.ActivityManager.StackId.DOCKED_STACK_ID; import static android.view.WindowManager.DOCKED_INVALID; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.graphics.Rect; import android.os.RemoteException; import android.util.Log; @@ -72,7 +72,7 @@ public class WindowManagerProxy { mTmpRect5.set(mTempOtherInsetRect); } try { - ActivityManagerNative.getDefault() + ActivityManager.getService() .resizeDockedStack(mTmpRect1, mTmpRect2.isEmpty() ? null : mTmpRect2, mTmpRect3.isEmpty() ? null : mTmpRect3, @@ -88,7 +88,7 @@ public class WindowManagerProxy { @Override public void run() { try { - ActivityManagerNative.getDefault().moveTasksToFullscreenStack( + ActivityManager.getService().moveTasksToFullscreenStack( DOCKED_STACK_ID, false /* onTop */); } catch (RemoteException e) { Log.w(TAG, "Failed to remove stack: " + e); @@ -100,7 +100,7 @@ public class WindowManagerProxy { @Override public void run() { try { - ActivityManagerNative.getDefault().resizeStack( + ActivityManager.getService().resizeStack( DOCKED_STACK_ID, null, true, true, false, -1); } catch (RemoteException e) { Log.w(TAG, "Failed to resize stack: " + e); @@ -124,7 +124,7 @@ public class WindowManagerProxy { @Override public void run() { try { - ActivityManagerNative.getDefault().swapDockedAndFullscreenStack(); + ActivityManager.getService().swapDockedAndFullscreenStack(); } catch (RemoteException e) { Log.w(TAG, "Failed to resize stack: " + e); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 93ddd177c270..19e511cff228 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -20,7 +20,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.app.ActivityManager; import android.app.ActivityManager.StackId; -import android.app.ActivityManagerNative; import android.app.ActivityOptions; import android.app.KeyguardManager; import android.app.Notification; @@ -334,7 +333,7 @@ public abstract class BaseStatusBar extends SystemUI implements // the user switches to home. We know it is safe to do at this // point, so make sure new activity switches are now allowed. try { - ActivityManagerNative.getDefault().resumeAppSwitches(); + ActivityManager.getService().resumeAppSwitches(); } catch (RemoteException e) { } final boolean isActivity = pendingIntent.isActivity(); @@ -346,7 +345,7 @@ public abstract class BaseStatusBar extends SystemUI implements @Override public boolean onDismiss() { try { - ActivityManagerNative.getDefault().resumeAppSwitches(); + ActivityManager.getService().resumeAppSwitches(); } catch (RemoteException e) { } @@ -515,7 +514,7 @@ public abstract class BaseStatusBar extends SystemUI implements } else if (Intent.ACTION_USER_PRESENT.equals(action)) { List<ActivityManager.RecentTaskInfo> recentTask = null; try { - recentTask = ActivityManagerNative.getDefault().getRecentTasks(1, + recentTask = ActivityManager.getService().getRecentTasks(1, ActivityManager.RECENT_WITH_EXCLUDED | ActivityManager.RECENT_INCLUDE_PROFILES, mCurrentUserId).getList(); @@ -1321,7 +1320,7 @@ public abstract class BaseStatusBar extends SystemUI implements protected void sendCloseSystemWindows(String reason) { try { - ActivityManagerNative.getDefault().closeSystemDialogs(reason); + ActivityManager.getService().closeSystemDialogs(reason); } catch (RemoteException e) { } } @@ -1820,7 +1819,7 @@ public abstract class BaseStatusBar extends SystemUI implements // won't have permission to immediately start an activity after // the user switches to home. We know it is safe to do at this // point, so make sure new activity switches are now allowed. - ActivityManagerNative.getDefault().resumeAppSwitches(); + ActivityManager.getService().resumeAppSwitches(); } catch (RemoteException e) { } try { @@ -1924,7 +1923,7 @@ public abstract class BaseStatusBar extends SystemUI implements // won't have permission to immediately start an activity after // the user switches to home. We know it is safe to do at this // point, so make sure new activity switches are now allowed. - ActivityManagerNative.getDefault().resumeAppSwitches(); + ActivityManager.getService().resumeAppSwitches(); } catch (RemoteException e) { } if (intent != null) { @@ -1938,7 +1937,7 @@ public abstract class BaseStatusBar extends SystemUI implements && mKeyguardManager.isDeviceLocked(userId)) { boolean canBypass = false; try { - canBypass = ActivityManagerNative.getDefault() + canBypass = ActivityManager.getService() .canBypassWorkChallenge(intent); } catch (RemoteException e) { } @@ -2058,7 +2057,7 @@ public abstract class BaseStatusBar extends SystemUI implements Intent.EXTRA_INTENT, callBackPendingIntent.getIntentSender()); try { - ActivityManagerNative.getDefault().startConfirmDeviceCredentialIntent(newIntent); + ActivityManager.getService().startConfirmDeviceCredentialIntent(newIntent); } catch (RemoteException ex) { // ignore } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java index 8a5a8a04882e..dd5832b886ee 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.car; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.ActivityOptions; import android.content.BroadcastReceiver; import android.content.Context; @@ -256,7 +255,7 @@ public class CarStatusBar extends PhoneStatusBar implements private int startActivityWithOptions(Intent intent, Bundle options) { int result = ActivityManager.START_CANCELED; try { - result = ActivityManagerNative.getDefault().startActivityAsUser(null /* caller */, + result = ActivityManager.getService().startActivityAsUser(null /* caller */, mContext.getBasePackageName(), intent, intent.resolveTypeIfNeeded(mContext.getContentResolver()), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index dbae6b87cedd..89defec6f94c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -20,7 +20,6 @@ import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK; import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.ActivityOptions; import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; @@ -363,7 +362,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL (DevicePolicyManager) getContext().getSystemService(Context.DEVICE_POLICY_SERVICE); if (dpm != null && mPhoneStatusBar != null) { try { - final int userId = ActivityManagerNative.getDefault().getCurrentUser().id; + final int userId = ActivityManager.getService().getCurrentUser().id; final int disabledFlags = dpm.getKeyguardDisabledFeatures(null, userId); final boolean disabledBecauseKeyguardSecure = (disabledFlags & DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA) != 0 @@ -487,7 +486,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL o.setRotationAnimationHint( WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS); try { - result = ActivityManagerNative.getDefault().startActivityAsUser( + result = ActivityManager.getService().startActivityAsUser( null, getContext().getBasePackageName(), intent, intent.resolveTypeIfNeeded(getContext().getContentResolver()), diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index df167e66aa5a..97df23709c45 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -21,7 +21,7 @@ import android.animation.LayoutTransition.TransitionListener; import android.animation.ObjectAnimator; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.StatusBarManager; import android.content.Context; import android.content.res.Configuration; @@ -422,7 +422,7 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav private boolean inLockTask() { try { - return ActivityManagerNative.getDefault().isInLockTaskMode(); + return ActivityManager.getService().isInLockTaskMode(); } catch (RemoteException e) { return false; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 31a93f08a3c3..c4fb21eda982 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -34,7 +34,6 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.annotation.NonNull; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.ActivityOptions; import android.app.IActivityManager; import android.app.Notification; @@ -3516,7 +3515,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS); } try { - result = ActivityManagerNative.getDefault().startActivityAsUser( + result = ActivityManager.getService().startActivityAsUser( null, mContext.getBasePackageName(), intent, intent.resolveTypeIfNeeded(mContext.getContentResolver()), @@ -4897,7 +4896,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, */ private boolean handleLongPressBack() { try { - IActivityManager activityManager = ActivityManagerNative.getDefault(); + IActivityManager activityManager = ActivityManager.getService(); if (activityManager.isInLockTaskMode()) { activityManager.stopSystemLockTaskMode(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index 032c86bdd06e..9ee1e8f03137 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -17,7 +17,6 @@ package com.android.systemui.statusbar.phone; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.AlarmManager.AlarmClockInfo; import android.app.SynchronousUserSwitchObserver; @@ -146,7 +145,7 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro // listen for user / profile change. try { - ActivityManagerNative.getDefault().registerUserSwitchObserver(mUserSwitchListener, TAG); + ActivityManager.getService().registerUserSwitchObserver(mUserSwitchListener, TAG); } catch (RemoteException e) { // Ignore } @@ -380,7 +379,7 @@ public class PhoneStatusBarPolicy implements Callback, RotationLockController.Ro UserInfo user = null; if (userId == UserHandle.USER_CURRENT) { try { - user = ActivityManagerNative.getDefault().getCurrentUser(); + user = ActivityManager.getService().getCurrentUser(); } catch (RemoteException e) { // Ignore } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java index 4a2d5dcda967..995f4ddf35d3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.phone; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; import android.content.pm.ActivityInfo; @@ -64,7 +64,7 @@ public class StatusBarWindowManager implements RemoteInputController.Callback { public StatusBarWindowManager(Context context) { mContext = context; mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); - mActivityManager = ActivityManagerNative.getDefault(); + mActivityManager = ActivityManager.getService(); mKeyguardScreenRotation = shouldEnableKeyguardScreenRotation(); mScreenBrightnessDoze = mContext.getResources().getInteger( com.android.internal.R.integer.config_screenBrightnessDoze) / 255f; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java index 17b22dfed207..c09747b73f95 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserInfoController.java @@ -16,7 +16,7 @@ package com.android.systemui.statusbar.policy; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -93,7 +93,7 @@ public class UserInfoController implements CallbackController<OnUserInfoChangedL if (ContactsContract.Intents.ACTION_PROFILE_CHANGED.equals(action) || Intent.ACTION_USER_INFO_CHANGED.equals(action)) { try { - final int currentUser = ActivityManagerNative.getDefault().getCurrentUser().id; + final int currentUser = ActivityManager.getService().getCurrentUser().id; final int changedUser = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, getSendingUserId()); if (changedUser == currentUser) { @@ -118,7 +118,7 @@ public class UserInfoController implements CallbackController<OnUserInfoChangedL Context currentUserContext; UserInfo userInfo; try { - userInfo = ActivityManagerNative.getDefault().getCurrentUser(); + userInfo = ActivityManager.getService().getCurrentUser(); currentUserContext = mContext.createPackageContextAsUser("android", 0, new UserHandle(userInfo.id)); } catch (PackageManager.NameNotFoundException e) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java index 9d9c9082ebb9..bb4b91ef3860 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.policy; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.Dialog; import android.app.Notification; import android.app.NotificationManager; @@ -412,7 +411,7 @@ public class UserSwitcherController { protected void switchToUserId(int id) { try { pauseRefreshUsers(); - ActivityManagerNative.getDefault().switchUser(id); + ActivityManager.getService().switchUser(id); } catch (RemoteException e) { Log.e(TAG, "Couldn't switch user.", e); } diff --git a/preloaded-classes b/preloaded-classes index 45734b6861c0..7aa029cd24cc 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -327,9 +327,6 @@ android.app.ActivityManager$RunningAppProcessInfo$1 android.app.ActivityManager$StackId android.app.ActivityManager$TaskDescription android.app.ActivityManager$TaskDescription$1 -android.app.ActivityManagerNative -android.app.ActivityManagerNative$1 -android.app.ActivityManagerProxy android.app.ActivityOptions android.app.ActivityThread android.app.ActivityThread$1 diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 6375e9a39dae..539f7481e942 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -18,7 +18,7 @@ package com.android.server.backup; import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_BACKUP_IN_FOREGROUND; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.AlarmManager; import android.app.AppGlobals; import android.app.ApplicationThreadConstants; @@ -1075,7 +1075,7 @@ public class BackupManagerService { mContext = context; mPackageManager = context.getPackageManager(); mPackageManagerBinder = AppGlobals.getPackageManager(); - mActivityManager = ActivityManagerNative.getDefault(); + mActivityManager = ActivityManager.getService(); mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); mPowerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index 2558045a0e22..581aa05d7d32 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -18,7 +18,6 @@ package com.android.server; import android.app.Activity; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.AppOpsManager; import android.app.BroadcastOptions; @@ -505,7 +504,7 @@ class AlarmManagerService extends SystemService { for (int i = alarms.size()-1; i >= 0; i--) { Alarm alarm = alarms.get(i); try { - if (alarm.uid == uid && ActivityManagerNative.getDefault().getAppStartMode( + if (alarm.uid == uid && ActivityManager.getService().getAppStartMode( uid, alarm.packageName) == ActivityManager.APP_START_MODE_DISABLED) { alarms.remove(i); didRemove = true; @@ -937,7 +936,7 @@ class AlarmManagerService extends SystemService { } try { - ActivityManagerNative.getDefault().registerUidObserver(new UidObserver(), + ActivityManager.getService().registerUidObserver(new UidObserver(), ActivityManager.UID_OBSERVER_IDLE, ActivityManager.PROCESS_STATE_UNKNOWN, null); } catch (RemoteException e) { // ignored; both services live in system_server @@ -1090,7 +1089,7 @@ class AlarmManagerService extends SystemService { operation, directReceiver, listenerTag, workSource, flags, alarmClock, callingUid, callingPackage); try { - if (ActivityManagerNative.getDefault().getAppStartMode(callingUid, callingPackage) + if (ActivityManager.getService().getAppStartMode(callingUid, callingPackage) == ActivityManager.APP_START_MODE_DISABLED) { Slog.w(TAG, "Not setting alarm from " + callingUid + ":" + a + " -- package not allowed to start"); @@ -2414,11 +2413,11 @@ class AlarmManagerService extends SystemService { if (RECORD_ALARMS_IN_HISTORY) { if (alarm.workSource != null && alarm.workSource.size() > 0) { for (int wi=0; wi<alarm.workSource.size(); wi++) { - ActivityManagerNative.noteAlarmStart( + ActivityManager.noteAlarmStart( alarm.operation, alarm.workSource.get(wi), alarm.statsTag); } } else { - ActivityManagerNative.noteAlarmStart( + ActivityManager.noteAlarmStart( alarm.operation, alarm.uid, alarm.statsTag); } } @@ -2582,7 +2581,7 @@ class AlarmManagerService extends SystemService { final int uid = (knownUid >= 0) ? knownUid - : ActivityManagerNative.getDefault().getUidForIntentSender(pi.getTarget()); + : ActivityManager.getService().getUidForIntentSender(pi.getTarget()); if (uid >= 0) { mWakeLock.setWorkSource(new WorkSource(uid)); return; @@ -2881,11 +2880,11 @@ class AlarmManagerService extends SystemService { if (RECORD_ALARMS_IN_HISTORY) { if (inflight.mWorkSource != null && inflight.mWorkSource.size() > 0) { for (int wi=0; wi<inflight.mWorkSource.size(); wi++) { - ActivityManagerNative.noteAlarmFinish( + ActivityManager.noteAlarmFinish( inflight.mPendingIntent, inflight.mWorkSource.get(wi), inflight.mTag); } } else { - ActivityManagerNative.noteAlarmFinish( + ActivityManager.noteAlarmFinish( inflight.mPendingIntent, inflight.mUid, inflight.mTag); } } @@ -3086,13 +3085,13 @@ class AlarmManagerService extends SystemService { if (alarm.workSource != null && alarm.workSource.size() > 0) { for (int wi=0; wi<alarm.workSource.size(); wi++) { final String wsName = alarm.workSource.getName(wi); - ActivityManagerNative.noteWakeupAlarm( + ActivityManager.noteWakeupAlarm( alarm.operation, alarm.workSource.get(wi), (wsName != null) ? wsName : alarm.packageName, alarm.statsTag); } } else { - ActivityManagerNative.noteWakeupAlarm( + ActivityManager.noteWakeupAlarm( alarm.operation, alarm.uid, alarm.packageName, alarm.statsTag); } } diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java index b88a45edee1b..573ad631891e 100644 --- a/services/core/java/com/android/server/BatteryService.java +++ b/services/core/java/com/android/server/BatteryService.java @@ -28,7 +28,7 @@ import com.android.server.am.BatteryStatsService; import com.android.server.lights.Light; import com.android.server.lights.LightsManager; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -557,7 +557,7 @@ public final class BatteryService extends SystemService { mHandler.post(new Runnable() { @Override public void run() { - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.USER_ALL); + ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL); } }); } diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index 466633a05e4e..07322fcbf915 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -17,7 +17,7 @@ package com.android.server; import android.Manifest; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.AlarmManager; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -1572,7 +1572,7 @@ public class DeviceIdleController extends SystemService Manifest.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST, "No permission to change device idle whitelist"); final int callingUid = Binder.getCallingUid(); - userId = ActivityManagerNative.getDefault().handleIncomingUser( + userId = ActivityManager.getService().handleIncomingUser( Binder.getCallingPid(), callingUid, userId, diff --git a/services/core/java/com/android/server/InputContentUriTokenHandler.java b/services/core/java/com/android/server/InputContentUriTokenHandler.java index 3f4972babf6e..57cdc9456b7b 100644 --- a/services/core/java/com/android/server/InputContentUriTokenHandler.java +++ b/services/core/java/com/android/server/InputContentUriTokenHandler.java @@ -18,7 +18,7 @@ package com.android.server; import android.annotation.NonNull; import android.annotation.UserIdInt; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.Intent; import android.net.Uri; import android.os.Binder; @@ -64,7 +64,7 @@ final class InputContentUriTokenHandler extends IInputContentUriToken.Stub { } try { - mPermissionOwnerToken = ActivityManagerNative.getDefault() + mPermissionOwnerToken = ActivityManager.getService() .newUriPermissionOwner("InputContentUriTokenHandler"); } catch (RemoteException e) { e.rethrowFromSystemServer(); @@ -78,7 +78,7 @@ final class InputContentUriTokenHandler extends IInputContentUriToken.Stub { long origId = Binder.clearCallingIdentity(); try { try { - ActivityManagerNative.getDefault().grantUriPermissionFromOwner( + ActivityManager.getService().grantUriPermissionFromOwner( permissionOwner, mSourceUid, mTargetPackage, mUri, Intent.FLAG_GRANT_READ_URI_PERMISSION, mSourceUserId, mTargetUserId); } catch (RemoteException e) { @@ -96,7 +96,7 @@ final class InputContentUriTokenHandler extends IInputContentUriToken.Stub { return; } try { - ActivityManagerNative.getDefault().revokeUriPermissionFromOwner( + ActivityManager.getService().revokeUriPermissionFromOwner( mPermissionOwnerToken, mUri, Intent.FLAG_GRANT_READ_URI_PERMISSION, mSourceUserId); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index d1f07a505359..3dfbdc392b13 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -49,8 +49,8 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; +import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.AppOpsManager; @@ -907,7 +907,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mNotificationShown = false; int userId = 0; try { - userId = ActivityManagerNative.getDefault().getCurrentUser().id; + userId = ActivityManager.getService().getCurrentUser().id; } catch (RemoteException e) { Slog.w(TAG, "Couldn't get current user ID; guessing it's 0", e); } diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java index dd342c523e75..991ce4541910 100644 --- a/services/core/java/com/android/server/LockSettingsService.java +++ b/services/core/java/com/android/server/LockSettingsService.java @@ -16,7 +16,7 @@ package com.android.server; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.KeyguardManager; import android.app.Notification; import android.app.NotificationManager; @@ -813,7 +813,7 @@ public class LockSettingsService extends ILockSettings.Stub { }; try { - ActivityManagerNative.getDefault().unlockUser(userId, token, secret, listener); + ActivityManager.getService().unlockUser(userId, token, secret, listener); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); } diff --git a/services/core/java/com/android/server/LockSettingsShellCommand.java b/services/core/java/com/android/server/LockSettingsShellCommand.java index 0efdd510459a..f72663aed140 100644 --- a/services/core/java/com/android/server/LockSettingsShellCommand.java +++ b/services/core/java/com/android/server/LockSettingsShellCommand.java @@ -20,7 +20,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC; import static com.android.internal.widget.LockPatternUtils.stringToPattern; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.Context; import android.os.Binder; import android.os.Process; @@ -52,7 +52,7 @@ class LockSettingsShellCommand extends ShellCommand { @Override public int onCommand(String cmd) { try { - mCurrentUserId = ActivityManagerNative.getDefault().getCurrentUser().id; + mCurrentUserId = ActivityManager.getService().getCurrentUser().id; parseArgs(); if (!checkCredential()) { diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 8b7b6a0f8016..ee625d951b5e 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -31,7 +31,6 @@ import static org.xmlpull.v1.XmlPullParser.START_TAG; import android.Manifest; import android.annotation.Nullable; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppOpsManager; import android.app.IActivityManager; import android.content.BroadcastReceiver; @@ -836,7 +835,7 @@ class MountService extends IMountService.Stub | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, user.id); if (provider != null) { - final IActivityManager am = ActivityManagerNative.getDefault(); + final IActivityManager am = ActivityManager.getService(); try { am.killApplication(provider.applicationInfo.packageName, UserHandle.getAppId(provider.applicationInfo.uid), @@ -1029,7 +1028,7 @@ class MountService extends IMountService.Stub Configuration config = new Configuration(); config.setLocale(locale); try { - ActivityManagerNative.getDefault().updatePersistentConfiguration(config); + ActivityManager.getService().updatePersistentConfiguration(config); } catch (RemoteException e) { Slog.e(TAG, "Error setting system locale from mount service", e); } diff --git a/services/core/java/com/android/server/MountServiceIdler.java b/services/core/java/com/android/server/MountServiceIdler.java index e0b2307e89f3..956568dbaaa2 100644 --- a/services/core/java/com/android/server/MountServiceIdler.java +++ b/services/core/java/com/android/server/MountServiceIdler.java @@ -18,7 +18,7 @@ package com.android.server; import java.util.Calendar; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.job.JobInfo; import android.app.job.JobParameters; import android.app.job.JobScheduler; @@ -59,7 +59,7 @@ public class MountServiceIdler extends JobService { // is really more than just mount, some day it should be renamed to be system // idleer). try { - ActivityManagerNative.getDefault().performIdleMaintenance(); + ActivityManager.getService().performIdleMaintenance(); } catch (RemoteException e) { } // The mount service will run an fstrim operation asynchronously diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index e64aa160b2e2..5654096e1c91 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -46,7 +46,7 @@ import static com.android.server.NetworkManagementService.NetdResponseCode.Tethe import static com.android.server.NetworkManagementService.NetdResponseCode.TtyListResult; import static com.android.server.NetworkManagementSocketTagger.PROP_QTAGUID_ENABLED; import android.annotation.NonNull; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.ContentResolver; import android.content.Context; import android.net.ConnectivityManager; @@ -958,7 +958,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub final int uid = Integer.parseInt(cooked[1]); final byte[] firstPacket = HexDump.hexStringToByteArray(cooked[2]); try { - ActivityManagerNative.getDefault().notifyCleartextNetwork(uid, firstPacket); + ActivityManager.getService().notifyCleartextNetwork(uid, firstPacket); } catch (RemoteException ignored) { } break; diff --git a/services/core/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java index 4f02a23d1e76..cbd7be7343bb 100644 --- a/services/core/java/com/android/server/TextServicesManagerService.java +++ b/services/core/java/com/android/server/TextServicesManagerService.java @@ -30,7 +30,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.UserIdInt; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.AppGlobals; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -159,7 +159,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { int userId = UserHandle.USER_SYSTEM; try { - userId = ActivityManagerNative.getDefault().getCurrentUser().id; + userId = ActivityManager.getService().getCurrentUser().id; } catch (RemoteException e) { Slog.w(TAG, "Couldn't get current user ID; guessing it's 0", e); } diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index 626869718580..6ea6fb7c9c03 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -19,7 +19,6 @@ package com.android.server; import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.IUiModeManager; import android.app.Notification; import android.app.NotificationManager; @@ -475,7 +474,7 @@ final class UiModeManagerService extends SystemService { mSetUiMode = mConfiguration.uiMode; try { - ActivityManagerNative.getDefault().updateConfiguration(mConfiguration); + ActivityManager.getService().updateConfiguration(mConfiguration); } catch (RemoteException e) { Slog.w(TAG, "Failure communicating with activity manager", e); } @@ -637,7 +636,7 @@ final class UiModeManagerService extends SystemService { Intent homeIntent = buildHomeIntent(category); if (Sandman.shouldStartDockApp(getContext(), homeIntent)) { try { - int result = ActivityManagerNative.getDefault().startActivityWithConfig( + int result = ActivityManager.getService().startActivityWithConfig( null, null, homeIntent, null, null, null, 0, 0, mConfiguration, null, UserHandle.USER_CURRENT); if (result >= ActivityManager.START_SUCCESS) { diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 78025764b07a..b5fecfb17aeb 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -34,7 +34,6 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.ActivityThread; import android.app.AppGlobals; import android.app.AppOpsManager; @@ -3999,7 +3998,7 @@ public class AccountManagerService public AccountAndUser[] getRunningAccounts() { final int[] runningUserIds; try { - runningUserIds = ActivityManagerNative.getDefault().getRunningUserIds(); + runningUserIds = ActivityManager.getService().getRunningUserIds(); } catch (RemoteException e) { // Running in system_server; should never happen throw new RuntimeException(e); @@ -4940,7 +4939,7 @@ public class AccountManagerService private int handleIncomingUser(int userId) { try { - return ActivityManagerNative.getDefault().handleIncomingUser( + return ActivityManager.getService().handleIncomingUser( Binder.getCallingPid(), Binder.getCallingUid(), userId, true, true, "", null); } catch (RemoteException re) { // Shouldn't happen, local. diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index eb5e60393526..da016da9fa59 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -25,7 +25,6 @@ import static android.os.Process.FIRST_APPLICATION_UID; import android.Manifest; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.NotificationManager; @@ -1706,7 +1705,7 @@ public class AudioService extends IAudioService.Stub { private int getCurrentUserId() { final long ident = Binder.clearCallingIdentity(); try { - UserInfo currentUser = ActivityManagerNative.getDefault().getCurrentUser(); + UserInfo currentUser = ActivityManager.getService().getCurrentUser(); return currentUser.id; } catch (RemoteException e) { // Activity manager not running, nothing we can do assume user 0. @@ -5124,7 +5123,7 @@ public class AudioService extends IAudioService.Stub { final long ident = Binder.clearCallingIdentity(); try { - ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.USER_ALL); + ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL); } finally { Binder.restoreCallingIdentity(ident); } @@ -5463,7 +5462,7 @@ public class AudioService extends IAudioService.Stub { } try { final int uid = pkg.applicationInfo.uid; - ActivityManagerNative.getDefault().killUid(UserHandle.getAppId(uid), + ActivityManager.getService().killUid(UserHandle.getAppId(uid), UserHandle.getUserId(uid), "killBackgroundUserProcessesWithAudioRecordPermission"); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java index 5772a57d79aa..8d4f0a925d8d 100644 --- a/services/core/java/com/android/server/clipboard/ClipboardService.java +++ b/services/core/java/com/android/server/clipboard/ClipboardService.java @@ -16,7 +16,7 @@ package com.android.server.clipboard; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.IActivityManager; @@ -71,7 +71,7 @@ public class ClipboardService extends SystemService { public ClipboardService(Context context) { super(context); - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); mPm = getContext().getPackageManager(); mUm = (IUserManager) ServiceManager.getService(Context.USER_SERVICE); mAppOps = (AppOpsManager) getContext().getSystemService(Context.APP_OPS_SERVICE); diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java index 07276298d66d..3b4cef4be3d3 100644 --- a/services/core/java/com/android/server/content/ContentService.java +++ b/services/core/java/com/android/server/content/ContentService.java @@ -20,7 +20,6 @@ import android.Manifest; import android.accounts.Account; import android.annotation.Nullable; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppOpsManager; import android.app.job.JobInfo; import android.content.BroadcastReceiver; @@ -434,7 +433,7 @@ public final class ContentService extends IContentService.Stub { private int checkUriPermission(Uri uri, int pid, int uid, int modeFlags, int userHandle) { try { - return ActivityManagerNative.getDefault().checkUriPermission( + return ActivityManager.getService().checkUriPermission( uri, pid, uid, modeFlags, userHandle, null); } catch (RemoteException e) { return PackageManager.PERMISSION_DENIED; diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java index 03d95b2c1903..11a3f1189129 100644 --- a/services/core/java/com/android/server/content/SyncManager.java +++ b/services/core/java/com/android/server/content/SyncManager.java @@ -21,7 +21,6 @@ import android.accounts.AccountAndUser; import android.accounts.AccountManager; import android.accounts.AccountManagerInternal; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.Notification; import android.app.NotificationManager; @@ -1020,7 +1019,7 @@ public class SyncManager { final int owningUid = syncAdapterInfo.uid; final String owningPackage = syncAdapterInfo.componentName.getPackageName(); try { - if (ActivityManagerNative.getDefault().getAppStartMode(owningUid, + if (ActivityManager.getService().getAppStartMode(owningUid, owningPackage) == ActivityManager.APP_START_MODE_DISABLED) { Slog.w(TAG, "Not scheduling job " + syncAdapterInfo.uid + ":" + syncAdapterInfo.componentName diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java index 49c414032023..273bc6484724 100644 --- a/services/core/java/com/android/server/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java @@ -19,7 +19,6 @@ package com.android.server.fingerprint; import android.Manifest; import android.app.ActivityManager; import android.app.ActivityManager.RunningAppProcessInfo; -import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.AppOpsManager; import android.app.PendingIntent; @@ -465,7 +464,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe private boolean isForegroundActivity(int uid, int pid) { try { List<RunningAppProcessInfo> procs = - ActivityManagerNative.getDefault().getRunningAppProcesses(); + ActivityManager.getService().getRunningAppProcesses(); int N = procs.size(); for (int i = 0; i < N; i++) { RunningAppProcessInfo proc = procs.get(i); @@ -1072,7 +1071,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe private void listenForUserSwitches() { try { - ActivityManagerNative.getDefault().registerUserSwitchObserver( + ActivityManager.getService().registerUserSwitchObserver( new SynchronousUserSwitchObserver() { @Override public void onUserSwitching(int newUserId) throws RemoteException { diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java index b8780992226e..c99d8be230d7 100644 --- a/services/core/java/com/android/server/job/JobSchedulerService.java +++ b/services/core/java/com/android/server/job/JobSchedulerService.java @@ -30,7 +30,6 @@ import java.util.List; import android.app.Activity; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.IUidObserver; import android.app.job.JobInfo; @@ -567,7 +566,7 @@ public final class JobSchedulerService extends com.android.server.SystemService String tag) { JobStatus jobStatus = JobStatus.createFromJobInfo(job, uId, packageName, userId, tag); try { - if (ActivityManagerNative.getDefault().getAppStartMode(uId, + if (ActivityManager.getService().getAppStartMode(uId, job.getService().getPackageName()) == ActivityManager.APP_START_MODE_DISABLED) { Slog.w(TAG, "Not scheduling job " + uId + ":" + job.toString() + " -- package not allowed to start"); @@ -816,7 +815,7 @@ public final class JobSchedulerService extends com.android.server.SystemService mBroadcastReceiver, UserHandle.ALL, userFilter, null, null); mPowerManager = (PowerManager)getContext().getSystemService(Context.POWER_SERVICE); try { - ActivityManagerNative.getDefault().registerUidObserver(mUidObserver, + ActivityManager.getService().registerUidObserver(mUidObserver, ActivityManager.UID_OBSERVER_PROCSTATE | ActivityManager.UID_OBSERVER_GONE | ActivityManager.UID_OBSERVER_IDLE, ActivityManager.PROCESS_STATE_UNKNOWN, null); @@ -1202,7 +1201,7 @@ public final class JobSchedulerService extends com.android.server.SystemService public void process(JobStatus job) { if (isReadyToBeExecutedLocked(job)) { try { - if (ActivityManagerNative.getDefault().getAppStartMode(job.getUid(), + if (ActivityManager.getService().getAppStartMode(job.getUid(), job.getJob().getService().getPackageName()) == ActivityManager.APP_START_MODE_DISABLED) { Slog.w(TAG, "Aborting job " + job.getUid() + ":" @@ -1376,7 +1375,7 @@ public final class JobSchedulerService extends com.android.server.SystemService int memLevel; try { - memLevel = ActivityManagerNative.getDefault().getMemoryTrimLevel(); + memLevel = ActivityManager.getService().getMemoryTrimLevel(); } catch (RemoteException e) { memLevel = ProcessStats.ADJ_MEM_FACTOR_NORMAL; } diff --git a/services/core/java/com/android/server/media/MediaResourceMonitorService.java b/services/core/java/com/android/server/media/MediaResourceMonitorService.java index 0eb8b55e417a..8ed32f09e23a 100644 --- a/services/core/java/com/android/server/media/MediaResourceMonitorService.java +++ b/services/core/java/com/android/server/media/MediaResourceMonitorService.java @@ -17,7 +17,6 @@ package com.android.server.media; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.content.Context; import android.content.Intent; import android.media.IMediaResourceMonitor; @@ -84,7 +83,7 @@ public class MediaResourceMonitorService extends SystemService { private String[] getPackageNamesFromPid(int pid) { try { for (ActivityManager.RunningAppProcessInfo proc : - ActivityManagerNative.getDefault().getRunningAppProcesses()) { + ActivityManager.getService().getRunningAppProcesses()) { if (proc.pid == pid) { return proc.pkgList; } diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java index 3327b36536d9..9740935ee20f 100644 --- a/services/core/java/com/android/server/media/MediaSessionStack.java +++ b/services/core/java/com/android/server/media/MediaSessionStack.java @@ -17,7 +17,6 @@ package com.android.server.media; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.media.session.MediaController.PlaybackInfo; import android.media.session.PlaybackState; import android.media.session.MediaSession; @@ -74,7 +73,7 @@ class MediaSessionStack { private static boolean isFromMostRecentApp(MediaSessionRecord record) { try { List<ActivityManager.RecentTaskInfo> tasks = - ActivityManagerNative.getDefault().getRecentTasks(1, + ActivityManager.getService().getRecentTasks(1, ActivityManager.RECENT_IGNORE_HOME_STACK_TASKS | ActivityManager.RECENT_IGNORE_UNAVAILABLE | ActivityManager.RECENT_INCLUDE_PROFILES | diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 90ede6ff2f03..a530b3d6b39d 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -50,7 +50,6 @@ import android.Manifest; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.AutomaticZenRule; @@ -600,7 +599,7 @@ public class NotificationManagerService extends SystemService { REASON_DELEGATE_ERROR, null); long ident = Binder.clearCallingIdentity(); try { - ActivityManagerNative.getDefault().crashApplication(uid, initialPid, pkg, + ActivityManager.getService().crashApplication(uid, initialPid, pkg, "Bad notification posted from package " + pkg + ": " + message); } catch (RemoteException e) { @@ -952,7 +951,7 @@ public class NotificationManagerService extends SystemService { Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE, DEFAULT_MAX_NOTIFICATION_ENQUEUE_RATE); - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); mAppOps = (AppOpsManager) getContext().getSystemService(Context.APP_OPS_SERVICE); mVibrator = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE); mAppUsageStats = LocalServices.getService(UsageStatsManagerInternal.class); diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 79ef4861ab65..a9d10dd542de 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -101,7 +101,6 @@ import android.Manifest; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.app.ResourcesManager; import android.app.admin.IDevicePolicyManager; @@ -4536,7 +4535,7 @@ public class PackageManagerService extends IPackageManager.Stub { private void killUid(int appId, int userId, String reason) { final long identity = Binder.clearCallingIdentity(); try { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); if (am != null) { try { am.killUid(appId, userId, reason); @@ -7260,7 +7259,7 @@ public class PackageManagerService extends IPackageManager.Stub { } if (!isFirstBoot() && dexOptDialogShown) { try { - ActivityManagerNative.getDefault().showBootMessage( + ActivityManager.getService().showBootMessage( mContext.getResources().getString( R.string.android_upgrading_fstrim), true); } catch (RemoteException e) { @@ -7347,7 +7346,7 @@ public class PackageManagerService extends IPackageManager.Stub { if (showDialog) { try { - ActivityManagerNative.getDefault().showBootMessage( + ActivityManager.getService().showBootMessage( mContext.getResources().getString(R.string.android_upgrading_apk, numberOfPackagesVisited, numberOfPackagesToDexopt), true); } catch (RemoteException e) { @@ -9695,7 +9694,7 @@ public class PackageManagerService extends IPackageManager.Stub { // version of the application while the new one gets installed. final long token = Binder.clearCallingIdentity(); try { - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); if (am != null) { try { am.killApplication(pkgName, appId, userId, reason); @@ -11587,7 +11586,7 @@ public class PackageManagerService extends IPackageManager.Stub { @Override public void run() { try { - final IActivityManager am = ActivityManagerNative.getDefault(); + final IActivityManager am = ActivityManager.getService(); if (am == null) return; final int[] resolvedUserIds; if (userIds == null) { @@ -11684,7 +11683,7 @@ public class PackageManagerService extends IPackageManager.Stub { } Intent intent = new Intent(PackageManager.ACTION_CLEAN_EXTERNAL_STORAGE); intent.setComponent(DEFAULT_CONTAINER_COMPONENT); - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); if (am != null) { try { am.startService(null, intent, null, mContext.getOpPackageName(), @@ -11834,7 +11833,7 @@ public class PackageManagerService extends IPackageManager.Stub { if (!mUserManagerInternal.isUserRunning(userId)) { return; } - final IActivityManager am = ActivityManagerNative.getDefault(); + final IActivityManager am = ActivityManager.getService(); try { // Deliver LOCKED_BOOT_COMPLETED first Intent lockedBcIntent = new Intent(Intent.ACTION_LOCKED_BOOT_COMPLETED) @@ -17125,7 +17124,7 @@ public class PackageManagerService extends IPackageManager.Stub { private void postPreferredActivityChangedBroadcast(int userId) { mHandler.post(() -> { - final IActivityManager am = ActivityManagerNative.getDefault(); + final IActivityManager am = ActivityManager.getService(); if (am == null) { return; } @@ -20790,7 +20789,7 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); } // kill any non-foreground processes so we restart them and // grant/revoke the GID. - final IActivityManager am = ActivityManagerNative.getDefault(); + final IActivityManager am = ActivityManager.getService(); if (am != null) { final long token = Binder.clearCallingIdentity(); try { diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index 5a0bee1e049b..7b877f777c19 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -21,7 +21,6 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.IUidObserver; import android.app.usage.UsageStatsManagerInternal; @@ -3669,7 +3668,7 @@ public class ShortcutService extends IShortcutService.Stub { @VisibleForTesting void injectRegisterUidObserver(IUidObserver observer, int which) { try { - ActivityManagerNative.getDefault().registerUidObserver(observer, which, + ActivityManager.getService().registerUidObserver(observer, which, ActivityManager.PROCESS_STATE_UNKNOWN, null); } catch (RemoteException shouldntHappen) { } diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 67488ce37d81..5b47b6f1da01 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -26,7 +26,6 @@ import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.IActivityManager; import android.app.IStopUserCallback; @@ -757,11 +756,11 @@ public class UserManagerService extends IUserManager.Stub { long identity = Binder.clearCallingIdentity(); try { if (enableQuietMode) { - ActivityManagerNative.getDefault().stopUser(userHandle, /* force */true, null); + ActivityManager.getService().stopUser(userHandle, /* force */true, null); LocalServices.getService(ActivityManagerInternal.class) .killForegroundAppsForUser(userHandle); } else { - ActivityManagerNative.getDefault().startUserInBackground(userHandle); + ActivityManager.getService().startUserInBackground(userHandle); } } catch (RemoteException e) { Slog.e(LOG_TAG, "fail to start/stop user for quiet mode", e); @@ -1414,7 +1413,7 @@ public class UserManagerService extends IUserManager.Stub { // First, invalidate all cached values. mCachedEffectiveUserRestrictions.clear(); - // We don't want to call into ActivityManagerNative while taking a lock, so we'll call + // We don't want to call into ActivityManagerService while taking a lock, so we'll call // it on a handler. final Runnable r = new Runnable() { @Override @@ -1422,9 +1421,9 @@ public class UserManagerService extends IUserManager.Stub { // Then get the list of running users. final int[] runningUsers; try { - runningUsers = ActivityManagerNative.getDefault().getRunningUserIds(); + runningUsers = ActivityManager.getService().getRunningUserIds(); } catch (RemoteException e) { - Log.w(LOG_TAG, "Unable to access ActivityManagerNative"); + Log.w(LOG_TAG, "Unable to access ActivityManagerService"); return; } // Then re-calculate the effective restrictions and apply, only for running users. @@ -2536,7 +2535,7 @@ public class UserManagerService extends IUserManager.Stub { if (DBG) Slog.i(LOG_TAG, "Stopping user " + userHandle); int res; try { - res = ActivityManagerNative.getDefault().stopUser(userHandle, /* force= */ true, + res = ActivityManager.getService().stopUser(userHandle, /* force= */ true, new IStopUserCallback.Stub() { @Override public void userStopped(int userId) { @@ -3259,7 +3258,7 @@ public class UserManagerService extends IUserManager.Stub { } private int runList(PrintWriter pw) throws RemoteException { - final IActivityManager am = ActivityManagerNative.getDefault(); + final IActivityManager am = ActivityManager.getService(); final List<UserInfo> users = getUsers(false); if (users == null) { pw.println("Error: couldn't get users"); diff --git a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java index 3df13a9c637f..9fe0922d3c87 100644 --- a/services/core/java/com/android/server/pm/UserRestrictionsUtils.java +++ b/services/core/java/com/android/server/pm/UserRestrictionsUtils.java @@ -23,7 +23,6 @@ import com.android.internal.util.Preconditions; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.content.ContentResolver; import android.content.Context; import android.os.Binder; @@ -411,7 +410,7 @@ public class UserRestrictionsUtils { int currentUser = ActivityManager.getCurrentUser(); if (currentUser != userId && userId != UserHandle.USER_SYSTEM) { try { - ActivityManagerNative.getDefault().stopUser(userId, false, null); + ActivityManager.getService().stopUser(userId, false, null); } catch (RemoteException e) { throw e.rethrowAsRuntimeException(); } diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java index 3bea663c6700..d4adcc4b8383 100644 --- a/services/core/java/com/android/server/policy/GlobalActions.java +++ b/services/core/java/com/android/server/policy/GlobalActions.java @@ -27,7 +27,6 @@ import com.android.internal.R; import com.android.internal.widget.LockPatternUtils; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.Context; @@ -434,7 +433,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac // Take an "interactive" bugreport. MetricsLogger.action(mContext, MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_INTERACTIVE); - ActivityManagerNative.getDefault().requestBugReport( + ActivityManager.getService().requestBugReport( ActivityManager.BUGREPORT_OPTION_INTERACTIVE); } catch (RemoteException e) { } @@ -452,7 +451,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac try { // Take a "full" bugreport. MetricsLogger.action(mContext, MetricsEvent.ACTION_BUGREPORT_FROM_POWER_MENU_FULL); - ActivityManagerNative.getDefault().requestBugReport( + ActivityManager.getService().requestBugReport( ActivityManager.BUGREPORT_OPTION_FULL); } catch (RemoteException e) { } @@ -592,7 +591,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac private UserInfo getCurrentUser() { try { - return ActivityManagerNative.getDefault().getCurrentUser(); + return ActivityManager.getService().getCurrentUser(); } catch (RemoteException re) { return null; } @@ -620,7 +619,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac + (isCurrentUser ? " \u2714" : "")) { public void onPress() { try { - ActivityManagerNative.getDefault().switchUser(user.id); + ActivityManager.getService().switchUser(user.id); } catch (RemoteException re) { Log.e(TAG, "Couldn't switch user " + re); } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 396c958542c8..1f302e3631e4 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -114,7 +114,6 @@ import android.app.ActivityManager; import android.app.ActivityManager.StackId; import android.app.ActivityManagerInternal; import android.app.ActivityManagerInternal.SleepToken; -import android.app.ActivityManagerNative; import android.app.AppOpsManager; import android.app.IUiModeManager; import android.app.ProgressDialog; @@ -3943,7 +3942,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { public void onKeyguardExitResult(boolean success) { if (success) { try { - ActivityManagerNative.getDefault().stopAppSwitches(); + ActivityManager.getService().stopAppSwitches(); } catch (RemoteException e) { } sendCloseSystemWindows(SYSTEM_DIALOG_REASON_HOME_KEY); @@ -3957,7 +3956,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { // no keyguard stuff to worry about, just launch home! try { - ActivityManagerNative.getDefault().stopAppSwitches(); + ActivityManager.getService().stopAppSwitches(); } catch (RemoteException e) { } if (mRecentsVisible) { @@ -7340,7 +7339,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (false) { // This code always brings home to the front. try { - ActivityManagerNative.getDefault().stopAppSwitches(); + ActivityManager.getService().stopAppSwitches(); } catch (RemoteException e) { } sendCloseSystemWindows(); @@ -7353,11 +7352,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { /// Roll back EndcallBehavior as the cupcake design to pass P1 lab entry. Log.d(TAG, "UTS-TEST-MODE"); } else { - ActivityManagerNative.getDefault().stopAppSwitches(); + ActivityManager.getService().stopAppSwitches(); sendCloseSystemWindows(); Intent dock = createHomeDockIntent(); if (dock != null) { - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivityAsUser(null, null, dock, dock.resolveTypeIfNeeded(mContext.getContentResolver()), null, null, 0, @@ -7368,7 +7367,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } } - int result = ActivityManagerNative.getDefault() + int result = ActivityManager.getService() .startActivityAsUser(null, null, mHomeIntent, mHomeIntent.resolveTypeIfNeeded(mContext.getContentResolver()), null, null, 0, diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index ca641fbf9234..f37f98786fed 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -1,6 +1,6 @@ package com.android.server.policy.keyguard; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -194,7 +194,7 @@ public class KeyguardServiceDelegate { mKeyguardState.reset(); mHandler.post(() -> { try { - ActivityManagerNative.getDefault().setLockScreenShown(true); + ActivityManager.getService().setLockScreenShown(true); } catch (RemoteException e) { // Local call. } diff --git a/services/core/java/com/android/server/power/Notifier.java b/services/core/java/com/android/server/power/Notifier.java index 00700b86d4e8..b215998de222 100644 --- a/services/core/java/com/android/server/power/Notifier.java +++ b/services/core/java/com/android/server/power/Notifier.java @@ -25,7 +25,6 @@ import com.android.internal.app.IBatteryStats; import com.android.server.EventLogTags; import com.android.server.LocalServices; -import android.app.ActivityManagerNative; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; diff --git a/services/core/java/com/android/server/search/SearchManagerService.java b/services/core/java/com/android/server/search/SearchManagerService.java index f3b9b18e6c5e..b5aa4a949241 100644 --- a/services/core/java/com/android/server/search/SearchManagerService.java +++ b/services/core/java/com/android/server/search/SearchManagerService.java @@ -17,7 +17,6 @@ package com.android.server.search; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.IActivityManager; import android.app.ISearchManager; @@ -306,7 +305,7 @@ public class SearchManagerService extends ISearchManager.Stub { try { Intent intent = new Intent(Intent.ACTION_ASSIST); intent.setComponent(comp); - IActivityManager am = ActivityManagerNative.getDefault(); + IActivityManager am = ActivityManager.getService(); return am.launchAssistIntent(intent, ActivityManager.ASSIST_CONTEXT_BASIC, hint, userHandle, args); } catch (RemoteException e) { diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index 62f54685a090..9d02940e21a5 100644 --- a/services/core/java/com/android/server/trust/TrustManagerService.java +++ b/services/core/java/com/android/server/trust/TrustManagerService.java @@ -26,7 +26,6 @@ import org.xmlpull.v1.XmlPullParserException; import android.Manifest; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.admin.DevicePolicyManager; import android.app.trust.ITrustListener; import android.app.trust.ITrustManager; @@ -868,7 +867,7 @@ public class TrustManagerService extends SystemService { } if (locked) { try { - ActivityManagerNative.getDefault().notifyLockedProfile(userId); + ActivityManager.getService().notifyLockedProfile(userId); } catch (RemoteException e) { } } diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 96662b5b28c3..3645c24043ca 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -26,7 +26,6 @@ import static android.view.Display.DEFAULT_DISPLAY; import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.IWallpaperManager; @@ -959,7 +958,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { }, shutdownFilter); try { - ActivityManagerNative.getDefault().registerUserSwitchObserver( + ActivityManager.getService().registerUserSwitchObserver( new UserSwitchObserver() { @Override public void onUserSwitching(int newUserId, IRemoteCallback reply) { diff --git a/services/core/java/com/android/server/webkit/SystemImpl.java b/services/core/java/com/android/server/webkit/SystemImpl.java index 302f9f6c98ba..61319cf1e30e 100644 --- a/services/core/java/com/android/server/webkit/SystemImpl.java +++ b/services/core/java/com/android/server/webkit/SystemImpl.java @@ -16,7 +16,7 @@ package com.android.server.webkit; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.AppGlobals; import android.content.Context; import android.content.pm.ApplicationInfo; @@ -200,7 +200,7 @@ public class SystemImpl implements SystemInterface { @Override public void killPackageDependents(String packageName) { try { - ActivityManagerNative.getDefault().killPackageDependents(packageName, + ActivityManager.getService().killPackageDependents(packageName, UserHandle.USER_ALL); } catch (RemoteException e) { } diff --git a/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java b/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java index 7cb6fc3b5430..70478fe677ed 100644 --- a/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java +++ b/services/core/java/com/android/server/wm/DragAndDropPermissionsHandler.java @@ -16,7 +16,7 @@ package com.android.server.wm; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.content.ClipData; import android.net.Uri; import android.os.Binder; @@ -61,7 +61,7 @@ class DragAndDropPermissionsHandler extends IDragAndDropPermissions.Stub mActivityToken = activityToken; // Will throw if Activity is not found. - IBinder permissionOwner = ActivityManagerNative.getDefault(). + IBinder permissionOwner = ActivityManager.getService(). getUriPermissionOwnerForActivity(mActivityToken); doTake(permissionOwner); @@ -71,7 +71,7 @@ class DragAndDropPermissionsHandler extends IDragAndDropPermissions.Stub long origId = Binder.clearCallingIdentity(); try { for (int i = 0; i < mUris.size(); i++) { - ActivityManagerNative.getDefault().grantUriPermissionFromOwner( + ActivityManager.getService().grantUriPermissionFromOwner( permissionOwner, mSourceUid, mTargetPackage, mUris.get(i), mMode, mSourceUserId, mTargetUserId); } @@ -85,7 +85,7 @@ class DragAndDropPermissionsHandler extends IDragAndDropPermissions.Stub if (mActivityToken != null || mPermissionOwnerToken != null) { return; } - mPermissionOwnerToken = ActivityManagerNative.getDefault().newUriPermissionOwner("drop"); + mPermissionOwnerToken = ActivityManager.getService().newUriPermissionOwner("drop"); mTransientToken = transientToken; mTransientToken.linkToDeath(this, 0); @@ -101,7 +101,7 @@ class DragAndDropPermissionsHandler extends IDragAndDropPermissions.Stub IBinder permissionOwner = null; if (mActivityToken != null) { try { - permissionOwner = ActivityManagerNative.getDefault(). + permissionOwner = ActivityManager.getService(). getUriPermissionOwnerForActivity(mActivityToken); } catch (Exception e) { // Activity is destroyed, permissions already revoked. @@ -117,7 +117,7 @@ class DragAndDropPermissionsHandler extends IDragAndDropPermissions.Stub } for (int i = 0; i < mUris.size(); ++i) { - ActivityManagerNative.getDefault().revokeUriPermissionFromOwner( + ActivityManager.getService().revokeUriPermissionFromOwner( permissionOwner, mUris.get(i), mMode, mSourceUserId); } } diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java index a8eb75c3ef9c..12c72e9e0795 100644 --- a/services/core/java/com/android/server/wm/InputMonitor.java +++ b/services/core/java/com/android/server/wm/InputMonitor.java @@ -26,7 +26,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_INPUT; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_TASK_POSITIONING; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.graphics.Rect; import android.os.Debug; import android.os.Looper; @@ -252,7 +252,7 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { try { // Notify the activity manager about the timeout and let it decide whether // to abort dispatching or keep waiting. - long timeout = ActivityManagerNative.getDefault().inputDispatchingTimedOut( + long timeout = ActivityManager.getService().inputDispatchingTimedOut( windowState.mSession.mPid, aboveSystem, reason); if (timeout >= 0) { // The activity manager declined to abort dispatching. diff --git a/services/core/java/com/android/server/wm/KeyguardDisableHandler.java b/services/core/java/com/android/server/wm/KeyguardDisableHandler.java index 377071d4c46b..2eb186b5973f 100644 --- a/services/core/java/com/android/server/wm/KeyguardDisableHandler.java +++ b/services/core/java/com/android/server/wm/KeyguardDisableHandler.java @@ -19,7 +19,7 @@ package com.android.server.wm; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.Handler; @@ -101,7 +101,7 @@ public class KeyguardDisableHandler extends Handler { if (dpm != null) { try { mAllowDisableKeyguard = dpm.getPasswordQuality(null, - ActivityManagerNative.getDefault().getCurrentUser().id) + ActivityManager.getService().getCurrentUser().id) == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED ? ALLOW_DISABLE_YES : ALLOW_DISABLE_NO; } catch (RemoteException re) { diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c4c4bcd7da0f..518e55b0fbf7 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -23,7 +23,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppOpsManager; import android.app.IActivityManager; import android.app.Notification; @@ -1018,7 +1017,7 @@ public class WindowManagerService extends IWindowManager.Stub mBoundsAnimationController = new BoundsAnimationController(mAppTransition, UiThread.getHandler()); - mActivityManager = ActivityManagerNative.getDefault(); + mActivityManager = ActivityManager.getService(); mAmInternal = LocalServices.getService(ActivityManagerInternal.class); mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE); AppOpsManager.OnOpChangedInternalListener opListener = diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 7e684476cf0a..8bb8915e56c8 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -38,7 +38,6 @@ import android.annotation.Nullable; import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AlarmManager; import android.app.AppGlobals; import android.app.IActivityManager; @@ -1460,7 +1459,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } IActivityManager getIActivityManager() { - return ActivityManagerNative.getDefault(); + return ActivityManager.getService(); } IPackageManager getIPackageManager() { @@ -5524,7 +5523,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { final long callingIdentity = mInjector.binderClearCallingIdentity(); try { - ActivityManagerNative.getDefault().requestBugReport( + ActivityManager.getService().requestBugReport( ActivityManager.BUGREPORT_OPTION_REMOTE); mRemoteBugreportServiceIsActive.set(true); diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java index 6558b6e2bbf5..d7666d91b6c3 100644 --- a/services/print/java/com/android/server/print/PrintManagerService.java +++ b/services/print/java/com/android/server/print/PrintManagerService.java @@ -22,7 +22,6 @@ import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING; import android.Manifest; import android.annotation.NonNull; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -915,7 +914,7 @@ public final class PrintManagerService extends SystemService { private int resolveCallingUserEnforcingPermissions(int userId) { try { - return ActivityManagerNative.getDefault().handleIncomingUser(Binder.getCallingPid(), + return ActivityManager.getService().handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, true, true, "", null); } catch (RemoteException re) { // Shouldn't happen, local. diff --git a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java index 7c7c299710f0..785c3fa7ed5b 100644 --- a/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java +++ b/services/retaildemo/java/com/android/server/retaildemo/RetailDemoModeService.java @@ -17,8 +17,8 @@ package com.android.server.retaildemo; import android.Manifest; +import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.Notification; import android.app.NotificationManager; @@ -591,7 +591,7 @@ public class RetailDemoModeService extends SystemService { void switchUser(int userId) { if (mAms == null) { - mAms = (ActivityManagerService) ActivityManagerNative.getDefault(); + mAms = (ActivityManagerService) ActivityManager.getService(); } mAms.switchUser(userId); } diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java index bd9e6d19269b..ba25b1659bd2 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityManagerTest.java @@ -17,7 +17,6 @@ package com.android.server.am; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.os.ServiceManager; import android.os.UserHandle; @@ -32,7 +31,7 @@ public class ActivityManagerTest extends AndroidTestCase { @Override public void setUp() throws Exception { super.setUp(); - service = ActivityManagerNative.getDefault(); + service = ActivityManager.getService(); } public void testTaskIdsForRunningUsers() throws RemoteException { @@ -52,4 +51,4 @@ public class ActivityManagerTest extends AndroidTestCase { } } } -}
\ No newline at end of file +} diff --git a/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java b/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java index c9c691d1dbd3..0359096892bb 100644 --- a/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java +++ b/services/tests/servicestests/src/com/android/server/am/TaskStackChangedListenerTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.app.Activity; +import android.app.ActivityManager; import android.app.ActivityManager.TaskDescription; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.app.ITaskStackListener; import android.app.Instrumentation.ActivityMonitor; @@ -63,7 +63,7 @@ public class TaskStackChangedListenerTest { @Before public void setUp() throws Exception { - mService = ActivityManagerNative.getDefault(); + mService = ActivityManager.getService(); } @After diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 04104b5c70d7..7217c3b973ec 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -17,7 +17,7 @@ package com.android.server.usage; import android.Manifest; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.AppGlobals; import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; @@ -462,7 +462,7 @@ public class UsageStatsService extends SystemService implements final int[] runningUserIds; try { - runningUserIds = ActivityManagerNative.getDefault().getRunningUserIds(); + runningUserIds = ActivityManager.getService().getRunningUserIds(); if (checkUserId != UserHandle.USER_ALL && !ArrayUtils.contains(runningUserIds, checkUserId)) { return false; @@ -1311,7 +1311,7 @@ public class UsageStatsService extends SystemService implements @Override public boolean isAppInactive(String packageName, int userId) { try { - userId = ActivityManagerNative.getDefault().handleIncomingUser(Binder.getCallingPid(), + userId = ActivityManager.getService().handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(), userId, false, true, "isAppInactive", null); } catch (RemoteException re) { throw re.rethrowFromSystemServer(); @@ -1329,7 +1329,7 @@ public class UsageStatsService extends SystemService implements public void setAppInactive(String packageName, boolean idle, int userId) { final int callingUid = Binder.getCallingUid(); try { - userId = ActivityManagerNative.getDefault().handleIncomingUser( + userId = ActivityManager.getService().handleIncomingUser( Binder.getCallingPid(), callingUid, userId, false, true, "setAppIdle", null); } catch (RemoteException re) { diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java index a46ccee0b96d..4357dca73fbf 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java @@ -18,7 +18,6 @@ package com.android.server.voiceinteraction; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.content.BroadcastReceiver; import android.content.ComponentName; @@ -117,7 +116,7 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne mServiceStub = stub; mUser = userHandle; mComponent = service; - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); VoiceInteractionServiceInfo info; try { info = new VoiceInteractionServiceInfo(context.getPackageManager(), service, mUser); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java index 7dacf160ce4f..4267ec4ea98c 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java @@ -17,7 +17,6 @@ package com.android.server.voiceinteraction; import android.app.ActivityManager; -import android.app.ActivityManagerNative; import android.app.AppOpsManager; import android.app.IActivityManager; import android.app.assist.AssistContent; @@ -182,7 +181,7 @@ final class VoiceInteractionSessionConnection implements ServiceConnection { mCallback = callback; mCallingUid = callingUid; mHandler = handler; - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); mIWindowManager = IWindowManager.Stub.asInterface( ServiceManager.getService(Context.WINDOW_SERVICE)); mAppOps = context.getSystemService(AppOpsManager.class); diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java index f5f7ea3895d7..0aa20ef85e8a 100644 --- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java +++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java @@ -19,7 +19,6 @@ import java.io.OutputStreamWriter; import android.accounts.Account; import android.accounts.AccountManager; -import android.app.ActivityManagerNative; import android.app.ActivityManager; import android.app.ActivityManager.ProcessErrorStateInfo; import android.content.Context; @@ -144,7 +143,7 @@ public class AppLaunch extends InstrumentationTestCase { InstrumentationTestRunner instrumentation = (InstrumentationTestRunner)getInstrumentation(); Bundle args = instrumentation.getArguments(); - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); String launchDirectory = args.getString(KEY_LAUNCH_DIRECTORY); mTraceDirectoryStr = args.getString(KEY_TRACE_DIRECTORY); mDropCache = Boolean.parseBoolean(args.getString(KEY_DROP_CACHE)); diff --git a/tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java b/tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java index b65913515ced..7a4fddf7312b 100644 --- a/tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java +++ b/tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java @@ -17,7 +17,6 @@ package com.android.imftest.samples; import android.app.Activity; -import android.app.ActivityManagerNative; import android.os.Bundle; import android.os.RemoteException; import android.provider.MediaStore; diff --git a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java index a7e3bece6e63..1ae318a96a50 100644 --- a/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java +++ b/tests/MemoryUsage/src/com/android/tests/memoryusage/MemoryUsageTest.java @@ -18,7 +18,6 @@ package com.android.tests.memoryusage; import android.app.ActivityManager; import android.app.ActivityManager.ProcessErrorStateInfo; import android.app.ActivityManager.RunningAppProcessInfo; -import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.app.UiAutomation; import android.content.Context; @@ -84,7 +83,7 @@ public class MemoryUsageTest extends InstrumentationTestCase { MemoryUsageInstrumentation instrumentation = (MemoryUsageInstrumentation) getInstrumentation(); Bundle args = instrumentation.getBundle(); - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); createMappings(); parseArgs(args); diff --git a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java index d7f4a38f7644..89bd8d8f1dd4 100644 --- a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java @@ -16,7 +16,7 @@ package com.android.framework.permission.tests; -import android.app.ActivityManagerNative; +import android.app.ActivityManager; import android.app.IActivityManager; import android.content.res.Configuration; import android.os.RemoteException; @@ -33,7 +33,7 @@ public class ActivityManagerPermissionTests extends TestCase { @Override protected void setUp() throws Exception { super.setUp(); - mAm = ActivityManagerNative.getDefault(); + mAm = ActivityManager.getService(); } @SmallTest |