Merge "Aidl it all!" (1ac1e310) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -226,6 +226,7 @@ LOCAL_SRC_FILES += \
		core/java/android/service/carrier/ICarrierMessagingService.aidl \
		core/java/android/service/gatekeeper/IGateKeeperService.aidl \
		core/java/android/service/notification/INotificationListener.aidl \
		core/java/android/service/notification/INotificationAssistant.aidl \
		core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
		core/java/android/service/notification/IConditionListener.aidl \
		core/java/android/service/notification/IConditionProvider.aidl \

api/current.txt

+11 −6

Original line number	Diff line number	Diff line
		@@ -30919,6 +30919,7 @@ package android.provider {
		field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
		field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
		field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
		@@ -33195,13 +33196,20 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
		}

		public class NotificationAdjustment implements android.os.Parcelable {
		ctor public NotificationAdjustment(int, java.lang.CharSequence, android.net.Uri);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationAdjustment> CREATOR;
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAssistantService.Adjustment);
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAdjustment);
		method public final void clearAnnotation(java.lang.String);
		method public void onNotificationActionClick(java.lang.String, long, int);
		method public void onNotificationClick(java.lang.String, long);
		method public abstract android.service.notification.NotificationAssistantService.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public abstract android.service.notification.NotificationAdjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);
		method public final void setAnnotation(java.lang.String, android.app.Notification);
		@@ -33218,10 +33226,7 @@ package android.service.notification {
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5
		field public static final int REASON_USER_STOPPED = 6; // 0x6
		}

		public class NotificationAssistantService.Adjustment {
		ctor public NotificationAssistantService.Adjustment(int, java.lang.CharSequence, android.net.Uri);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		}

		public abstract class NotificationListenerService extends android.app.Service {

api/system-current.txt

+11 −6

Original line number	Diff line number	Diff line
		@@ -33061,6 +33061,7 @@ package android.provider {
		field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
		field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
		field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
		@@ -35338,13 +35339,20 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
		}

		public class NotificationAdjustment implements android.os.Parcelable {
		ctor public NotificationAdjustment(int, java.lang.CharSequence, android.net.Uri);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationAdjustment> CREATOR;
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAssistantService.Adjustment);
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAdjustment);
		method public final void clearAnnotation(java.lang.String);
		method public void onNotificationActionClick(java.lang.String, long, int);
		method public void onNotificationClick(java.lang.String, long);
		method public abstract android.service.notification.NotificationAssistantService.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public abstract android.service.notification.NotificationAdjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);
		method public final void setAnnotation(java.lang.String, android.app.Notification);
		@@ -35361,10 +35369,7 @@ package android.service.notification {
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5
		field public static final int REASON_USER_STOPPED = 6; // 0x6
		}

		public class NotificationAssistantService.Adjustment {
		ctor public NotificationAssistantService.Adjustment(int, java.lang.CharSequence, android.net.Uri);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		}

		public abstract class NotificationListenerService extends android.app.Service {

api/test-current.txt

+11 −6

Original line number	Diff line number	Diff line
		@@ -30921,6 +30921,7 @@ package android.provider {
		field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_APPLICATIONS_SETTINGS = "android.settings.MANAGE_APPLICATIONS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS";
		field public static final java.lang.String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
		field public static final java.lang.String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
		field public static final java.lang.String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
		@@ -33197,13 +33198,20 @@ package android.service.notification {
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.ConditionProviderService";
		}

		public class NotificationAdjustment implements android.os.Parcelable {
		ctor public NotificationAdjustment(int, java.lang.CharSequence, android.net.Uri);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.service.notification.NotificationAdjustment> CREATOR;
		}

		public abstract class NotificationAssistantService extends android.service.notification.NotificationListenerService {
		ctor public NotificationAssistantService();
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAssistantService.Adjustment);
		method public final void adjustImportance(java.lang.String, android.service.notification.NotificationAdjustment);
		method public final void clearAnnotation(java.lang.String);
		method public void onNotificationActionClick(java.lang.String, long, int);
		method public void onNotificationClick(java.lang.String, long);
		method public abstract android.service.notification.NotificationAssistantService.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public abstract android.service.notification.NotificationAdjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);
		method public void onNotificationRemoved(java.lang.String, long, int);
		method public void onNotificationVisibilityChanged(java.lang.String, long, boolean);
		method public final void setAnnotation(java.lang.String, android.app.Notification);
		@@ -33220,10 +33228,7 @@ package android.service.notification {
		field public static final int REASON_PACKAGE_BANNED = 7; // 0x7
		field public static final int REASON_PACKAGE_CHANGED = 5; // 0x5
		field public static final int REASON_USER_STOPPED = 6; // 0x6
		}

		public class NotificationAssistantService.Adjustment {
		ctor public NotificationAssistantService.Adjustment(int, java.lang.CharSequence, android.net.Uri);
		field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";
		}

		public abstract class NotificationListenerService extends android.app.Service {

core/java/android/provider/Settings.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -1092,6 +1092,22 @@ public final class Settings {
		public static final String ACTION_HOME_SETTINGS
		= "android.settings.HOME_SETTINGS";



		/**
		* Activity Action: Show Default apps settings.
		* <p>
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_MANAGE_DEFAULT_APPS_SETTINGS
		= "android.settings.MANAGE_DEFAULT_APPS_SETTINGS";

		/**
		* Activity Action: Show notification settings.
		*
		@@ -5616,6 +5632,15 @@ public final class Settings {
		*/
		public static final String ASSIST_SCREENSHOT_ENABLED = "assist_screenshot_enabled";

		/**
		* Names of the service component that the current user has explicitly allowed to
		* see and change the importance of all of the user's notifications.
		*
		* @hide
		*/
		public static final String ENABLED_NOTIFICATION_ASSISTANT
		= "enabled_notification_assistant";

		/**
		* Names of the service components that the current user has explicitly allowed to
		* see all of the user's notifications, separated by ':'.