diff options
| author | Raphael Kim <raphk@google.com> | 2022-06-24 12:08:35 -0700 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-29 00:03:41 +0000 |
| commit | 6c95f48d4b139fb453fbd8572e5db193025df0f9 (patch) | |
| tree | 18e4c222e222670a9de5eddbd267137084b4e27d | |
| parent | 27cae49f7eecfea15240748852cc1a220e1009cb (diff) | |
| download | base-6c95f48d4b139fb453fbd8572e5db193025df0f9.tar.gz | |
Re-introduce ActivityTaskManager in CdmService
Bug: 237039176
Test: Manually tested by reporter
Change-Id: I2b61b6f88b5dc772d2b4333aa23fcae22c4eee9a
(cherry picked from commit e4c67f63e88f0e37d64d7fd1a489086d2f937163)
Merged-In: I2b61b6f88b5dc772d2b4333aa23fcae22c4eee9a
| -rw-r--r-- | services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index 3f7cba6a4d09..2714addaec9e 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -100,6 +100,7 @@ import com.android.server.LocalServices; import com.android.server.SystemService; import com.android.server.companion.presence.CompanionDevicePresenceMonitor; import com.android.server.pm.UserManagerInternal; +import com.android.server.wm.ActivityTaskManagerInternal; import java.io.File; import java.io.FileDescriptor; @@ -135,6 +136,7 @@ public class CompanionDeviceManagerService extends SystemService { private CompanionDevicePresenceMonitor mDevicePresenceMonitor; private CompanionApplicationController mCompanionAppController; + private final ActivityTaskManagerInternal mAtmInternal; private final ActivityManagerInternal mAmInternal; private final IAppOpsService mAppOpsManager; private final PowerWhitelistManager mPowerWhitelistManager; @@ -159,6 +161,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); @@ -969,6 +972,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)); |