Snap for 6844997 from acbb253b9d61fdc97b3e7f65ad18114a12afd8a8 to rvc-qpr1-release (7d6c286c) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ActivityInfo.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -963,7 +963,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
		/** @hide */
		public static final int LOCK_TASK_LAUNCH_MODE_ALWAYS = 2;
		/** @hide */
		public static final int LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED = 3;
		public static final int LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED = 3;

		/** @hide */
		public static final String lockTaskLaunchModeToString(int lockTaskLaunchMode) {
		@@ -974,8 +974,8 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
		return "LOCK_TASK_LAUNCH_MODE_NEVER";
		case LOCK_TASK_LAUNCH_MODE_ALWAYS:
		return "LOCK_TASK_LAUNCH_MODE_ALWAYS";
		case LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED:
		return "LOCK_TASK_LAUNCH_MODE_IF_WHITELISTED";
		case LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED:
		return "LOCK_TASK_LAUNCH_MODE_IF_ALLOWLISTED";
		default:
		return "unknown=" + lockTaskLaunchMode;
		}

+0 −8

Original line number	Diff line number	Diff line
		@@ -8928,14 +8928,6 @@ public final class Settings {
		*/
		public static final String MEDIA_CONTROLS_RESUME = "qs_media_resumption";

		/**
		* Controls which packages are blocked from persisting in media controls when resumption is
		* enabled. The list of packages is set by the user in the Settings app.
		* @see Settings.Secure#MEDIA_CONTROLS_RESUME
		* @hide
		*/
		public static final String MEDIA_CONTROLS_RESUME_BLOCKED = "qs_media_resumption_blocked";

		/**
		* Controls if window magnification is enabled.
		* @hide

+1 −0

Original line number	Diff line number	Diff line
		@@ -3484,6 +3484,7 @@
		mode -->
		<string-array translatable="false" name="config_priorityOnlyDndExemptPackages">
		<item>com.android.dialer</item>
		<item>com.android.server.telecom</item>
		<item>com.android.systemui</item>
		<item>android</item>
		</string-array>

+1 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,7 @@ applications that come with the platform
		<permission name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
		<permission name="android.permission.UPDATE_APP_OPS_STATS"/>
		<permission name="android.permission.UPDATE_DEVICE_STATS"/>
		<permission name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
		</privapp-permissions>

		<privapp-permissions package="com.android.providers.media.module">

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@
		android:textColor="?attr/wallpaperTextColor"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:imeOptions="flagForceAscii\|actionDone"
		android:maxLength="@integer/password_text_view_scale"
		android:maxLength="@integer/password_max_length"
		/>

		<TextView