drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-17 14:17:20 +00:00
committed by Android (Google) Code Review
parent 5fc6e63e2e 801e65905b
commit 676590d060
7 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@ -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;

9
core/java/android/app/ApplicationPackageManager.java
View File

@ -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();
}
}
}

2
core/java/android/content/pm/IPackageManager.aidl
View File

@ -632,4 +632,6 @@ interface IPackageManager {
void deletePreloadsFileCache();
ComponentName getInstantAppResolverSettingsComponent();
ComponentName getInstantAppInstallerComponent();
}

12
core/java/android/content/pm/PackageManager.java
View File

@ -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();
}

6
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@ -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();
}
}

8
test-runner/src/android/test/mock/MockPackageManager.java
View File

@ -1126,4 +1126,12 @@ public class MockPackageManager extends PackageManager {
public ComponentName getInstantAppResolverSettingsComponent() {
throw new UnsupportedOperationException();
}
/**
* @hide
*/
@Override
public ComponentName getInstantAppInstallerComponent() {
throw new UnsupportedOperationException();
}
}

5
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
View File

@ -923,4 +923,9 @@ public class BridgePackageManager extends PackageManager {
public ComponentName getInstantAppResolverSettingsComponent() {
return null;
}
@Override
public ComponentName getInstantAppInstallerComponent() {
return null;
}
}