Merge "Zen: New user flow for requesting DND access." into mnc-dev (20ac61b8) · Commits · e / os / android_frameworks_base

Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -74,7 +74,6 @@ LOCAL_SRC_FILES += \
		core/java/android/app/IBackupAgent.aidl \
		core/java/android/app/IInstrumentationWatcher.aidl \
		core/java/android/app/INotificationManager.aidl \
		core/java/android/app/INotificationManagerCallback.aidl \
		core/java/android/app/IProcessObserver.aidl \
		core/java/android/app/ISearchManager.aidl \
		core/java/android/app/ISearchManagerCallback.aidl \

api/current.txt

+3 −8

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ package android {
		field public static final java.lang.String ACCESS_LOCATION_EXTRA_COMMANDS = "android.permission.ACCESS_LOCATION_EXTRA_COMMANDS";
		field public static final java.lang.String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";
		field public static final java.lang.String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE";
		field public static final java.lang.String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY";
		field public static final java.lang.String ACCESS_SURFACE_FLINGER = "android.permission.ACCESS_SURFACE_FLINGER";
		field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";
		field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";
		@@ -5117,10 +5118,10 @@ package android.app {
		method public boolean isNotificationPolicyAccessGranted();
		method public void notify(int, android.app.Notification);
		method public void notify(java.lang.String, int, android.app.Notification);
		method public void requestPolicyAccess(android.app.NotificationManager.NotificationPolicyAccessRequestCallback, android.os.Handler);
		method public final void setInterruptionFilter(int);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy);
		field public static final java.lang.String ACTION_INTERRUPTION_FILTER_CHANGED = "android.app.action.INTERRUPTION_FILTER_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED = "android.app.action.NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";
		field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4
		field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1
		@@ -5129,12 +5130,6 @@ package android.app {
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		}

		public static abstract class NotificationManager.NotificationPolicyAccessRequestCallback {
		ctor public NotificationManager.NotificationPolicyAccessRequestCallback();
		method public abstract void onAccessDenied();
		method public abstract void onAccessGranted();
		}

		public static class NotificationManager.Policy implements android.os.Parcelable {
		ctor public NotificationManager.Policy(int, int, int);
		method public int describeContents();
		@@ -26548,6 +26543,7 @@ package android.provider {
		field public static final java.lang.String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS";
		field public static final java.lang.String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS";
		field public static final java.lang.String ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS";
		field public static final java.lang.String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS";
		field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
		field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS";
		@@ -26566,7 +26562,6 @@ package android.provider {
		field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";
		field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
		field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
		field public static final java.lang.String ACTION_ZEN_ACCESS_SETTINGS = "android.settings.ZEN_ACCESS_SETTINGS";
		field public static final java.lang.String AUTHORITY = "settings";
		field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";
		field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";

api/system-current.txt

+3 −8

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android {
		field public static final java.lang.String ACCESS_NETWORK_CONDITIONS = "android.permission.ACCESS_NETWORK_CONDITIONS";
		field public static final java.lang.String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE";
		field public static final java.lang.String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";
		field public static final java.lang.String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY";
		field public static final java.lang.String ACCESS_SURFACE_FLINGER = "android.permission.ACCESS_SURFACE_FLINGER";
		field public static final java.lang.String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";
		field public static final java.lang.String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";
		@@ -5213,10 +5214,10 @@ package android.app {
		method public boolean isNotificationPolicyAccessGranted();
		method public void notify(int, android.app.Notification);
		method public void notify(java.lang.String, int, android.app.Notification);
		method public void requestPolicyAccess(android.app.NotificationManager.NotificationPolicyAccessRequestCallback, android.os.Handler);
		method public final void setInterruptionFilter(int);
		method public void setNotificationPolicy(android.app.NotificationManager.Policy);
		field public static final java.lang.String ACTION_INTERRUPTION_FILTER_CHANGED = "android.app.action.INTERRUPTION_FILTER_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED = "android.app.action.NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_CHANGED = "android.app.action.NOTIFICATION_POLICY_CHANGED";
		field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4
		field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1
		@@ -5225,12 +5226,6 @@ package android.app {
		field public static final int INTERRUPTION_FILTER_UNKNOWN = 0; // 0x0
		}

		public static abstract class NotificationManager.NotificationPolicyAccessRequestCallback {
		ctor public NotificationManager.NotificationPolicyAccessRequestCallback();
		method public abstract void onAccessDenied();
		method public abstract void onAccessGranted();
		}

		public static class NotificationManager.Policy implements android.os.Parcelable {
		ctor public NotificationManager.Policy(int, int, int);
		method public int describeContents();
		@@ -28580,6 +28575,7 @@ package android.provider {
		field public static final java.lang.String ACTION_NFC_PAYMENT_SETTINGS = "android.settings.NFC_PAYMENT_SETTINGS";
		field public static final java.lang.String ACTION_NFC_SETTINGS = "android.settings.NFC_SETTINGS";
		field public static final java.lang.String ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS";
		field public static final java.lang.String ACTION_NOTIFICATION_POLICY_ACCESS_SETTINGS = "android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS";
		field public static final java.lang.String ACTION_PRINT_SETTINGS = "android.settings.ACTION_PRINT_SETTINGS";
		field public static final java.lang.String ACTION_PRIVACY_SETTINGS = "android.settings.PRIVACY_SETTINGS";
		field public static final java.lang.String ACTION_QUICK_LAUNCH_SETTINGS = "android.settings.QUICK_LAUNCH_SETTINGS";
		@@ -28598,7 +28594,6 @@ package android.provider {
		field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";
		field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
		field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
		field public static final java.lang.String ACTION_ZEN_ACCESS_SETTINGS = "android.settings.ZEN_ACCESS_SETTINGS";
		field public static final java.lang.String AUTHORITY = "settings";
		field public static final java.lang.String EXTRA_ACCOUNT_TYPES = "account_types";
		field public static final java.lang.String EXTRA_AIRPLANE_MODE_ENABLED = "airplane_mode_enabled";

core/java/android/app/INotificationManager.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@

		package android.app;

		import android.app.INotificationManagerCallback;
		import android.app.ITransientNotification;
		import android.app.Notification;
		import android.app.NotificationManager;
		@@ -87,7 +86,6 @@ interface INotificationManager
		oneway void setZenMode(int mode, in Uri conditionId, String reason);
		oneway void notifyConditions(String pkg, in IConditionProvider provider, in Condition[] conditions);
		oneway void requestZenModeConditions(in IConditionListener callback, int relevance);
		oneway void requestNotificationPolicyAccess(String pkg, in INotificationManagerCallback callback);
		boolean isNotificationPolicyAccessGranted(String pkg);
		NotificationManager.Policy getNotificationPolicy(String pkg);
		void setNotificationPolicy(String pkg, in NotificationManager.Policy policy);

core/java/android/app/INotificationManagerCallback.aidl

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2015, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app;

		import android.app.NotificationManager;

		/** @hide */
		oneway interface INotificationManagerCallback {
		void onPolicyRequestResult(boolean granted);
		}