commit 33a07e958217875bad7074f24e4299404e76ff1e
author Raphael Kim <raphk@google.com> Tue Jun 28 19:05:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 28 19:05:14 2022 +0000
tree 8ff71323e94a6505ef0d347343a5065ea88939e2
parent 9be60c334e6a2ff45d673a3edeedc9c4424f8e2d
parent dfcc4cb64314e0c18c3e1f34c0a80bf491a03277

Merge "Re-introduce ActivityTaskManager in CdmService" into tm-dev am: 06258e35ce am: dfcc4cb643

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

Change-Id: Ie6f10d185fad23427e98b9ca32c04342608aa0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
index c7bd3a7..90c4002 100644
--- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
+++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
@@ -111,6 +111,7 @@
 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 @@
     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 @@
         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 @@
                 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));