diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2017-09-11 11:18:03 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2017-09-11 12:17:09 -0700 |
| commit | e24cb63b811e2885a69e7df794e9972cdf5a57b9 (patch) | |
| tree | c4229be8691f0ed8e902a12c2d68785aec257f57 /src/com/android/launcher3/compat | |
| parent | 9c1607886b87734f5ec36a87f62dcaabb78bdf20 (diff) | |
| download | android_packages_apps_Trebuchet-e24cb63b811e2885a69e7df794e9972cdf5a57b9.tar.gz android_packages_apps_Trebuchet-e24cb63b811e2885a69e7df794e9972cdf5a57b9.tar.bz2 android_packages_apps_Trebuchet-e24cb63b811e2885a69e7df794e9972cdf5a57b9.zip | |
WallpaperManagerCompat should target correct platform
Also replace Utilities.isAtLeastO() to static final constant.
Bug: 65544683
Change-Id: I39fbea66939d72c31702748716c4e65b4f9bee6a
Diffstat (limited to 'src/com/android/launcher3/compat')
4 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java index 4e00eae9d..a77a87f2c 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java @@ -40,7 +40,7 @@ public abstract class AppWidgetManagerCompat { public static AppWidgetManagerCompat getInstance(Context context) { synchronized (sInstanceLock) { if (sInstance == null) { - if (Utilities.isAtLeastO()) { + if (Utilities.ATLEAST_OREO) { sInstance = new AppWidgetManagerCompatVO(context.getApplicationContext()); } else { sInstance = new AppWidgetManagerCompatVL(context.getApplicationContext()); diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java index 75a2a5d18..2cac536f6 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompat.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java @@ -53,7 +53,7 @@ public abstract class LauncherAppsCompat { public static LauncherAppsCompat getInstance(Context context) { synchronized (sInstanceLock) { if (sInstance == null) { - if (Utilities.isAtLeastO()) { + if (Utilities.ATLEAST_OREO) { sInstance = new LauncherAppsCompatVO(context.getApplicationContext()); } else { sInstance = new LauncherAppsCompatVL(context.getApplicationContext()); diff --git a/src/com/android/launcher3/compat/WallpaperManagerCompat.java b/src/com/android/launcher3/compat/WallpaperManagerCompat.java index cbcabdf9b..00258c7da 100644 --- a/src/com/android/launcher3/compat/WallpaperManagerCompat.java +++ b/src/com/android/launcher3/compat/WallpaperManagerCompat.java @@ -31,10 +31,10 @@ public abstract class WallpaperManagerCompat { if (sInstance == null) { context = context.getApplicationContext(); - if (Utilities.isAtLeastO()) { + if (Utilities.ATLEAST_OREO) { try { sInstance = new WallpaperManagerCompatVOMR1(context); - } catch (Exception e) { + } catch (Throwable e) { // The wallpaper APIs do not yet exist } } diff --git a/src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java b/src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java index 28b780a38..524f266fc 100644 --- a/src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java +++ b/src/com/android/launcher3/compat/WallpaperManagerCompatVOMR1.java @@ -35,8 +35,9 @@ public class WallpaperManagerCompatVOMR1 extends WallpaperManagerCompat { private final WallpaperManager mWm; private Method mWCColorHintsMethod; - WallpaperManagerCompatVOMR1(Context context) throws Exception { + WallpaperManagerCompatVOMR1(Context context) throws Throwable { mWm = context.getSystemService(WallpaperManager.class); + String className = WallpaperColors.class.getName(); try { mWCColorHintsMethod = WallpaperColors.class.getDeclaredMethod("getColorHints"); } catch (Exception exc) { |