diff options
| author | Kenny Guy <kennyguy@google.com> | 2014-09-12 12:21:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-09-12 12:21:06 +0000 |
| commit | fb7eae5a0f3ce5817203f8583a1e82ff58f999d6 (patch) | |
| tree | 28ea5d62cc35cbde56cbbbd6a02fb480ba735c06 | |
| parent | d23e2cdad4e51aac9fad8cd8a3d6a5dd8b5ea532 (diff) | |
| parent | cb213ba78ea66ea6576cbe46ec83ebb1e2f904e0 (diff) | |
| download | android_packages_apps_Trebuchet-fb7eae5a0f3ce5817203f8583a1e82ff58f999d6.tar.gz android_packages_apps_Trebuchet-fb7eae5a0f3ce5817203f8583a1e82ff58f999d6.tar.bz2 android_packages_apps_Trebuchet-fb7eae5a0f3ce5817203f8583a1e82ff58f999d6.zip | |
Merge "Update compat layer for API review changes to LauncherApps" into ub-now-porkchop
automerge: cb213ba
* commit 'cb213ba78ea66ea6576cbe46ec83ebb1e2f904e0':
Update compat layer for API review changes to LauncherApps
| -rw-r--r-- | src/com/android/launcher3/compat/LauncherAppsCompatVL.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java index 6422551ba..c4a97836c 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java @@ -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 + } } } |