Merge "Expose get/set notification listeners as a @SystemAPI" (4587809e) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ package android {
		field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION";
		field public static final String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";
		field public static final String MANAGE_MUSIC_RECOGNITION = "android.permission.MANAGE_MUSIC_RECOGNITION";
		field public static final String MANAGE_NOTIFICATION_LISTENERS = "android.permission.MANAGE_NOTIFICATION_LISTENERS";
		field public static final String MANAGE_ONE_TIME_PERMISSION_SESSIONS = "android.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS";
		field public static final String MANAGE_ROLE_HOLDERS = "android.permission.MANAGE_ROLE_HOLDERS";
		field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
		@@ -674,8 +675,10 @@ package android.app {
		public class NotificationManager {
		method @NonNull public java.util.List<java.lang.String> getAllowedAssistantAdjustments();
		method @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public java.util.List<android.content.ComponentName> getEnabledNotificationListeners();
		method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);
		method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean);
		field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_CLOSE_NOTIFICATION_HANDLER_PANEL = "android.app.action.CLOSE_NOTIFICATION_HANDLER_PANEL";
		field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_OPEN_NOTIFICATION_HANDLER_PANEL = "android.app.action.OPEN_NOTIFICATION_HANDLER_PANEL";
		field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_TOGGLE_NOTIFICATION_HANDLER_PANEL = "android.app.action.TOGGLE_NOTIFICATION_HANDLER_PANEL";

api/test-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ package android {
		field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";
		field public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
		field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES";
		field public static final String MANAGE_NOTIFICATION_LISTENERS = "android.permission.MANAGE_NOTIFICATION_LISTENERS";
		field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
		field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS";
		field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK";
		@@ -494,9 +495,11 @@ package android.app {
		method @NonNull public java.util.List<java.lang.String> getAllowedAssistantAdjustments();
		method @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
		method public android.content.ComponentName getEffectsSuppressor();
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public java.util.List<android.content.ComponentName> getEnabledNotificationListeners();
		method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);
		method public boolean matchesCallFilter(android.os.Bundle);
		method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean);
		method public void updateNotificationChannel(@NonNull String, int, @NonNull android.app.NotificationChannel);
		}

core/java/android/app/NotificationManager.java

+29 −2

Original line number	Diff line number	Diff line
		@@ -1567,8 +1567,20 @@ public class NotificationManager {
		}
		}

		/** @hide */
		public void setNotificationListenerAccessGranted(ComponentName listener, boolean granted) {
		/**
		* Grants/revokes Notification Listener access to the given component for current user.
		* To grant access for a particular user, obtain this service by using the {@link Context}
		* provided by {@link Context#createPackageContextAsUser}
		*
		* @param listener Name of component to grant/revoke access
		* @param granted Grant/revoke access
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS)
		public void setNotificationListenerAccessGranted(
		@NonNull ComponentName listener, boolean granted) {
		INotificationManager service = getService();
		try {
		service.setNotificationListenerAccessGranted(listener, granted);
		@@ -1610,6 +1622,21 @@ public class NotificationManager {
		}
		}

		/**
		* Gets the list of enabled notification listener components for current user.
		* To query for a particular user, obtain this service by using the {@link Context}
		* provided by {@link Context#createPackageContextAsUser}
		*
		* @return the list of {@link ComponentName}s of the notification listeners
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS)
		public @NonNull List<ComponentName> getEnabledNotificationListeners() {
		return getEnabledNotificationListeners(mContext.getUserId());
		}

		/** @hide */
		public List<ComponentName> getEnabledNotificationListeners(int userId) {
		INotificationManager service = getService();

core/res/AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -4518,6 +4518,12 @@
		<permission android:name="android.permission.MANAGE_NOTIFICATIONS"
		android:protectionLevel="signature" />

		<!-- @SystemApi @TestApi Allows adding/removing enabled notification listener components.
		@hide -->
		<permission android:name="android.permission.MANAGE_NOTIFICATION_LISTENERS"
		android:protectionLevel="signature" />
		<uses-permission android:name="android.permission.MANAGE_NOTIFICATION_LISTENERS" />

		<!-- Allows notifications to be colorized
		<p>Not for use by third-party applications. @hide -->
		<permission android:name="android.permission.USE_COLORIZED_NOTIFICATIONS"

non-updatable-api/system-current.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,7 @@ package android {
		field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION";
		field public static final String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";
		field public static final String MANAGE_MUSIC_RECOGNITION = "android.permission.MANAGE_MUSIC_RECOGNITION";
		field public static final String MANAGE_NOTIFICATION_LISTENERS = "android.permission.MANAGE_NOTIFICATION_LISTENERS";
		field public static final String MANAGE_ONE_TIME_PERMISSION_SESSIONS = "android.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS";
		field public static final String MANAGE_ROLE_HOLDERS = "android.permission.MANAGE_ROLE_HOLDERS";
		field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
		@@ -674,8 +675,10 @@ package android.app {
		public class NotificationManager {
		method @NonNull public java.util.List<java.lang.String> getAllowedAssistantAdjustments();
		method @Nullable public android.content.ComponentName getAllowedNotificationAssistant();
		method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public java.util.List<android.content.ComponentName> getEnabledNotificationListeners();
		method public boolean isNotificationAssistantAccessGranted(@NonNull android.content.ComponentName);
		method public void setNotificationAssistantAccessGranted(@Nullable android.content.ComponentName, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean);
		field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_CLOSE_NOTIFICATION_HANDLER_PANEL = "android.app.action.CLOSE_NOTIFICATION_HANDLER_PANEL";
		field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_OPEN_NOTIFICATION_HANDLER_PANEL = "android.app.action.OPEN_NOTIFICATION_HANDLER_PANEL";
		field @RequiresPermission(android.Manifest.permission.STATUS_BAR_SERVICE) public static final String ACTION_TOGGLE_NOTIFICATION_HANDLER_PANEL = "android.app.action.TOGGLE_NOTIFICATION_HANDLER_PANEL";