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

Commit fa7a67eb authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing dependency on getApplicationInfo method added in N 

This method is goiing away. We don't need this method anyway
since LauncherActivityInfo already has the information

Change-Id: Ic6afa1df14958b894925d730e01a2e2d2a6fb98c

Conflicts:
	src/com/android/launcher3/LauncherModel.java
parent 53169865

src/com/android/launcher3/AppInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import com.android.launcher3.compat.LauncherActivityInfoCompat; 
import com.android.launcher3.compat.UserHandleCompat;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.PackageManagerHelper;



import java.util.ArrayList;

import java.util.Arrays;
@@ -89,7 +90,7 @@ public class AppInfo extends ItemInfo { 
        this.componentName = info.getComponentName();

        this.container = ItemInfo.NO_ID;

        flags = initFlags(info);

        if ((info.getApplicationInfo().flags & LauncherActivityInfoCompat.FLAG_SUSPENDED) != 0) {

        if (PackageManagerHelper.isAppSuspended(info.getApplicationInfo())) {

            isDisabled |= ShortcutInfo.FLAG_DISABLED_SUSPENDED;

        }

        if (quietModeEnabled) {

src/com/android/launcher3/LauncherModel.java

+23 −18
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.pm.ResolveInfo; 
import android.database.Cursor;

import android.graphics.Bitmap;

import android.net.Uri;

import android.os.Environment;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Looper;
@@ -60,6 +59,7 @@ import com.android.launcher3.util.CursorIconInfo; 
import com.android.launcher3.util.FlagOp;

import com.android.launcher3.util.LongArrayMap;

import com.android.launcher3.util.ManagedProfileHeuristic;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.launcher3.util.StringFilter;

import com.android.launcher3.util.Thunk;
@@ -1825,6 +1825,7 @@ public class LauncherModel extends BroadcastReceiver 
                    long serialNumber;

                    Intent intent;

                    UserHandleCompat user;

                    String targetPackage;



                    while (!mStopped && c.moveToNext()) {

                        try {
@@ -1843,6 +1844,7 @@ public class LauncherModel extends BroadcastReceiver 
                                int promiseType = c.getInt(restoredIndex);

                                int disabledState = 0;

                                boolean itemReplaced = false;

                                targetPackage = null;

                                if (user == null) {

                                    // User has been deleted remove the item.

                                    itemsToRemove.add(id);
@@ -1856,6 +1858,9 @@ public class LauncherModel extends BroadcastReceiver 
                                                cn.getPackageName(), user);

                                        boolean validComponent = validPkg &&

                                                launcherApps.isActivityEnabledForProfile(cn, user);

                                        if (validPkg) {

                                            targetPackage = cn.getPackageName();

                                        }



                                        if (validComponent) {

                                            if (restored) {
@@ -1863,13 +1868,8 @@ public class LauncherModel extends BroadcastReceiver 
                                                restoredRows.add(id);

                                                restored = false;

                                            }

                                            boolean isSuspended = launcherApps.isPackageSuspendedForProfile(

                                                    cn.getPackageName(), user);

                                            if (isSuspended) {

                                                disabledState = ShortcutInfo.FLAG_DISABLED_SUSPENDED;

                                            }

                                            if (quietMode.get(serialNumber)) {

                                                disabledState |= ShortcutInfo.FLAG_DISABLED_QUIET_USER;

                                                disabledState = ShortcutInfo.FLAG_DISABLED_QUIET_USER;

                                            }

                                        } else if (validPkg) {

                                            intent = null;
@@ -1939,9 +1939,8 @@ public class LauncherModel extends BroadcastReceiver 
                                                itemsToRemove.add(id);

                                                continue;

                                            }

                                        } else if (launcherApps.isAppEnabled(

                                                manager, cn.getPackageName(),

                                                PackageManager.GET_UNINSTALLED_PACKAGES)) {

                                        } else if (PackageManagerHelper.isAppOnSdcard(

                                                manager, cn.getPackageName())) {

                                            // Package is present but not available.

                                            allowMissingTarget = true;

                                            disabledState = ShortcutInfo.FLAG_DISABLED_NOT_AVAILABLE;
@@ -1984,7 +1983,7 @@ public class LauncherModel extends BroadcastReceiver 


                                if (itemReplaced) {

                                    if (user.equals(UserHandleCompat.myUserHandle())) {

                                        info = getAppShortcutInfo(manager, intent, user, context, null,

                                        info = getAppShortcutInfo(intent, user, context, null,

                                                cursorIconInfo.iconIndex, titleIndex,

                                                false, useLowResIcon);

                                    } else {
@@ -2007,12 +2006,17 @@ public class LauncherModel extends BroadcastReceiver 
                                    }

                                } else if (itemType ==

                                        LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {

                                    info = getAppShortcutInfo(manager, intent, user, context, c,

                                    info = getAppShortcutInfo(intent, user, context, c,

                                            cursorIconInfo.iconIndex, titleIndex,

                                            allowMissingTarget, useLowResIcon);

                                } else {

                                    info = getShortcutInfo(c, context, titleIndex, cursorIconInfo);



                                    // Shortcuts are only available on the primary profile

                                    if (PackageManagerHelper.isAppSuspended(manager, targetPackage)) {

                                        disabledState |= ShortcutInfo.FLAG_DISABLED_SUSPENDED;

                                    }



                                    // App shortcuts that used to be automatically added to Launcher

                                    // didn't always have the correct intent flags set, so do that

                                    // here
@@ -2040,7 +2044,7 @@ public class LauncherModel extends BroadcastReceiver 
                                    if (info.promisedIntent != null) {

                                        info.promisedIntent.putExtra(ItemInfo.EXTRA_PROFILE, serialNumber);

                                    }

                                    info.isDisabled = disabledState;

                                    info.isDisabled |= disabledState;

                                    if (isSafeMode && !Utilities.isSystemApp(context, intent)) {

                                        info.isDisabled |= ShortcutInfo.FLAG_DISABLED_SAFEMODE;

                                    }
@@ -2957,10 +2961,7 @@ public class LauncherModel extends BroadcastReceiver 
                    packagesUnavailable.clear();

                    for (String pkg : entry.getValue()) {

                        if (!launcherApps.isPackageEnabledForProfile(pkg, user)) {

                            boolean packageOnSdcard = launcherApps.isAppEnabled(

                                    manager, pkg, PackageManager.GET_UNINSTALLED_PACKAGES);

                            if (packageOnSdcard) {

                                Launcher.addDumpLog(TAG, "Package found on sd-card: " + pkg, true);

                            if (PackageManagerHelper.isAppOnSdcard(manager, pkg)) {

                                packagesUnavailable.add(pkg);

                            } else {

                                Launcher.addDumpLog(TAG, "Package not found: " + pkg, true);
@@ -3447,7 +3448,7 @@ public class LauncherModel extends BroadcastReceiver 
     *

     * If c is not null, then it will be used to fill in missing data like the title and icon.

     */

    public ShortcutInfo getAppShortcutInfo(PackageManager manager, Intent intent,

    public ShortcutInfo getAppShortcutInfo(Intent intent,

            UserHandleCompat user, Context context, Cursor c, int iconIndex, int titleIndex,

            boolean allowMissingTarget, boolean useLowResIcon) {

        if (user == null) {
@@ -3477,6 +3478,10 @@ public class LauncherModel extends BroadcastReceiver 
            info.setIcon(icon == null ? mIconCache.getDefaultIcon(user) : icon);

        }



        if (lai != null && PackageManagerHelper.isAppSuspended(lai.getApplicationInfo())) {

            info.isDisabled = ShortcutInfo.FLAG_DISABLED_SUSPENDED;

        }



        // from the db

        if (TextUtils.isEmpty(info.title) && c != null) {

            info.title =  Utilities.trim(c.getString(titleIndex));

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

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import android.graphics.drawable.Drawable; 


public abstract class LauncherActivityInfoCompat {



    public static final int FLAG_SUSPENDED = 1<<30;



    LauncherActivityInfoCompat() {

    }

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

+1 −15
Original line number Diff line number Diff line
@@ -19,9 +19,6 @@ package com.android.launcher3.compat; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.graphics.Rect;

import android.os.Bundle;
@@ -59,9 +56,7 @@ public abstract class LauncherAppsCompat { 
    public static LauncherAppsCompat getInstance(Context context) {

        synchronized (sInstanceLock) {

            if (sInstance == null) {

                if (Utilities.isNycOrAbove()) {

                    sInstance = new LauncherAppsCompatVN(context.getApplicationContext());

                } else if (Utilities.ATLEAST_LOLLIPOP) {

                if (Utilities.ATLEAST_LOLLIPOP) {

                    sInstance = new LauncherAppsCompatVL(context.getApplicationContext());

                } else {

                    sInstance = new LauncherAppsCompatV16(context.getApplicationContext());
@@ -84,13 +79,4 @@ public abstract class LauncherAppsCompat { 
    public abstract boolean isActivityEnabledForProfile(ComponentName component,

            UserHandleCompat user);

    public abstract boolean isPackageSuspendedForProfile(String packageName, UserHandleCompat user);



    public boolean isAppEnabled(PackageManager pm, String packageName, int flags) {

        try {

            ApplicationInfo info = pm.getApplicationInfo(packageName, flags);

            return info != null && info.enabled;

        } catch (NameNotFoundException e) {

            return false;

        }

    }

}

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

+2 −2
Original line number Diff line number Diff line
@@ -27,11 +27,11 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.pm.ResolveInfo;

import android.graphics.Rect;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.provider.Settings;



import com.android.launcher3.Utilities;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.launcher3.util.Thunk;



import java.util.ArrayList;
@@ -114,7 +114,7 @@ public class LauncherAppsCompatV16 extends LauncherAppsCompat { 
    }



    public boolean isPackageEnabledForProfile(String packageName, UserHandleCompat user) {

        return isAppEnabled(mPm, packageName, 0);

        return PackageManagerHelper.isAppEnabled(mPm, packageName);

    }



    public boolean isActivityEnabledForProfile(ComponentName component, UserHandleCompat user) {