Merge "Adds generic intent Instant App resolution" (84783905) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10043,6 +10043,7 @@ package android.content {
		field public static final int FLAG_ACTIVITY_FORWARD_RESULT = 33554432; // 0x2000000
		field public static final int FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY = 1048576; // 0x100000
		field public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 4096; // 0x1000
		field public static final int FLAG_ACTIVITY_MATCH_EXTERNAL = 2048; // 0x800
		field public static final int FLAG_ACTIVITY_MULTIPLE_TASK = 134217728; // 0x8000000
		field public static final int FLAG_ACTIVITY_NEW_DOCUMENT = 524288; // 0x80000
		field public static final int FLAG_ACTIVITY_NEW_TASK = 268435456; // 0x10000000

api/system-current.txt

+9 −2

Original line number	Diff line number	Diff line
		@@ -310,8 +310,10 @@ package android.app {
		ctor public InstantAppResolverService();
		method public final void attachBaseContext(android.content.Context);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onGetInstantAppIntentFilter(int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
		method public void onGetInstantAppResolveInfo(int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
		method public deprecated void onGetInstantAppIntentFilter(int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
		method public void onGetInstantAppIntentFilter(android.content.Intent, int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
		method public deprecated void onGetInstantAppResolveInfo(int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
		method public void onGetInstantAppResolveInfo(android.content.Intent, int[], java.lang.String, android.app.InstantAppResolverService.InstantAppResolutionCallback);
		}

		public static final class InstantAppResolverService.InstantAppResolutionCallback {
		@@ -820,12 +822,14 @@ package android.content {
		field public static final java.lang.String ACTION_VOICE_ASSIST = "android.intent.action.VOICE_ASSIST";
		field public static final java.lang.String CATEGORY_LEANBACK_SETTINGS = "android.intent.category.LEANBACK_SETTINGS";
		field public static final java.lang.String EXTRA_FORCE_FACTORY_RESET = "android.intent.extra.FORCE_FACTORY_RESET";
		field public static final java.lang.String EXTRA_INSTANT_APP_BUNDLES = "android.intent.extra.INSTANT_APP_BUNDLES";
		field public static final java.lang.String EXTRA_ORIGINATING_UID = "android.intent.extra.ORIGINATING_UID";
		field public static final java.lang.String EXTRA_PACKAGES = "android.intent.extra.PACKAGES";
		field public static final java.lang.String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";
		field public static final java.lang.String EXTRA_REASON = "android.intent.extra.REASON";
		field public static final java.lang.String EXTRA_REMOTE_CALLBACK = "android.intent.extra.REMOTE_CALLBACK";
		field public static final java.lang.String EXTRA_RESULT_NEEDED = "android.intent.extra.RESULT_NEEDED";
		field public static final java.lang.String EXTRA_UNKNOWN_INSTANT_APP = "android.intent.extra.UNKNOWN_INSTANT_APP";
		}

		public class IntentFilter implements android.os.Parcelable {
		@@ -868,6 +872,7 @@ package android.content.pm {
		ctor public InstantAppResolveInfo(android.content.pm.InstantAppResolveInfo.InstantAppDigest, java.lang.String, java.util.List<android.content.pm.InstantAppIntentFilter>, int);
		ctor public InstantAppResolveInfo(android.content.pm.InstantAppResolveInfo.InstantAppDigest, java.lang.String, java.util.List<android.content.pm.InstantAppIntentFilter>, long, android.os.Bundle);
		ctor public InstantAppResolveInfo(java.lang.String, java.lang.String, java.util.List<android.content.pm.InstantAppIntentFilter>);
		ctor public InstantAppResolveInfo(android.os.Bundle);
		method public int describeContents();
		method public byte[] getDigestBytes();
		method public int getDigestPrefix();
		@@ -876,6 +881,7 @@ package android.content.pm {
		method public long getLongVersionCode();
		method public java.lang.String getPackageName();
		method public deprecated int getVersionCode();
		method public boolean shouldLetInstallerDecide();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.content.pm.InstantAppResolveInfo> CREATOR;
		}
		@@ -887,6 +893,7 @@ package android.content.pm {
		method public int[] getDigestPrefix();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.content.pm.InstantAppResolveInfo.InstantAppDigest> CREATOR;
		field public static final android.content.pm.InstantAppResolveInfo.InstantAppDigest UNDEFINED;
		}

		public final class IntentFilterVerificationInfo implements android.os.Parcelable {

core/java/android/app/EphemeralResolverService.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -17,20 +17,10 @@
		package android.app;

		import android.annotation.SystemApi;
		import android.app.Service;
		import android.app.InstantAppResolverService.InstantAppResolutionCallback;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.EphemeralResolveInfo;
		import android.content.pm.InstantAppResolveInfo;
		import android.os.Build;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.IRemoteCallback;
		import android.os.Looper;
		import android.os.Message;
		import android.os.RemoteException;
		import android.util.Log;

		import java.util.ArrayList;
		@@ -85,7 +75,6 @@ public abstract class EphemeralResolverService extends InstantAppResolverService
		return super.getLooper();
		}

		@Override
		void _onGetInstantAppResolveInfo(int[] digestPrefix, String token,
		InstantAppResolutionCallback callback) {
		if (DEBUG_EPHEMERAL) {
		@@ -101,7 +90,6 @@ public abstract class EphemeralResolverService extends InstantAppResolverService
		callback.onInstantAppResolveInfo(resultList);
		}

		@Override
		void _onGetInstantAppIntentFilter(int[] digestPrefix, String token,
		String hostName, InstantAppResolutionCallback callback) {
		if (DEBUG_EPHEMERAL) {

core/java/android/app/IInstantAppResolver.aidl

+5 −3

Original line number	Diff line number	Diff line
		@@ -16,13 +16,15 @@

		package android.app;

		import android.content.Intent;
		import android.os.IRemoteCallback;

		/** @hide */
		oneway interface IInstantAppResolver {
		void getInstantAppResolveInfoList(in int[] digestPrefix,
		void getInstantAppResolveInfoList(in Intent sanitizedIntent, in int[] hostDigestPrefix,
		String token, int sequence, IRemoteCallback callback);

		void getInstantAppIntentFilterList(in int[] digestPrefix,
		String token, String hostName, IRemoteCallback callback);
		void getInstantAppIntentFilterList(in Intent sanitizedIntent, in int[] hostDigestPrefix,
		String token, IRemoteCallback callback);

		}

core/java/android/app/InstantAppResolverService.java

+68 −39

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package android.app;

		import android.annotation.SystemApi;
		import android.app.Service;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.InstantAppResolveInfo;
		@@ -35,6 +34,7 @@ import android.util.Slog;
		import com.android.internal.os.SomeArgs;

		import java.util.Arrays;
		import java.util.Collections;
		import java.util.List;

		/**
		@@ -53,23 +53,65 @@ public abstract class InstantAppResolverService extends Service {
		Handler mHandler;

		/**
		* Called to retrieve resolve info for instant applications.
		* Called to retrieve resolve info for instant applications immediately.
		*
		* @param digestPrefix The hash prefix of the instant app's domain.
		* @deprecated should implement {@link #onGetInstantAppResolveInfo(Intent, int[], String,
		* InstantAppResolutionCallback)}
		*/
		@Deprecated
		public void onGetInstantAppResolveInfo(
		int digestPrefix[], String token, InstantAppResolutionCallback callback) {
		throw new IllegalStateException("Must define");
		}

		/**
		* Called to retrieve intent filters for instant applications.
		* Called to retrieve intent filters for instant applications from potentially expensive
		* sources.
		*
		* @param digestPrefix The hash prefix of the instant app's domain.
		* @deprecated should implement {@link #onGetInstantAppIntentFilter(Intent, int[], String,
		* InstantAppResolutionCallback)}
		*/
		@Deprecated
		public void onGetInstantAppIntentFilter(
		int digestPrefix[], String token, InstantAppResolutionCallback callback) {
		throw new IllegalStateException("Must define");
		throw new IllegalStateException("Must define onGetInstantAppIntentFilter");
		}

		/**
		* Called to retrieve resolve info for instant applications immediately.
		*
		* @param sanitizedIntent The sanitized {@link Intent} used for resolution.
		* @param hostDigestPrefix The hash prefix of the instant app's domain.
		*/
		public void onGetInstantAppResolveInfo(Intent sanitizedIntent, int[] hostDigestPrefix,
		String token, InstantAppResolutionCallback callback) {
		// if not overridden, forward to old methods and filter out non-web intents
		if (sanitizedIntent.isBrowsableWebIntent()) {
		onGetInstantAppResolveInfo(hostDigestPrefix, token, callback);
		} else {
		callback.onInstantAppResolveInfo(Collections.emptyList());
		}
		}

		/**
		* Called to retrieve intent filters for instant applications from potentially expensive
		* sources.
		*
		* @param sanitizedIntent The sanitized {@link Intent} used for resolution.
		* @param hostDigestPrefix The hash prefix of the instant app's domain or null if no host is
		* defined.
		*/
		public void onGetInstantAppIntentFilter(Intent sanitizedIntent, int[] hostDigestPrefix,
		String token, InstantAppResolutionCallback callback) {
		Log.e(TAG, "New onGetInstantAppIntentFilter is not overridden");
		// if not overridden, forward to old methods and filter out non-web intents
		if (sanitizedIntent.isBrowsableWebIntent()) {
		onGetInstantAppIntentFilter(hostDigestPrefix, token, callback);
		} else {
		callback.onInstantAppResolveInfo(Collections.emptyList());
		}
		}

		/**
		@@ -89,8 +131,8 @@ public abstract class InstantAppResolverService extends Service {
		public final IBinder onBind(Intent intent) {
		return new IInstantAppResolver.Stub() {
		@Override
		public void getInstantAppResolveInfoList(
		int digestPrefix[], String token, int sequence, IRemoteCallback callback) {
		public void getInstantAppResolveInfoList(Intent sanitizedIntent, int[] digestPrefix,
		String token, int sequence, IRemoteCallback callback) {
		if (DEBUG_EPHEMERAL) {
		Slog.v(TAG, "[" + token + "] Phase1 called; posting");
		}
		@@ -98,14 +140,14 @@ public abstract class InstantAppResolverService extends Service {
		args.arg1 = callback;
		args.arg2 = digestPrefix;
		args.arg3 = token;
		mHandler.obtainMessage(
		ServiceHandler.MSG_GET_INSTANT_APP_RESOLVE_INFO, sequence, 0, args)
		.sendToTarget();
		args.arg4 = sanitizedIntent;
		mHandler.obtainMessage(ServiceHandler.MSG_GET_INSTANT_APP_RESOLVE_INFO,
		sequence, 0, args).sendToTarget();
		}

		@Override
		public void getInstantAppIntentFilterList(
		int digestPrefix[], String token, String hostName, IRemoteCallback callback) {
		public void getInstantAppIntentFilterList(Intent sanitizedIntent,
		int[] digestPrefix, String token, IRemoteCallback callback) {
		if (DEBUG_EPHEMERAL) {
		Slog.v(TAG, "[" + token + "] Phase2 called; posting");
		}
		@@ -113,9 +155,9 @@ public abstract class InstantAppResolverService extends Service {
		args.arg1 = callback;
		args.arg2 = digestPrefix;
		args.arg3 = token;
		args.arg4 = hostName;
		mHandler.obtainMessage(
		ServiceHandler.MSG_GET_INSTANT_APP_INTENT_FILTER, callback).sendToTarget();
		args.arg4 = sanitizedIntent;
		mHandler.obtainMessage(ServiceHandler.MSG_GET_INSTANT_APP_INTENT_FILTER,
		callback).sendToTarget();
		}
		};
		}
		@@ -142,29 +184,9 @@ public abstract class InstantAppResolverService extends Service {
		}
		}

		@Deprecated
		void _onGetInstantAppResolveInfo(int[] digestPrefix, String token,
		InstantAppResolutionCallback callback) {
		if (DEBUG_EPHEMERAL) {
		Slog.d(TAG, "[" + token + "] Phase1 request;"
		+ " prefix: " + Arrays.toString(digestPrefix));
		}
		onGetInstantAppResolveInfo(digestPrefix, token, callback);
		}
		@Deprecated
		void _onGetInstantAppIntentFilter(int digestPrefix[], String token, String hostName,
		InstantAppResolutionCallback callback) {
		if (DEBUG_EPHEMERAL) {
		Slog.d(TAG, "[" + token + "] Phase2 request;"
		+ " prefix: " + Arrays.toString(digestPrefix));
		}
		onGetInstantAppIntentFilter(digestPrefix, token, callback);
		}

		private final class ServiceHandler extends Handler {
		public static final int MSG_GET_INSTANT_APP_RESOLVE_INFO = 1;
		public static final int MSG_GET_INSTANT_APP_INTENT_FILTER = 2;

		public ServiceHandler(Looper looper) {
		super(looper, null /callback/, true /async/);
		}
		@@ -179,9 +201,13 @@ public abstract class InstantAppResolverService extends Service {
		final IRemoteCallback callback = (IRemoteCallback) args.arg1;
		final int[] digestPrefix = (int[]) args.arg2;
		final String token = (String) args.arg3;
		final Intent intent = (Intent) args.arg4;
		final int sequence = message.arg1;
		_onGetInstantAppResolveInfo(
		digestPrefix, token,
		if (DEBUG_EPHEMERAL) {
		Slog.d(TAG, "[" + token + "] Phase1 request;"
		+ " prefix: " + Arrays.toString(digestPrefix));
		}
		onGetInstantAppResolveInfo(intent, digestPrefix, token,
		new InstantAppResolutionCallback(sequence, callback));
		} break;

		@@ -190,9 +216,12 @@ public abstract class InstantAppResolverService extends Service {
		final IRemoteCallback callback = (IRemoteCallback) args.arg1;
		final int[] digestPrefix = (int[]) args.arg2;
		final String token = (String) args.arg3;
		final String hostName = (String) args.arg4;
		_onGetInstantAppIntentFilter(
		digestPrefix, token, hostName,
		final Intent intent = (Intent) args.arg4;
		if (DEBUG_EPHEMERAL) {
		Slog.d(TAG, "[" + token + "] Phase2 request;"
		+ " prefix: " + Arrays.toString(digestPrefix));
		}
		onGetInstantAppIntentFilter(intent, digestPrefix, token,
		new InstantAppResolutionCallback(-1 /sequence/, callback));
		} break;