Merge "Fixes go to web behavior for Instant Apps" (2d375453) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -575,7 +575,7 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks,

		Intent browserIntent = getTaskIntent(taskId, userId);
		Notification.Builder builder = new Notification.Builder(mContext, NotificationChannels.GENERAL);
		if (browserIntent != null) {
		if (browserIntent != null && browserIntent.isWebIntent()) {
		// Make sure that this doesn't resolve back to an instant app
		browserIntent.setComponent(null)
		.setPackage(null)
		@@ -597,8 +597,9 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks,
		.addCategory("unique:" + System.currentTimeMillis())
		.putExtra(Intent.EXTRA_PACKAGE_NAME, appInfo.packageName)
		.putExtra(Intent.EXTRA_VERSION_CODE, (int) (appInfo.versionCode & 0x7fffffff))
		.putExtra(Intent.EXTRA_VERSION_CODE, appInfo.versionCode)
		.putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, pendingIntent);
		.putExtra(Intent.EXTRA_LONG_VERSION_CODE, appInfo.versionCode)
		.putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, pendingIntent)
		.putExtra(Intent.EXTRA_INSTANT_APP_FAILURE, pendingIntent);

		PendingIntent webPendingIntent = PendingIntent.getActivity(mContext, 0, goToWebIntent, 0);
		Action webAction = new Notification.Action.Builder(null, mContext.getString(R.string.go_to_web),

+1 −0

Original line number	Diff line number	Diff line
		@@ -932,6 +932,7 @@ class ActivityStarter {
		// Don't modify the client's object!
		intent = new Intent(intent);
		if (componentSpecified
		&& !(Intent.ACTION_VIEW.equals(intent.getAction()) && intent.getData() == null)
		&& !Intent.ACTION_INSTALL_INSTANT_APP_PACKAGE.equals(intent.getAction())
		&& !Intent.ACTION_RESOLVE_INSTANT_APP_PACKAGE.equals(intent.getAction())
		&& mService.getPackageManagerInternalLocked()