commit cb213ba78ea66ea6576cbe46ec83ebb1e2f904e0
author Kenny Guy <kennyguy@google.com> Fri Sep 12 12:20:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 12 12:20:01 2014 +0000
tree 28ea5d62cc35cbde56cbbbd6a02fb480ba735c06
parent 393afd34566ba51f817c45a55305a9ac150d7f5b
parent 577e7dc7db00fb255869a5a0c845010a29d02838

Merge "Update compat layer for API review changes to LauncherApps" into ub-now-porkchop

src/com/android/launcher3/compat/LauncherAppsCompatVL.java

diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java
index 6422551..c4a9783 100644
--- a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java
+++ b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java
@@ -82,7 +82,11 @@
         synchronized (mCallbacks) {
             mCallbacks.put(callback, wrappedCallback);
         }
-        mLauncherApps.addCallback(wrappedCallback);
+        try {
+            mLauncherApps.registerCallback(wrappedCallback);
+        } catch (Throwable e) {
+            // STOPSHIP(kennyguy): Remove when LRW71 hits googlefood
+        }
     }
 
     public void removeOnAppsChangedCallback(
@@ -92,7 +96,11 @@
             wrappedCallback = mCallbacks.remove(callback);
         }
         if (wrappedCallback != null) {
-            mLauncherApps.removeCallback(wrappedCallback);
+            try {
+                mLauncherApps.unregisterCallback(wrappedCallback);
+            } catch (Throwable e) {
+                // STOPSHIP(kennyguy): Remove when LRW71 hits googlefood
+            }
         }
     }