Merge "Rename references to DND Access in API documentation" into main (808eb0f6) · Commits · e / os / android_frameworks_base

core/java/android/app/NotificationManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ public class NotificationManager {
		* changes.
		*
		* <p>This broadcast is only sent to registered receivers and receivers in packages that have
		* been granted Do Not Disturb access (see {@link #isNotificationPolicyAccessGranted()}).
		* been granted Notification Policy access (see {@link #isNotificationPolicyAccessGranted()}).
		*/
		@FlaggedApi(Flags.FLAG_MODES_API)
		@SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)
		@@ -1627,7 +1627,7 @@ public class NotificationManager {
		}

		/**
		* Checks the ability to modify notification do not disturb policy for the calling package.
		* Checks the ability to modify Notification Policy for the calling package.
		*
		* <p>
		* Returns true if the calling package can modify notification policy.

core/java/android/provider/Settings.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -1972,10 +1972,10 @@ public final class Settings {
		"android.provider.extra.NOTIFICATION_LISTENER_COMPONENT_NAME";

		/**
		* Activity Action: Show Do Not Disturb access settings.
		* Activity Action: Show Notification Policy access settings.
		* <p>
		* Users can grant and deny access to Do Not Disturb configuration from here. Managed
		* profiles cannot grant Do Not Disturb access.
		* Users can grant and deny access to Notification Policy (DND / Priority Modes) configuration
		* from here. Managed profiles cannot grant Notification Policy access.
		* See {@link android.app.NotificationManager#isNotificationPolicyAccessGranted()} for more
		* details.
		* <p>

media/java/android/media/AudioManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1027,7 +1027,7 @@ public class AudioManager {
		* <p>This method has no effect if the device implements a fixed volume policy
		* as indicated by {@link #isVolumeFixed()}.
		* <p>From N onward, ringer mode adjustments that would toggle Do Not Disturb are not allowed
		* unless the app has been granted Do Not Disturb Access.
		* unless the app has been granted Notification Policy Access.
		* See {@link NotificationManager#isNotificationPolicyAccessGranted()}.
		*
		* @param streamType The stream type to adjust. One of {@link #STREAM_VOICE_CALL},
		@@ -1379,7 +1379,7 @@ public class AudioManager {
		* <p>This method has no effect if the device implements a fixed volume policy
		* as indicated by {@link #isVolumeFixed()}.
		* * <p>From N onward, ringer mode adjustments that would toggle Do Not Disturb are not allowed
		* unless the app has been granted Do Not Disturb Access.
		* unless the app has been granted Notification Policy Access.
		* See {@link NotificationManager#isNotificationPolicyAccessGranted()}.
		* @param ringerMode The ringer mode, one of {@link #RINGER_MODE_NORMAL},
		* {@link #RINGER_MODE_SILENT}, or {@link #RINGER_MODE_VIBRATE}.
		@@ -1403,7 +1403,7 @@ public class AudioManager {
		* <p>This method has no effect if the device implements a fixed volume policy
		* as indicated by {@link #isVolumeFixed()}.
		* <p>From N onward, volume adjustments that would toggle Do Not Disturb are not allowed unless
		* the app has been granted Do Not Disturb Access.
		* the app has been granted Notification Policy Access.
		* See {@link NotificationManager#isNotificationPolicyAccessGranted()}.
		* @param streamType The stream whose volume index should be set.
		* @param index The volume index to set. See
		@@ -8829,7 +8829,7 @@ public class AudioManager {
		* <p>This method has no effect if the device implements a fixed volume policy
		* as indicated by {@link #isVolumeFixed()}.
		* <p>From N onward, ringer mode adjustments that would toggle Do Not Disturb are not allowed
		* unless the app has been granted Do Not Disturb Access.
		* unless the app has been granted Notification Policy Access.
		* See {@link NotificationManager#isNotificationPolicyAccessGranted()}.
		* <p>This API checks if the caller has the necessary permissions based on the provided
		* component name, uid, and pid values.
		@@ -8870,7 +8870,7 @@ public class AudioManager {
		* <p>This method has no effect if the device implements a fixed volume policy
		* as indicated by {@link #isVolumeFixed()}.
		* <p>From N onward, volume adjustments that would toggle Do Not Disturb are not allowed unless
		* the app has been granted Do Not Disturb Access.
		* the app has been granted Notification Policy Access.
		* See {@link NotificationManager#isNotificationPolicyAccessGranted()}.
		* <p>This API checks if the caller has the necessary permissions based on the provided
		* component name, uid, and pid values.