am fb7eae5a: Merge "Update compat layer for API review changes to LauncherApps" into ub-now-porkchop automerge: cb213ba

* commit 'fb7eae5a0f3ce5817203f8583a1e82ff58f999d6':
  Update compat layer for API review changes to LauncherApps
This commit is contained in:
Kenny Guy
2014-09-12 22:49:36 +00:00
committed by Android Git Automerger
@@ -82,7 +82,11 @@ public class LauncherAppsCompatVL extends LauncherAppsCompat {
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 @@ public class LauncherAppsCompatVL extends LauncherAppsCompat {
wrappedCallback = mCallbacks.remove(callback);
}
if (wrappedCallback != null) {
mLauncherApps.removeCallback(wrappedCallback);
try {
mLauncherApps.unregisterCallback(wrappedCallback);
} catch (Throwable e) {
// STOPSHIP(kennyguy): Remove when LRW71 hits googlefood
}
}
}