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

Commit a528fd70 authored by Adam Wright's avatar Adam Wright Committed by Greg Kaiser
Browse files

Revert "Fix LauncherAppsService queryIntentLauncherActivities" 

This reverts commit e0b6a4df.

Reason for revert: Testing a fix for b/171027242 - this doesn't imply this revert will be needed, or the commit is at fault.

Change-Id: Iaf8e2c075f188df95c68824b71362629c6adabfc
parent b943579d

core/java/android/content/pm/LauncherActivityInfoInternal.java

+3 −11
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.content.pm;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ComponentName;

import android.os.Parcel;
@@ -30,24 +28,18 @@ public class LauncherActivityInfoInternal implements Parcelable { 
    @UnsupportedAppUsage

    private ActivityInfo mActivityInfo;

    private ComponentName mComponentName;

    @NonNull private IncrementalStatesInfo mIncrementalStatesInfo;

    private IncrementalStatesInfo mIncrementalStatesInfo;



    /**

     * @param info ActivityInfo from which to create the LauncherActivityInfo.

     * @param incrementalStatesInfo The package's states.

     */

    public LauncherActivityInfoInternal(ActivityInfo info,

            @Nullable IncrementalStatesInfo incrementalStatesInfo) {

            IncrementalStatesInfo incrementalStatesInfo) {

        mActivityInfo = info;

        mComponentName = new ComponentName(info.packageName, info.name);

        if (incrementalStatesInfo == null) {

            // default value for non-incremental apps

            mIncrementalStatesInfo = new IncrementalStatesInfo(

                    true /* isStartable */, false /* isLoading */, 1 /* progress */);

        } else {

        mIncrementalStatesInfo = incrementalStatesInfo;

    }

    }



    public LauncherActivityInfoInternal(Parcel source) {

        mActivityInfo = source.readParcelable(ActivityInfo.class.getClassLoader());

services/core/java/com/android/server/pm/LauncherAppsService.java

+7 −13
Original line number Diff line number Diff line
@@ -548,13 +548,8 @@ public class LauncherAppsService extends SystemService { 
                        PackageManager.MATCH_DIRECT_BOOT_AWARE

                                | PackageManager.MATCH_DIRECT_BOOT_UNAWARE,

                        callingUid, user.getIdentifier());

                final IncrementalStatesInfo incrementalStatesInfo;

                if (component.getPackageName() == null) {

                    incrementalStatesInfo = null;

                } else {

                    incrementalStatesInfo = pmInt.getIncrementalStatesInfo(

                final IncrementalStatesInfo incrementalStatesInfo = pmInt.getIncrementalStatesInfo(

                        component.getPackageName(), callingUid, user.getIdentifier());

                }

                return new LauncherActivityInfoInternal(activityInfo, incrementalStatesInfo);

            } finally {

                Binder.restoreCallingIdentity(ident);
@@ -597,12 +592,11 @@ public class LauncherAppsService extends SystemService { 
            List<LauncherActivityInfoInternal> results = new ArrayList<>();

            for (int i = 0; i < numResolveInfos; i++) {

                final ResolveInfo ri = apps.get(i);

                final IncrementalStatesInfo incrementalStatesInfo;

                if (ri.resolvePackageName == null) {

                    incrementalStatesInfo = null;

                } else {

                    incrementalStatesInfo = pmInt.getIncrementalStatesInfo(

                            ri.resolvePackageName, callingUid, user.getIdentifier());

                final IncrementalStatesInfo incrementalStatesInfo =

                        pmInt.getIncrementalStatesInfo(ri.resolvePackageName, callingUid,

                                user.getIdentifier());

                if (incrementalStatesInfo == null) {

                    continue;

                }

                results.add(new LauncherActivityInfoInternal(ri.activityInfo,

                        incrementalStatesInfo));

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -25662,10 +25662,12 @@ public class PackageManagerService extends IPackageManager.Stub 














        @Override















        public IncrementalStatesInfo getIncrementalStatesInfo(













                @NonNull String packageName, int filterCallingUid, int userId) {













                String packageName, int filterCallingUid, int userId) {















            final PackageSetting ps = getPackageSettingForUser(packageName, filterCallingUid,















                    userId);















            if (ps == null) {













                Slog.w(TAG, "Failed getting incremental state. Package " + packageName













                        + " is not available");















                return null;















            }















            return ps.getIncrementalStates();