diff options
| author | Mario Bertschler <bmario@google.com> | 2017-05-15 17:48:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-15 17:48:57 +0000 |
| commit | 375f8a15a85c88e6e8a8b800e771b5f5005c8ded (patch) | |
| tree | 94adfed0589a0e555c491058f368b44d75bcdf47 | |
| parent | e7bcee62b14a2a042bd67cc7386904eb5d9c3e0c (diff) | |
| parent | b0b30d23c090bbeeb7399e9d8ae87232122a128d (diff) | |
| download | android_packages_apps_Trebuchet-375f8a15a85c88e6e8a8b800e771b5f5005c8ded.tar.gz android_packages_apps_Trebuchet-375f8a15a85c88e6e8a8b800e771b5f5005c8ded.tar.bz2 android_packages_apps_Trebuchet-375f8a15a85c88e6e8a8b800e771b5f5005c8ded.zip | |
Merge "Fixes a bug in verifying the validity of a session info." into ub-launcher3-dorval-polish
am: b0b30d23c0
Change-Id: I7d521d877c81fdd35b20910bc73143696bc92a76
| -rw-r--r-- | src/com/android/launcher3/compat/PackageInstallerCompatVL.java | 5 |
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(); |