commit 7d9d361da52b05c45d1d50fe323589707394fba9
author Keun young Park <keunyoung@google.com> Wed Feb 19 19:17:21 2020 -0800
committer Keun-young Park <keunyoung@google.com> Fri Feb 28 16:40:29 2020 +0000
tree 83c004b2142ecd4e732e274facab86703d1064c0
parent 31702a6887739e184c83bc36be45ace4f464c3ec

Finish all fixed Activities when user is switched

- Cluster in pi-car has no system UI and can render screen for old user for
  long time. This brings unnecessary overhead to system.
- Old user's app should be stopped immediately.
- Also launch full screen dialog until something else is launched. The dialog
  is dismissed when a new fixed activity is launched on the display.

Bug: 148429860
Test: Do user switching and check cluster screen with maps mode

Change-Id: If64bc8efa7eb5ea273404e2fba886662a6cef29a
(cherry picked from commit 4e1f5d27eeb6e0a4ee105deae801cd9fb0556370)

service/src/com/android/car/am/FixedActivityService.java

diff --git a/service/src/com/android/car/am/FixedActivityService.java b/service/src/com/android/car/am/FixedActivityService.java
index d3e3c6f..abb1eca 100644
--- a/service/src/com/android/car/am/FixedActivityService.java
+++ b/service/src/com/android/car/am/FixedActivityService.java
@@ -28,6 +28,7 @@
 import android.app.ActivityOptions;
 import android.app.IActivityManager;
 import android.app.IProcessObserver;
+import android.app.Presentation;
 import android.app.TaskStackListener;
 import android.car.hardware.power.CarPowerManager;
 import android.content.BroadcastReceiver;
@@ -38,6 +39,7 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.hardware.display.DisplayManager;
 import android.net.Uri;
 import android.os.HandlerThread;
 import android.os.RemoteException;
@@ -50,6 +52,8 @@
 
 import com.android.car.CarLocalServices;
 import com.android.car.CarServiceBase;
+import com.android.car.CarServiceUtils;
+import com.android.car.R;
 import com.android.car.user.CarUserService;
 import com.android.internal.annotations.GuardedBy;
 
@@ -122,6 +126,8 @@
 
     private final IActivityManager mAm;
 
+    private final DisplayManager mDm;
+
     private final UserManager mUm;
 
     private final CarUserService.UserCallback mUserCallback = new CarUserService.UserCallback() {
@@ -240,6 +246,9 @@
             new SparseArray<>(/* capacity= */ 1); // default to one cluster only case
 
     @GuardedBy("mLock")
+    private final SparseArray<Presentation> mBlockingPresentations = new SparseArray<>(1);
+
+    @GuardedBy("mLock")
     private boolean mEventMonitoringActive;
 
     @GuardedBy("mLock")
@@ -262,6 +271,7 @@
         mContext = context;
         mAm = ActivityManager.getService();
         mUm = context.getSystemService(UserManager.class);
+        mDm = context.getSystemService(DisplayManager.class);
         mHandlerThread.start();
     }
 
@@ -377,8 +387,38 @@
                 }
                 return false;
             }
-            for (int i = 0; i < mRunningActivities.size(); i++) {
-                mRunningActivities.valueAt(i).isVisible = false;
+            for (int i = mRunningActivities.size() - 1; i >= 0; i--) {
+                RunningActivityInfo activityInfo = mRunningActivities.valueAt(i);
+                activityInfo.isVisible = false;
+                if (isUserAllowedToLaunchActivity(activityInfo.userId)) {
+                    continue;
+                }
+                final int displayIdForActivity = mRunningActivities.keyAt(i);
+                if (activityInfo.taskId != INVALID_TASK_ID) {
+                    Log.i(TAG_AM, "Finishing fixed activity on user switching:"
+                            + activityInfo);
+                    try {
+                        mAm.removeTask(activityInfo.taskId);
+                    } catch (RemoteException e) {
+                        Log.e(TAG_AM, "remote exception from AM", e);
+                    }
+                    CarServiceUtils.runOnMain(() -> {
+                        Display display = mDm.getDisplay(displayIdForActivity);
+                        if (display == null) {
+                            Log.e(TAG_AM, "Display not available, cannot launnch window:"
+                                    + displayIdForActivity);
+                            return;
+                        }
+                        Presentation p = new Presentation(mContext, display,
+                                android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+                        p.setContentView(R.layout.activity_continuous_blank);
+                        p.show();
+                        synchronized (mLock) {
+                            mBlockingPresentations.append(displayIdForActivity, p);
+                        }
+                    });
+                }
+                mRunningActivities.removeAt(i);
             }
             for (StackInfo stackInfo : infos) {
                 RunningActivityInfo activityInfo = mRunningActivities.get(stackInfo.displayId);
@@ -407,6 +447,7 @@
                     activityInfo.taskId = INVALID_TASK_ID;
                 }
             }
+
             for (int i = 0; i < mRunningActivities.size(); i++) {
                 RunningActivityInfo activityInfo = mRunningActivities.valueAt(i);
                 long timeSinceLastLaunchMs = now - activityInfo.lastLaunchTimeMs;
@@ -417,7 +458,6 @@
                     continue;
                 }
                 if (!isComponentAvailable(activityInfo.intent.getComponent(),
-                        activityInfo.userId) || !isUserAllowedToLaunchActivity(
                         activityInfo.userId)) {
                     continue;
                 }
@@ -556,6 +596,10 @@
         }
         boolean startMonitoringEvents = false;
         synchronized (mLock) {
+            Presentation p = mBlockingPresentations.removeReturnOld(displayId);
+            if (p != null) {
+                p.dismiss();
+            }
             if (mRunningActivities.size() == 0) {
                 startMonitoringEvents = true;
             }