Merge "Fix background bypass via notifications" into qt-dev am: 22500563c1 (57af3050) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -2950,6 +2950,19 @@ public class Notification implements Parcelable
		builder.build(); // callers expect this notification to be ready to use
		}

		/**
		* Sets the token used for background operations for the pending intents associated with this
		* notification.
		*
		* This token is automatically set during deserialization for you, you usually won't need to
		* call this unless you want to change the existing token, if any.
		*
		* @hide
		*/
		public void setAllowlistToken(@Nullable IBinder token) {
		mWhitelistToken = token;
		}

		/**
		* @hide
		*/

+7 −1

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

		/** Notifications returned here will have allowlistToken stripped from them. */
		private StatusBarNotification sanitizeSbn(String pkg, int userId,
		StatusBarNotification sbn) {
		if (sbn.getUserId() == userId) {
		@@ -3114,11 +3115,16 @@ public class NotificationManagerService extends SystemService {
		// We could pass back a cloneLight() but clients might get confused and
		// try to send this thing back to notify() again, which would not work
		// very well.
		Notification notification = sbn.getNotification().clone();
		// Remove background token before returning notification to untrusted app, this
		// ensures the app isn't able to perform background operations that are
		// associated with notification interactions.
		notification.setAllowlistToken(null);
		return new StatusBarNotification(
		sbn.getPackageName(),
		sbn.getOpPkg(),
		sbn.getId(), sbn.getTag(), sbn.getUid(), sbn.getInitialPid(),
		sbn.getNotification().clone(),
		notification,
		sbn.getUser(), sbn.getOverrideGroupKey(), sbn.getPostTime());
		}
		}