PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing crash when using multi-window" into udc-qpr-dev

Browse Source
This commit is contained in:
Sunny Goyal
2023-07-07 03:16:13 +00:00
committed by Android (Google) Code Review
parent 6a925d0769 90bf1f4298
commit 229b2efbae
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/InstantAppResolverImpl.java
+8 -4
View File
@@ -16,12 +16,12 @@
package com.android.quickstep; package com.android.quickstep;
import android.app.ActivityThread;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.RemoteException; import android.os.Process;
import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import com.android.launcher3.model.data.AppInfo; import com.android.launcher3.model.data.AppInfo;
@@ -55,9 +55,13 @@ public class InstantAppResolverImpl extends InstantAppResolver {
@Override @Override
public boolean isInstantApp(String packageName, int userId) { 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 { try {
return ActivityThread.getPackageManager().isInstantApp(packageName, userId); return mPM.isInstantApp(packageName);
} catch (RemoteException e) { } catch (Exception e) {
Log.e(TAG, "Failed to determine whether package is instant app " + packageName, e); Log.e(TAG, "Failed to determine whether package is instant app " + packageName, e);
return false; return false;
} }