Merge "Move the NotificationAccessConfirmationActivity component name to... (9260cf28) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/notification/NotificationAccessConfirmationActivityContract.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -17,19 +17,27 @@
		package com.android.internal.notification;

		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;

		import com.android.internal.R;

		/**
		* This class provides methods to create intents for NotificationAccessConfirmationActivity.
		*/
		public final class NotificationAccessConfirmationActivityContract {
		private static final ComponentName COMPONENT_NAME = new ComponentName(
		"com.android.settings",
		"com.android.settings.notification.NotificationAccessConfirmationActivity");
		public static final String EXTRA_USER_ID = "user_id";
		public static final String EXTRA_COMPONENT_NAME = "component_name";
		public static final String EXTRA_PACKAGE_TITLE = "package_title";

		public static Intent launcherIntent(int userId, ComponentName component, String packageTitle) {
		/**
		* Creates a launcher intent for NotificationAccessConfirmationActivity.
		*/
		public static Intent launcherIntent(Context context, int userId, ComponentName component,
		String packageTitle) {
		return new Intent()
		.setComponent(COMPONENT_NAME)
		.setComponent(ComponentName.unflattenFromString(context.getString(
		R.string.config_notificationAccessConfirmationActivity)))
		.putExtra(EXTRA_USER_ID, userId)
		.putExtra(EXTRA_COMPONENT_NAME, component)
		.putExtra(EXTRA_PACKAGE_TITLE, packageTitle);

+6 −0

Original line number	Diff line number	Diff line
		@@ -5174,6 +5174,12 @@
		<item>@array/config_secondaryBuiltInDisplayWaterfallCutout</item>
		</array>

		<!-- The component name of the activity for the companion-device-manager notification access
		confirmation. -->
		<string name="config_notificationAccessConfirmationActivity" translatable="false">
		com.android.settings/com.android.settings.notification.NotificationAccessConfirmationActivity
		</string>

		<!-- Whether the airplane mode should be reset when device boots in non-safemode after exiting
		from safemode.
		This flag should be enabled only when the product does not have any UI to toggle airplane

+1 −0

Original line number	Diff line number	Diff line
		@@ -2221,6 +2221,7 @@
		<java-symbol type="bool" name="config_enableSecondaryLocationTimeZoneProvider" />
		<java-symbol type="string" name="config_secondaryLocationTimeZoneProviderPackageName" />
		<java-symbol type="bool" name="config_autoResetAirplaneMode" />
		<java-symbol type="string" name="config_notificationAccessConfirmationActivity" />

		<java-symbol type="layout" name="resolver_list" />
		<java-symbol type="id" name="resolver_list" />

+1 −1

Original line number	Diff line number	Diff line
		@@ -566,7 +566,7 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		return PendingIntent.getActivityAsUser(getContext(),
		0 /* request code */,
		NotificationAccessConfirmationActivityContract.launcherIntent(
		userId, component, packageTitle),
		getContext(), userId, component, packageTitle),
		PendingIntent.FLAG_IMMUTABLE \| PendingIntent.FLAG_ONE_SHOT
		\| PendingIntent.FLAG_CANCEL_CURRENT,
		null /* options */,