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

Commit 676590d0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "expose the instant app installer component" into oc-dev

parents 5fc6e63e 801e6590

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -11274,6 +11274,7 @@ package android.content.pm { 
    method public abstract byte[] getInstantAppCookie();

    method public abstract int getInstantAppCookieMaxSize();

    method public abstract android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);

    method public abstract android.content.ComponentName getInstantAppInstallerComponent();

    method public abstract android.content.ComponentName getInstantAppResolverSettingsComponent();

    method public abstract java.util.List<android.content.pm.InstantAppInfo> getInstantApps();

    method public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -44574,6 +44575,7 @@ package android.test.mock { 
    method public byte[] getInstantAppCookie();

    method public int getInstantAppCookieMaxSize();

    method public android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);

    method public android.content.ComponentName getInstantAppInstallerComponent();

    method public android.content.ComponentName getInstantAppResolverSettingsComponent();

    method public java.util.List<android.content.pm.InstantAppInfo> getInstantApps();

    method public android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;

core/java/android/app/ApplicationPackageManager.java

+9 −0
Original line number Diff line number Diff line
@@ -2639,4 +2639,13 @@ public class ApplicationPackageManager extends PackageManager { 
            throw e.rethrowAsRuntimeException();

        }

    }



    @Override

    public ComponentName getInstantAppInstallerComponent() {

        try {

            return mPM.getInstantAppInstallerComponent();

        } catch (RemoteException e) {

            throw e.rethrowAsRuntimeException();

        }

    }

}

core/java/android/content/pm/IPackageManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -632,4 +632,6 @@ interface IPackageManager { 
    void deletePreloadsFileCache();



    ComponentName getInstantAppResolverSettingsComponent();



    ComponentName getInstantAppInstallerComponent();

}

core/java/android/content/pm/PackageManager.java

+11 −1
Original line number Diff line number Diff line
@@ -6275,9 +6275,19 @@ public abstract class PackageManager { 
     * Return the {@link ComponentName} of the activity providing Settings for the Instant App

     * resolver.

     *

     * @see {@link android.content.intent#ACTION_INSTANT_APP_RESOLVER_SETTINGS}

     * @see {@link android.content.Intent#ACTION_INSTANT_APP_RESOLVER_SETTINGS}

     * @hide

     */

    @SystemApi

    public abstract ComponentName getInstantAppResolverSettingsComponent();



    /**

     * Return the {@link ComponentName} of the activity responsible for installing instant

     * applications.

     *

     * @see {@link android.content.Intent#ACTION_INSTALL_INSTANT_APP_PACKAGE}

     * @hide

     */

    @SystemApi

    public abstract ComponentName getInstantAppInstallerComponent();

}

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

+6 −0
Original line number Diff line number Diff line
@@ -23636,4 +23636,10 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 
    public ComponentName getInstantAppResolverSettingsComponent() {

        return mInstantAppResolverSettingsComponent;

    }













    @Override













    public ComponentName getInstantAppInstallerComponent() {













        return mInstantAppInstallerActivity == null













                ? null : mInstantAppInstallerActivity.getComponentName();













    }















}