Fixing crash when using multi-window
Bug: 290170868
Test: Verified on device
Flg: N/A
Change-Id: If9129a3a47d651755cc99dfcfc0e9be69c2ca63c
diff --git a/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java b/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java
index 529213c..33a2366 100644
--- a/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java
+++ b/quickstep/src/com/android/quickstep/InstantAppResolverImpl.java
@@ -16,12 +16,12 @@
package com.android.quickstep;
-import android.app.ActivityThread;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import android.os.RemoteException;
+import android.os.Process;
+import android.os.UserHandle;
import android.util.Log;
import com.android.launcher3.model.data.AppInfo;
@@ -55,9 +55,13 @@
@Override
public boolean isInstantApp(String packageName, int userId) {
+ if (!Process.myUserHandle().equals(UserHandle.of(userId))) {
+ // Instant app can only exist on current user
+ return false;
+ }
try {
- return ActivityThread.getPackageManager().isInstantApp(packageName, userId);
- } catch (RemoteException e) {
+ return mPM.isInstantApp(packageName);
+ } catch (Exception e) {
Log.e(TAG, "Failed to determine whether package is instant app " + packageName, e);
return false;
}