Merge "Let NoMan know when something is no longer a bubble" into qt-dev (7acc3301) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ interface IStatusBarService
		in int notificationLocation, boolean modifiedBeforeSending);
		void onNotificationSettingsViewed(String key);
		void setSystemUiVisibility(int displayId, int vis, int mask, String cause);
		void onNotificationBubbleChanged(String key, boolean isBubble);

		void onGlobalActionsShown();
		void onGlobalActionsHidden();

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+17 −10

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import android.app.ActivityManager;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.app.ActivityTaskManager;
		import android.app.IActivityTaskManager;
		import android.app.INotificationManager;
		import android.app.Notification;
		import android.content.Context;
		import android.content.pm.ParceledListSlice;
		@@ -52,6 +51,7 @@ import androidx.annotation.IntDef;
		import androidx.annotation.MainThread;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.statusbar.IStatusBarService;
		import com.android.internal.statusbar.NotificationVisibility;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		@@ -131,8 +131,7 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		private StatusBarStateListener mStatusBarStateListener;

		private final NotificationInterruptionStateProvider mNotificationInterruptionStateProvider;

		private INotificationManager mNotificationManagerService;
		private IStatusBarService mBarService;

		// Used for determining view rect for touch interaction
		private Rect mTempRect = new Rect();
		@@ -207,13 +206,6 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		mNotificationEntryManager = Dependency.get(NotificationEntryManager.class);
		mNotificationEntryManager.addNotificationEntryListener(mEntryListener);

		try {
		mNotificationManagerService = INotificationManager.Stub.asInterface(
		ServiceManager.getServiceOrThrow(Context.NOTIFICATION_SERVICE));
		} catch (ServiceManager.ServiceNotFoundException e) {
		e.printStackTrace();
		}

		mStatusBarWindowController = statusBarWindowController;
		mStatusBarStateListener = new StatusBarStateListener();
		Dependency.get(StatusBarStateController.class).addCallback(mStatusBarStateListener);
		@@ -231,6 +223,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		mBubbleData = data;
		mBubbleData.setListener(mBubbleDataListener);
		mSurfaceSynchronizer = synchronizer;

		mBarService = IStatusBarService.Stub.asInterface(
		ServiceManager.getService(Context.STATUS_BAR_SERVICE));
		}

		/**
		@@ -462,6 +457,18 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		if (mStackView != null) {
		mStackView.removeBubble(bubble);
		}
		if (!bubble.entry.showInShadeWhenBubble()) {
		// The notification is gone & bubble is gone, time to actually remove it
		mNotificationEntryManager.performRemoveNotification(bubble.entry.notification);
		} else {
		// The notification is still in the shade but we've removed the bubble so
		// lets make sure NoMan knows it's not a bubble anymore
		try {
		mBarService.onNotificationBubbleChanged(bubble.getKey(), false /* isBubble */);
		} catch (RemoteException e) {
		// Bad things have happened
		}
		}
		}

		public void onBubbleUpdated(Bubble bubble) {

services/core/java/com/android/server/notification/NotificationDelegate.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ public interface NotificationDelegate {
		int notificationLocation);
		void onNotificationDirectReplied(String key);
		void onNotificationSettingsViewed(String key);
		void onNotificationBubbleChanged(String key, boolean isBubble);

		/**
		* Notifies that smart replies and actions have been added to the UI.

services/core/java/com/android/server/notification/NotificationManagerService.java

+32 −6

Original line number	Diff line number	Diff line
		@@ -1020,6 +1020,24 @@ public class NotificationManagerService extends SystemService {
		}
		}
		}

		@Override
		public void onNotificationBubbleChanged(String key, boolean isBubble) {
		synchronized (mNotificationLock) {
		NotificationRecord r = mNotificationsByKey.get(key);
		if (r != null) {
		final StatusBarNotification n = r.sbn;
		final int callingUid = n.getUid();
		final String pkg = n.getPackageName();
		if (isBubble && isNotificationAppropriateToBubble(r, pkg, callingUid,
		null /* oldEntry */)) {
		r.getNotification().flags \|= FLAG_BUBBLE;
		} else {
		r.getNotification().flags &= ~FLAG_BUBBLE;
		}
		}
		}
		}
		};

		@VisibleForTesting
		@@ -4782,6 +4800,19 @@ public class NotificationManagerService extends SystemService {
		private void flagNotificationForBubbles(NotificationRecord r, String pkg, int userId,
		NotificationRecord oldRecord) {
		Notification notification = r.getNotification();
		if (isNotificationAppropriateToBubble(r, pkg, userId, oldRecord)) {
		notification.flags \|= FLAG_BUBBLE;
		} else {
		notification.flags &= ~FLAG_BUBBLE;
		}
		}

		/**
		* @return whether the provided notification record is allowed to be represented as a bubble.
		*/
		private boolean isNotificationAppropriateToBubble(NotificationRecord r, String pkg, int userId,
		NotificationRecord oldRecord) {
		Notification notification = r.getNotification();

		// Does the app want to bubble & have permission to bubble?
		boolean canBubble = notification.getBubbleMetadata() != null
		@@ -4807,12 +4838,7 @@ public class NotificationManagerService extends SystemService {
		// OR something that was previously a bubble & still exists
		boolean bubbleUpdate = oldRecord != null
		&& (oldRecord.getNotification().flags & FLAG_BUBBLE) != 0;

		if (canBubble && (notificationAppropriateToBubble \|\| appIsForeground \|\| bubbleUpdate)) {
		notification.flags \|= FLAG_BUBBLE;
		} else {
		notification.flags &= ~FLAG_BUBBLE;
		}
		return canBubble && (notificationAppropriateToBubble \|\| appIsForeground \|\| bubbleUpdate);
		}

		private void doChannelWarningToast(CharSequence toastText) {

services/core/java/com/android/server/statusbar/StatusBarManagerService.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -1313,6 +1313,17 @@ public class StatusBarManagerService extends IStatusBarService.Stub implements D
		}
		}

		@Override
		public void onNotificationBubbleChanged(String key, boolean isBubble) {
		enforceStatusBarService();
		long identity = Binder.clearCallingIdentity();
		try {
		mNotificationDelegate.onNotificationBubbleChanged(key, isBubble);
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}

		@Override
		public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err,
		String[] args, ShellCallback callback, ResultReceiver resultReceiver) {