Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c329ea3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update usage of ActivityManagerNative."

parents be12db58 dc589ac8

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTest.java

+2 −3
Original line number Diff line number Diff line
@@ -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 {

cmds/am/src/com/android/commands/am/Am.java

+1 −2
Original line number Diff line number Diff line
@@ -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?");

cmds/content/src/com/android/commands/content/Content.java

+2 −2
Original line number Diff line number Diff line
@@ -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 {

cmds/dpm/src/com/android/commands/dpm/Dpm.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {

cmds/pm/src/com/android/commands/pm/Pm.java

+1 −2
Original line number Diff line number Diff line
@@ -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 {