From c88dceb0b567ab96418e73cf2f6b197ba2646cb3 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 27 Sep 2013 14:59:38 -0700
Subject: [PATCH] Always set the LauncherAppState context before using it from
 a broadcast. (Bug 10947459)

Change-Id: I284786b538a9d58aa96cfc208ef68621e2500645
---
 src/com/android/launcher3/InstallShortcutReceiver.java   | 1 +
 src/com/android/launcher3/UninstallShortcutReceiver.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/com/android/launcher3/InstallShortcutReceiver.java b/src/com/android/launcher3/InstallShortcutReceiver.java
index b4d6ea5513..821c15f520 100644
--- a/src/com/android/launcher3/InstallShortcutReceiver.java
+++ b/src/com/android/launcher3/InstallShortcutReceiver.java
@@ -224,6 +224,7 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
             data.getParcelableExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE);
 
         // Queue the item up for adding if launcher has not loaded properly yet
+        LauncherAppState.setApplicationContext(context.getApplicationContext());
         LauncherAppState app = LauncherAppState.getInstance();
         boolean launcherNotLoaded = (app.getDynamicGrid() == null);
 
diff --git a/src/com/android/launcher3/UninstallShortcutReceiver.java b/src/com/android/launcher3/UninstallShortcutReceiver.java
index 00fa631bc2..ccea4ec0c3 100644
--- a/src/com/android/launcher3/UninstallShortcutReceiver.java
+++ b/src/com/android/launcher3/UninstallShortcutReceiver.java
@@ -78,6 +78,7 @@ public class UninstallShortcutReceiver extends BroadcastReceiver {
             PendingUninstallShortcutInfo pendingInfo) {
         final Intent data = pendingInfo.data;
 
+        LauncherAppState.setApplicationContext(context.getApplicationContext());
         LauncherAppState app = LauncherAppState.getInstance();
         synchronized (app) { // TODO: make removeShortcut internally threadsafe
             removeShortcut(context, data);