Merge cherrypicks of [14455420, 14455440] into sc-release (6fda10a8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActiveServices.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -155,7 +155,6 @@ import com.android.server.AppStateTracker;
		import com.android.server.LocalServices;
		import com.android.server.SystemService;
		import com.android.server.am.ActivityManagerService.ItemMatcher;
		import com.android.server.notification.NotificationManagerInternal;
		import com.android.server.uri.NeededUriGrants;
		import com.android.server.wm.ActivityServiceConnectionsHolder;

		@@ -1977,17 +1976,6 @@ public final class ActiveServices {
		// DeviceConfig element has been set
		showNow = isLegacyApp && mAm.mConstants.mFlagFgsNotificationDeferralApiGated;
		}
		if (!showNow) {
		// did we already show it?
		showNow = r.mFgsNotificationShown;
		}
		if (!showNow) {
		// Is the notification already showing for any reason?
		final NotificationManagerInternal nmi =
		LocalServices.getService(NotificationManagerInternal.class);
		showNow = nmi.isNotificationShown(r.appInfo.packageName, null,
		r.foregroundId, UserHandle.getUserId(uid));
		}
		if (!showNow) {
		// has the app forced deferral?
		if (!r.foregroundNoti.isForegroundDisplayForceDeferred()) {

+0 −3

Original line number	Diff line number	Diff line
		@@ -30,9 +30,6 @@ public interface NotificationManagerInternal {
		void cancelNotification(String pkg, String basePkg, int callingUid, int callingPid,
		String tag, int id, int userId);

		/** is the given notification currently showing? */
		boolean isNotificationShown(String pkg, String tag, int notificationId, int userId);

		void removeForegroundServiceFlagFromNotification(String pkg, int notificationId, int userId);

		void onConversationRemoved(String pkg, int uid, Set<String> shortcuts);

+0 −7

Original line number	Diff line number	Diff line
		@@ -6047,13 +6047,6 @@ public class NotificationManagerService extends SystemService {
		cancelNotificationInternal(pkg, opPkg, callingUid, callingPid, tag, id, userId);
		}

		@Override
		public boolean isNotificationShown(String pkg, String tag, int notificationId, int userId) {
		synchronized (mNotificationLock) {
		return findNotificationLocked(pkg, tag, notificationId, userId) != null;
		}
		}

		@Override
		public void removeForegroundServiceFlagFromNotification(String pkg, int notificationId,
		int userId) {