summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-05-15 17:42:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-15 17:42:23 +0000
commitb0b30d23c090bbeeb7399e9d8ae87232122a128d (patch)
treea86eb6b04dc17704e4e94e6b234cfd0e05280ff0 /src
parent4e16c2e7b92baf366a1426fb247e98016d650f33 (diff)
parent6d696f8d7c4ce933eaea4e8d86270ef6a1fc07c3 (diff)
downloadandroid_packages_apps_Trebuchet-b0b30d23c090bbeeb7399e9d8ae87232122a128d.tar.gz
android_packages_apps_Trebuchet-b0b30d23c090bbeeb7399e9d8ae87232122a128d.tar.bz2
android_packages_apps_Trebuchet-b0b30d23c090bbeeb7399e9d8ae87232122a128d.zip
Merge "Fixes a bug in verifying the validity of a session info." into ub-launcher3-dorval-polish
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/compat/PackageInstallerCompatVL.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
index bbf154629..1ffd3da01 100644
--- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
+++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
@@ -24,6 +24,7 @@ import android.content.pm.PackageInstaller.SessionInfo;
import android.os.Handler;
import android.os.Process;
import android.os.UserHandle;
+import android.text.TextUtils;
import android.util.SparseArray;
import com.android.launcher3.IconCache;
@@ -151,7 +152,9 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
};
private PackageInstaller.SessionInfo verify(PackageInstaller.SessionInfo sessionInfo) {
- if (sessionInfo == null || sessionInfo.getInstallerPackageName() == null) {
+ if (sessionInfo == null
+ || sessionInfo.getInstallerPackageName() == null
+ || TextUtils.isEmpty(sessionInfo.getAppPackageName())) {
return null;
}
String pkg = sessionInfo.getInstallerPackageName();