diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2014-09-17 20:46:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 20:46:26 +0000 |
| commit | bc60df98c957523db0f9e72ce41da1262af95673 (patch) | |
| tree | 3037c62e32ed841580fe7a67339579ef063543b5 | |
| parent | ae5c0ad20c6e3cf1c71ad706b4f0800292867c21 (diff) | |
| parent | 72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9 (diff) | |
| download | android_packages_apps_Trebuchet-bc60df98c957523db0f9e72ce41da1262af95673.tar.gz android_packages_apps_Trebuchet-bc60df98c957523db0f9e72ce41da1262af95673.tar.bz2 android_packages_apps_Trebuchet-bc60df98c957523db0f9e72ce41da1262af95673.zip | |
am 72f98657: Merge "Using ApplicationContext in static objects" into ub-now-porkchop
* commit '72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9':
Using ApplicationContext in static objects
3 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java index 57fac7f8f..5997e7b03 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java @@ -41,9 +41,9 @@ public abstract class AppWidgetManagerCompat { // TODO change this to use api version once L gets an API number. if (sInstance == null) { if (Utilities.isLmp()) { - sInstance = new AppWidgetManagerCompatVL(context); + sInstance = new AppWidgetManagerCompatVL(context.getApplicationContext()); } else { - sInstance = new AppWidgetManagerCompatV16(context); + sInstance = new AppWidgetManagerCompatV16(context.getApplicationContext()); } } return sInstance; diff --git a/src/com/android/launcher3/compat/LauncherAppsCompat.java b/src/com/android/launcher3/compat/LauncherAppsCompat.java index de8c669e7..e3879eed0 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompat.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompat.java @@ -51,9 +51,9 @@ public abstract class LauncherAppsCompat { // STOPSHIP(kennyguy) change this to use api version once L gets an API number. if (sInstance == null) { if ("L".equals(Build.VERSION.CODENAME)) { - sInstance = new LauncherAppsCompatVL(context); + sInstance = new LauncherAppsCompatVL(context.getApplicationContext()); } else { - sInstance = new LauncherAppsCompatV16(context); + sInstance = new LauncherAppsCompatV16(context.getApplicationContext()); } } return sInstance; diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatV16.java b/src/com/android/launcher3/compat/LauncherAppsCompatV16.java index c47f223f3..7e5e6bf2c 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatV16.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatV16.java @@ -22,19 +22,17 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ActivityInfo; +import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.graphics.Rect; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** |