From 6fa0c69b27de93d45cd038527be432e7ea23a4d5 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 11 Apr 2016 13:01:32 -0700
Subject: [PATCH] [DO NOT MERGE] Changing WallpaperChangeReceiver to a runtime
 registered broadcast receiver

Bug: 28115607
Change-Id: I208d629a346781d9b1fbeb0a245685bf36f85aeb
(cherry picked from commit d435cc070ad72d2e94546d274e29159ee4c21a9a)
---
 AndroidManifest.xml                             | 7 -------
 src/com/android/launcher3/LauncherAppState.java | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 990bde0b17..918ae52aaa 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -127,13 +127,6 @@
             android:process=":settings_process">
         </activity>
 
-        <receiver
-            android:name="com.android.launcher3.WallpaperChangedReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.WALLPAPER_CHANGED" />
-            </intent-filter>
-        </receiver>
-
         <!-- Intent received used to install shortcuts from other applications -->
         <receiver
             android:name="com.android.launcher3.InstallShortcutReceiver"
diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java
index 1f7bbe0da8..e1ade10bab 100644
--- a/src/com/android/launcher3/LauncherAppState.java
+++ b/src/com/android/launcher3/LauncherAppState.java
@@ -106,6 +106,9 @@ public class LauncherAppState {
         sContext.registerReceiver(mModel, filter);
         UserManagerCompat.getInstance(sContext).enableAndResetCache();
         new ConfigMonitor(sContext).register();
+
+        sContext.registerReceiver(
+                new WallpaperChangedReceiver(), new IntentFilter(Intent.ACTION_WALLPAPER_CHANGED));
     }
 
     /**