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

Commit 533c9ff5 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Add boolean when instant apps are available 

Bug: 34168547
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Change-Id: Ic1072d02aa4d43947e689e4381c2c5ee43704dd0
parent d632305e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10600,6 +10600,7 @@ package android.content.pm { 
    field public android.content.pm.ActivityInfo activityInfo;

    field public android.content.IntentFilter filter;

    field public int icon;

    field public boolean instantAppAvailable;

    field public boolean isDefault;

    field public int labelRes;

    field public int match;

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11222,6 +11222,7 @@ package android.content.pm { 
    field public android.content.pm.ActivityInfo activityInfo;

    field public android.content.IntentFilter filter;

    field public int icon;

    field public boolean instantAppAvailable;

    field public boolean isDefault;

    field public int labelRes;

    field public int match;

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10636,6 +10636,7 @@ package android.content.pm { 
    field public android.content.pm.ActivityInfo activityInfo;

    field public android.content.IntentFilter filter;

    field public int icon;

    field public boolean instantAppAvailable;

    field public boolean isDefault;

    field public int labelRes;

    field public int match;

core/java/android/content/pm/ResolveInfo.java

+8 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ public class ResolveInfo implements Parcelable { 
     */

    public AuxiliaryResolveInfo auxiliaryInfo;



    /**

     * Whether or not an instant app is available for the resolved intent.

     */

    public boolean instantAppAvailable;



    /**

     * The IntentFilter that was matched for this ResolveInfo.

     */
@@ -325,6 +330,7 @@ public class ResolveInfo implements Parcelable { 
        system = orig.system;

        targetUserId = orig.targetUserId;

        handleAllWebDataURI = orig.handleAllWebDataURI;

        instantAppAvailable = orig.instantAppAvailable;

    }



    public String toString() {
@@ -388,6 +394,7 @@ public class ResolveInfo implements Parcelable { 
        dest.writeInt(noResourceId ? 1 : 0);

        dest.writeInt(iconResourceId);

        dest.writeInt(handleAllWebDataURI ? 1 : 0);

        dest.writeInt(instantAppAvailable ? 1 : 0);

    }



    public static final Creator<ResolveInfo> CREATOR
@@ -435,6 +442,7 @@ public class ResolveInfo implements Parcelable { 
        noResourceId = source.readInt() != 0;

        iconResourceId = source.readInt();

        handleAllWebDataURI = source.readInt() != 0;

        instantAppAvailable = source.readInt() != 0;

    }



    public static class DisplayNameComparator

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

+2 −0
Original line number Diff line number Diff line
@@ -6317,6 +6317,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                ephemeralInstaller.filter = new IntentFilter(intent.getAction());

                ephemeralInstaller.filter.addDataPath(

                        intent.getData().getPath(), PatternMatcher.PATTERN_LITERAL);

                ephemeralInstaller.instantAppAvailable = true;

                result.add(ephemeralInstaller);

            }

            Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
@@ -12334,6 +12335,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
            }

            res.iconResourceId = info.icon;

            res.system = res.activityInfo.applicationInfo.isSystemApp();

            res.instantAppAvailable = userState.instantApp;

            return res;

        }