Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72f98657 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Using ApplicationContext in static objects" into ub-now-porkchop

parents cc4e84ee cf5d24b2

src/com/android/launcher3/compat/AppWidgetManagerCompat.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/launcher3/compat/LauncherAppsCompat.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

src/com/android/launcher3/compat/LauncherAppsCompatV16.java

+1 −3
Original line number Diff line number Diff line
@@ -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;



/**