summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2014-09-17 20:46:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-17 20:46:27 +0000
commit3fcb2c75055ad423094c6bb1c980b34a3dfd5a69 (patch)
tree943d414f87152ff935fe004f8e382b0b17c87246
parent7b0982d819b2baf5e4061f5d64a6b7b3da459e7f (diff)
parent136882c1950da1e5f0a24a8b6807b186a3297d8e (diff)
downloadandroid_packages_apps_Trebuchet-3fcb2c75055ad423094c6bb1c980b34a3dfd5a69.tar.gz
android_packages_apps_Trebuchet-3fcb2c75055ad423094c6bb1c980b34a3dfd5a69.tar.bz2
android_packages_apps_Trebuchet-3fcb2c75055ad423094c6bb1c980b34a3dfd5a69.zip
am 136882c1: Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop
* commit '136882c1950da1e5f0a24a8b6807b186a3297d8e': Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver
-rw-r--r--src/com/android/launcher3/compat/PackageInstallerCompatVL.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
index 4ad10d870..2d56adf91 100644
--- a/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
+++ b/src/com/android/launcher3/compat/PackageInstallerCompatVL.java
@@ -42,6 +42,7 @@ public class PackageInstallerCompatVL extends PackageInstallerCompat {
PackageInstallerCompatVL(Context context) {
mInstaller = context.getPackageManager().getPackageInstaller();
+ LauncherAppState.setApplicationContext(context.getApplicationContext());
mCache = LauncherAppState.getInstance().getIconCache();
mResumed = false;