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

Commit 33a07e95 authored by Raphael Kim's avatar Raphael Kim Committed by Automerger Merge Worker
Browse files

Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am: 06258e35 am: dfcc4cb6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19066676



Change-Id: Ie6f10d185fad23427e98b9ca32c04342608aa0db
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9be60c33 dfcc4cb6

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ import com.android.server.companion.datatransfer.SystemDataTransferRequestStore; 
import com.android.server.companion.presence.CompanionDevicePresenceMonitor;

import com.android.server.companion.securechannel.CompanionSecureCommunicationsManager;

import com.android.server.pm.UserManagerInternal;

import com.android.server.wm.ActivityTaskManagerInternal;



import java.io.File;

import java.io.FileDescriptor;
@@ -154,6 +155,7 @@ public class CompanionDeviceManagerService extends SystemService { 
    private CompanionApplicationController mCompanionAppController;

    private CompanionSecureCommunicationsManager mSecureCommsManager;



    private final ActivityTaskManagerInternal mAtmInternal;

    private final ActivityManagerInternal mAmInternal;

    private final IAppOpsService mAppOpsManager;

    private final PowerWhitelistManager mPowerWhitelistManager;
@@ -206,6 +208,7 @@ public class CompanionDeviceManagerService extends SystemService { 
        mPowerWhitelistManager = context.getSystemService(PowerWhitelistManager.class);

        mAppOpsManager = IAppOpsService.Stub.asInterface(

                ServiceManager.getService(Context.APP_OPS_SERVICE));

        mAtmInternal = LocalServices.getService(ActivityTaskManagerInternal.class);

        mAmInternal = LocalServices.getService(ActivityManagerInternal.class);

        mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class);

        mUserManager = context.getSystemService(UserManager.class);
@@ -1260,6 +1263,9 @@ public class CompanionDeviceManagerService extends SystemService { 
                companionAppUids.add(uid);

            }

        }

        if (mAtmInternal != null) {

            mAtmInternal.setCompanionAppUids(userId, companionAppUids);

        }

        if (mAmInternal != null) {

            // Make a copy of the set and send it to ActivityManager.

            mAmInternal.setCompanionAppUids(userId, new ArraySet<>(companionAppUids));