PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 72f98657: Merge "Using ApplicationContext in static objects" into ub-now-porkchop

Browse Source 
* commit '72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9':
  Using ApplicationContext in static objects
This commit is contained in:
Sunny Goyal
2014-09-17 20:46:26 +00:00
committed by Android Git Automerger
parent ae5c0ad20c 72f9865780
commit bc60df98c9
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/compat/AppWidgetManagerCompat.java
+2 -2
View File
@@ -41,9 +41,9 @@ public abstract class AppWidgetManagerCompat {
// TODO change this to use api version once L gets an API number. // TODO change this to use api version once L gets an API number.
if (sInstance == null) { if (sInstance == null) {
if (Utilities.isLmp()) { if (Utilities.isLmp()) {
sInstance = new AppWidgetManagerCompatVL(context); sInstance = new AppWidgetManagerCompatVL(context.getApplicationContext());
} else { } else {
sInstance = new AppWidgetManagerCompatV16(context); sInstance = new AppWidgetManagerCompatV16(context.getApplicationContext());
} }
} }
return sInstance; return sInstance;
src/com/android/launcher3/compat/LauncherAppsCompat.java
+2 -2
View File
@@ -51,9 +51,9 @@ public abstract class LauncherAppsCompat {
// STOPSHIP(kennyguy) change this to use api version once L gets an API number. // STOPSHIP(kennyguy) change this to use api version once L gets an API number.
if (sInstance == null) { if (sInstance == null) {
if ("L".equals(Build.VERSION.CODENAME)) { if ("L".equals(Build.VERSION.CODENAME)) {
sInstance = new LauncherAppsCompatVL(context); sInstance = new LauncherAppsCompatVL(context.getApplicationContext());
} else { } else {
sInstance = new LauncherAppsCompatV16(context); sInstance = new LauncherAppsCompatV16(context.getApplicationContext());
} }
} }
return sInstance; return sInstance;
src/com/android/launcher3/compat/LauncherAppsCompatV16.java
+1 -3
View File
@@ -22,19 +22,17 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.PackageInfo;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.graphics.Rect; import android.graphics.Rect;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**