Snap for 8903569 from f5b0a3e3f727e48d53b42a1e278215c579c7fd32 to tm-qpr1-release (4e32ebe0) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1440,6 +1440,11 @@ public class ActivityOptions extends ComponentOptions {
		return mRemoteTransition;
		}

		/** @hide */
		public void setRemoteTransition(@Nullable RemoteTransition remoteTransition) {
		mRemoteTransition = remoteTransition;
		}

		/** @hide */
		public static ActivityOptions fromBundle(Bundle bOptions) {
		return bOptions != null ? new ActivityOptions(bOptions) : null;

core/java/android/content/integrity/AppInstallMetadata.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -129,9 +129,18 @@ public final class AppInstallMetadata {
		@Override
		public String toString() {
		return String.format(
		"AppInstallMetadata { PackageName = %s, AppCerts = %s, InstallerName = %s,"
		+ " InstallerCerts = %s, VersionCode = %d, PreInstalled = %b, StampPresent ="
		+ " %b, StampVerified = %b, StampTrusted = %b, StampCert = %s }",
		"AppInstallMetadata {"
		+ " PackageName = %s,"
		+ " AppCerts = %s,"
		+ " AppCertsLineage = %s,"
		+ " InstallerName = %s,"
		+ " InstallerCerts = %s,"
		+ " VersionCode = %d,"
		+ " PreInstalled = %b,"
		+ " StampPresent = %b,"
		+ " StampVerified = %b,"
		+ " StampTrusted = %b,"
		+ " StampCert = %s }",
		mPackageName,
		mAppCertificates,
		mAppCertificateLineage,

core/java/com/android/internal/app/BlockedAppStreamingActivity.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ public class BlockedAppStreamingActivity extends AlertActivity {
		private static final String EXTRA_BLOCKED_ACTIVITY_INFO =
		PACKAGE_NAME + ".extra.BLOCKED_ACTIVITY_INFO";
		private static final String EXTRA_STREAMED_DEVICE = PACKAGE_NAME + ".extra.STREAMED_DEVICE";
		private static final String BLOCKED_COMPONENT_PLAYSTORE = "com.android.vending";
		private static final String BLOCKED_COMPONENT_SETTINGS = "com.android.settings";

		@Override
		@@ -62,21 +63,25 @@ public class BlockedAppStreamingActivity extends AlertActivity {
		mAlertParams.mTitle =
		getString(R.string.app_streaming_blocked_title_for_permission_dialog);
		mAlertParams.mMessage =
		getString(R.string.app_streaming_blocked_message_for_permission_dialog,
		streamedDeviceName);
		getString(R.string.app_streaming_blocked_message, streamedDeviceName);
		} else if (TextUtils.equals(activityInfo.packageName, BLOCKED_COMPONENT_PLAYSTORE)) {
		mAlertParams.mTitle =
		getString(R.string.app_streaming_blocked_title_for_playstore_dialog);
		mAlertParams.mMessage =
		getString(R.string.app_streaming_blocked_message, streamedDeviceName);
		} else if (TextUtils.equals(activityInfo.packageName, BLOCKED_COMPONENT_SETTINGS)) {
		mAlertParams.mTitle =
		getString(R.string.app_streaming_blocked_title_for_settings_dialog);
		mAlertParams.mMessage =
		getString(R.string.app_streaming_blocked_message, streamedDeviceName);
		getString(R.string.app_streaming_blocked_message_for_settings_dialog,
		streamedDeviceName);
		} else {
		mAlertParams.mTitle =
		getString(R.string.app_streaming_blocked_title, appLabel);
		// No title required
		mAlertParams.mMessage =
		getString(R.string.app_streaming_blocked_message, streamedDeviceName);
		}
		} else {
		mAlertParams.mTitle = getString(R.string.app_blocked_title);
		// No title required
		mAlertParams.mMessage = getString(R.string.app_blocked_message, appLabel);
		}
		mAlertParams.mPositiveButtonText = getString(android.R.string.ok);

core/java/com/android/internal/jank/InteractionJankMonitor.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_IN
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_APP_LAUNCH_FROM_SETTINGS_BUTTON;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_CLEAR_ALL;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_DIALOG_OPEN;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_EXPAND_COLLAPSE_LOCK;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_HEADS_UP_APPEAR;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_HEADS_UP_DISAPPEAR;
		import static com.android.internal.util.FrameworkStatsLog.UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_NOTIFICATION_ADD;
		@@ -155,7 +154,6 @@ public class InteractionJankMonitor {

		// Every value must have a corresponding entry in CUJ_STATSD_INTERACTION_TYPE.
		public static final int CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE = 0;
		public static final int CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK = 1;
		public static final int CUJ_NOTIFICATION_SHADE_SCROLL_FLING = 2;
		public static final int CUJ_NOTIFICATION_SHADE_ROW_EXPAND = 3;
		public static final int CUJ_NOTIFICATION_SHADE_ROW_SWIPE = 4;
		@@ -226,7 +224,7 @@ public class InteractionJankMonitor {
		public static final int[] CUJ_TO_STATSD_INTERACTION_TYPE = {
		// This should be mapping to CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE.
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__NOTIFICATION_SHADE_SWIPE,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_EXPAND_COLLAPSE_LOCK,
		NO_STATSD_LOGGING, // This is deprecated.
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_SCROLL_FLING,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_ROW_EXPAND,
		UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__SHADE_ROW_SWIPE,
		@@ -310,7 +308,6 @@ public class InteractionJankMonitor {
		/** @hide */
		@IntDef({
		CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE,
		CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK,
		CUJ_NOTIFICATION_SHADE_SCROLL_FLING,
		CUJ_NOTIFICATION_SHADE_ROW_EXPAND,
		CUJ_NOTIFICATION_SHADE_ROW_SWIPE,
		@@ -738,8 +735,6 @@ public class InteractionJankMonitor {
		switch (cujType) {
		case CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE:
		return "SHADE_EXPAND_COLLAPSE";
		case CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE_LOCK:
		return "SHADE_EXPAND_COLLAPSE_LOCK";
		case CUJ_NOTIFICATION_SHADE_SCROLL_FLING:
		return "SHADE_SCROLL_FLING";
		case CUJ_NOTIFICATION_SHADE_ROW_EXPAND:

core/java/com/android/internal/util/LatencyTracker.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,11 @@ public class LatencyTracker {
		*/
		public static final int ACTION_LOAD_SHARE_SHEET = 16;

		/**
		* Time it takes to show AOD display after folding the device.
		*/
		public static final int ACTION_FOLD_TO_AOD = 17;

		private static final int[] ACTIONS_ALL = {
		ACTION_EXPAND_PANEL,
		ACTION_TOGGLE_RECENTS,
		@@ -160,6 +165,7 @@ public class LatencyTracker {
		ACTION_UDFPS_ILLUMINATE,
		ACTION_SHOW_BACK_ARROW,
		ACTION_LOAD_SHARE_SHEET,
		ACTION_FOLD_TO_AOD,
		};

		/** @hide */
		@@ -181,6 +187,7 @@ public class LatencyTracker {
		ACTION_UDFPS_ILLUMINATE,
		ACTION_SHOW_BACK_ARROW,
		ACTION_LOAD_SHARE_SHEET,
		ACTION_FOLD_TO_AOD
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Action {
		@@ -204,6 +211,7 @@ public class LatencyTracker {
		FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_UDFPS_ILLUMINATE,
		FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_SHOW_BACK_ARROW,
		FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_LOAD_SHARE_SHEET,
		FrameworkStatsLog.UIACTION_LATENCY_REPORTED__ACTION__ACTION_FOLD_TO_AOD
		};

		private static LatencyTracker sLatencyTracker;
		@@ -297,6 +305,8 @@ public class LatencyTracker {
		return "ACTION_SHOW_BACK_ARROW";
		case 17:
		return "ACTION_LOAD_SHARE_SHEET";
		case 19:
		return "ACTION_FOLD_TO_AOD";
		default:
		throw new IllegalArgumentException("Invalid action");
		}