Merge "Launch ephemeral intent" (51295748) · Commits · e / os / android_frameworks_base

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

+4 −14

Original line number	Original line	Diff line number	Diff line
	@@ -46,10 +46,6 @@ import java.util.UUID;

	/** @hide */		/** @hide */
	public abstract class EphemeralResolver {		public abstract class EphemeralResolver {

	/** TODO b/30204367 remove when the platform fully supports ephemeral applications */
	public static final boolean USE_DEFAULT_EPHEMERAL_LAUNCHER = false;

	public static EphemeralResponse doEphemeralResolutionPhaseOne(Context context,		public static EphemeralResponse doEphemeralResolutionPhaseOne(Context context,
	EphemeralResolverConnection connection, EphemeralRequest requestObj) {		EphemeralResolverConnection connection, EphemeralRequest requestObj) {
	final Intent intent = requestObj.origIntent;		final Intent intent = requestObj.origIntent;
	@@ -162,16 +158,10 @@ public abstract class EphemeralResolver {
	new IntentSender(failureIntentTarget));		new IntentSender(failureIntentTarget));
	} catch (RemoteException ignore) { /* ignore; same process */ }		} catch (RemoteException ignore) { /* ignore; same process */ }

	final Intent ephemeralIntent;
	if (EphemeralResolver.USE_DEFAULT_EPHEMERAL_LAUNCHER) {
	// Force the intent to be directed to the ephemeral package
	ephemeralIntent = new Intent(origIntent);
	ephemeralIntent.setPackage(ephemeralPackageName);
	} else {
	// Success intent goes back to the installer		// Success intent goes back to the installer
	ephemeralIntent = new Intent(launchIntent);		final Intent ephemeralIntent = new Intent(launchIntent)
	}		.setComponent(null)
			.setPackage(ephemeralPackageName);
	// Intent that is eventually launched if the ephemeral package was		// Intent that is eventually launched if the ephemeral package was
	// installed successfully. This will actually be launched by a platform		// installed successfully. This will actually be launched by a platform
	// broadcast receiver.		// broadcast receiver.