Merge tag 'android-security-11.0.0_r65' of... (98f04721) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -9661,6 +9661,15 @@ public class DevicePolicyManager {
		* {@link android.os.Build.VERSION_CODES#M} the app-op matching the permission is set to
		* {@link android.app.AppOpsManager#MODE_IGNORED}, but the permission stays granted.
		*
		* Control over the following permissions are restricted for managed profile owners:
		* <ul>
		* <li>Manifest.permission.READ_SMS</li>
		* </ul>
		* <p>
		* A managed profile owner may not grant these permissions (i.e. call this method with any of
		* the permissions listed above and {@code grantState} of
		* {@code #PERMISSION_GRANT_STATE_GRANTED}), but may deny them.
		*
		* @param admin Which profile or device owner this request is associated with.
		* @param packageName The application to grant or revoke a permission to.
		* @param permission The permission to grant or revoke.

core/java/android/os/WorkSource.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -129,7 +129,7 @@ public class WorkSource implements Parcelable {
		mNames = in.createStringArray();

		int numChains = in.readInt();
		if (numChains > 0) {
		if (numChains >= 0) {
		mChains = new ArrayList<>(numChains);
		in.readParcelableList(mChains, WorkChain.class.getClassLoader());
		} else {

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

+3 −8

Original line number	Diff line number	Diff line
		@@ -326,17 +326,12 @@ public final class PendingIntentRecord extends IIntentSender.Stub {
		resolvedType = key.requestResolvedType;
		}

		// Apply any launch flags from the ActivityOptions. This is used only by SystemUI
		// to ensure that we can launch the pending intent with a consistent launch mode even
		// if the provided PendingIntent is immutable (ie. to force an activity to launch into
		// a new task, or to launch multiple instances if supported by the app)
		// Apply any launch flags from the ActivityOptions. This is to ensure that the caller
		// can specify a consistent launch mode even if the PendingIntent is immutable
		final ActivityOptions opts = ActivityOptions.fromBundle(options);
		if (opts != null) {
		// TODO(b/254490217): Move this check into SafeActivityOptions
		if (controller.mAtmInternal.isCallerRecents(Binder.getCallingUid())) {
		finalIntent.addFlags(opts.getPendingIntentLaunchFlags());
		}
		}

		// Extract options before clearing calling identity
		mergedOptions = key.options;

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

+47 −32

Original line number	Diff line number	Diff line
		@@ -1744,39 +1744,43 @@ public class NotificationManagerService extends SystemService {
		return (haystack & needle) != 0;
		}

		public boolean isInLockDownMode() {
		return mIsInLockDownMode;
		// Return whether the user is in lockdown mode.
		// If the flag is not set, we assume the user is not in lockdown.
		public boolean isInLockDownMode(int userId) {
		return mUserInLockDownMode.get(userId, false);
		}

		@Override
		public synchronized void onStrongAuthRequiredChanged(int userId) {
		boolean userInLockDownModeNext = containsFlag(getStrongAuthForUser(userId),
		STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN);
		mUserInLockDownMode.put(userId, userInLockDownModeNext);
		boolean isInLockDownModeNext = mUserInLockDownMode.indexOfValue(true) != -1;

		if (mIsInLockDownMode == isInLockDownModeNext) {
		// Nothing happens if the lockdown mode of userId keeps the same.
		if (userInLockDownModeNext == isInLockDownMode(userId)) {
		return;
		}

		if (isInLockDownModeNext) {
		cancelNotificationsWhenEnterLockDownMode();
		// When the lockdown mode is changed, we perform the following steps.
		// If the userInLockDownModeNext is true, all the function calls to
		// notifyPostedLocked and notifyRemovedLocked will not be executed.
		// The cancelNotificationsWhenEnterLockDownMode calls notifyRemovedLocked
		// and postNotificationsWhenExitLockDownMode calls notifyPostedLocked.
		// So we shall call cancelNotificationsWhenEnterLockDownMode before
		// we set mUserInLockDownMode as true.
		// On the other hand, if the userInLockDownModeNext is false, we shall call
		// postNotificationsWhenExitLockDownMode after we put false into mUserInLockDownMode
		if (userInLockDownModeNext) {
		cancelNotificationsWhenEnterLockDownMode(userId);
		}

		// When the mIsInLockDownMode is true, both notifyPostedLocked and
		// notifyRemovedLocked will be dismissed. So we shall call
		// cancelNotificationsWhenEnterLockDownMode before we set mIsInLockDownMode
		// as true and call postNotificationsWhenExitLockDownMode after we set
		// mIsInLockDownMode as false.
		mIsInLockDownMode = isInLockDownModeNext;
		mUserInLockDownMode.put(userId, userInLockDownModeNext);

		if (!isInLockDownModeNext) {
		postNotificationsWhenExitLockDownMode();
		if (!userInLockDownModeNext) {
		postNotificationsWhenExitLockDownMode(userId);
		}
		}
		}

		private LockPatternUtils mLockPatternUtils;
		private StrongAuthTracker mStrongAuthTracker;

		public NotificationManagerService(Context context) {
		@@ -1996,7 +2000,6 @@ public class NotificationManagerService extends SystemService {
		ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));

		mUiHandler = new Handler(UiThread.get().getLooper());
		mLockPatternUtils = new LockPatternUtils(getContext());
		mStrongAuthTracker = new StrongAuthTracker(getContext());
		String[] extractorNames;
		try {
		@@ -2445,7 +2448,7 @@ public class NotificationManagerService extends SystemService {
		bubbsExtractor.setShortcutHelper(mShortcutHelper);
		}
		registerNotificationPreferencesPullers();
		mLockPatternUtils.registerStrongAuthTracker(mStrongAuthTracker);
		new LockPatternUtils(getContext()).registerStrongAuthTracker(mStrongAuthTracker);
		} else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {
		// This observer will force an update when observe is called, causing us to
		// bind to listener services.
		@@ -8706,11 +8709,14 @@ public class NotificationManagerService extends SystemService {
		}
		}

		private void cancelNotificationsWhenEnterLockDownMode() {
		private void cancelNotificationsWhenEnterLockDownMode(int userId) {
		synchronized (mNotificationLock) {
		int numNotifications = mNotificationList.size();
		for (int i = 0; i < numNotifications; i++) {
		NotificationRecord rec = mNotificationList.get(i);
		if (rec.getUser().getIdentifier() != userId) {
		continue;
		}
		mListeners.notifyRemovedLocked(rec, REASON_CANCEL_ALL,
		rec.getStats());
		}
		@@ -8718,14 +8724,23 @@ public class NotificationManagerService extends SystemService {
		}
		}

		private void postNotificationsWhenExitLockDownMode() {
		private void postNotificationsWhenExitLockDownMode(int userId) {
		synchronized (mNotificationLock) {
		int numNotifications = mNotificationList.size();
		// Set the delay to spread out the burst of notifications.
		long delay = 0;
		for (int i = 0; i < numNotifications; i++) {
		NotificationRecord rec = mNotificationList.get(i);
		if (rec.getUser().getIdentifier() != userId) {
		continue;
		}
		mHandler.postDelayed(() -> {
		synchronized (mNotificationLock) {
		mListeners.notifyPostedLocked(rec, rec);
		}

		}, delay);
		delay += 20;
		}
		}
		}

		@@ -8934,12 +8949,15 @@ public class NotificationManagerService extends SystemService {
		* notifications visible to the given listener.
		*/
		@GuardedBy("mNotificationLock")
		private NotificationRankingUpdate makeRankingUpdateLocked(ManagedServiceInfo info) {
		NotificationRankingUpdate makeRankingUpdateLocked(ManagedServiceInfo info) {
		final int N = mNotificationList.size();
		final ArrayList<NotificationListenerService.Ranking> rankings = new ArrayList<>();

		for (int i = 0; i < N; i++) {
		NotificationRecord record = mNotificationList.get(i);
		if (isInLockDownMode(record.getUser().getIdentifier())) {
		continue;
		}
		if (!isVisibleToListener(record.getSbn(), info)) {
		continue;
		}
		@@ -8978,8 +8996,8 @@ public class NotificationManagerService extends SystemService {
		rankings.toArray(new NotificationListenerService.Ranking[0]));
		}

		boolean isInLockDownMode() {
		return mStrongAuthTracker.isInLockDownMode();
		boolean isInLockDownMode(int userId) {
		return mStrongAuthTracker.isInLockDownMode(userId);
		}

		boolean hasCompanionDevice(ManagedServiceInfo info) {
		@@ -9014,7 +9032,8 @@ public class NotificationManagerService extends SystemService {
		ServiceManager.getService(Context.COMPANION_DEVICE_SERVICE));
		}

		private boolean isVisibleToListener(StatusBarNotification sbn, ManagedServiceInfo listener) {
		@VisibleForTesting
		boolean isVisibleToListener(StatusBarNotification sbn, ManagedServiceInfo listener) {
		if (!listener.enabledAndUserMatches(sbn.getUserId())) {
		return false;
		}
		@@ -9700,7 +9719,7 @@ public class NotificationManagerService extends SystemService {
		@GuardedBy("mNotificationLock")
		void notifyPostedLocked(NotificationRecord r, NotificationRecord old,
		boolean notifyAllListeners) {
		if (isInLockDownMode()) {
		if (isInLockDownMode(r.getUser().getIdentifier())) {
		return;
		}

		@@ -9800,7 +9819,7 @@ public class NotificationManagerService extends SystemService {
		@GuardedBy("mNotificationLock")
		public void notifyRemovedLocked(NotificationRecord r, int reason,
		NotificationStats notificationStats) {
		if (isInLockDownMode()) {
		if (isInLockDownMode(r.getUser().getIdentifier())) {
		return;
		}

		@@ -9849,10 +9868,6 @@ public class NotificationManagerService extends SystemService {
		*/
		@GuardedBy("mNotificationLock")
		public void notifyRankingUpdateLocked(List<NotificationRecord> changedHiddenNotifications) {
		if (isInLockDownMode()) {
		return;
		}

		boolean isHiddenRankingUpdate = changedHiddenNotifications != null
		&& changedHiddenNotifications.size() > 0;

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -2347,7 +2347,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		final PackageSetting ps = (PackageSetting)
		mPackageManagerInt.getPackageSetting(newPackage.getPackageName());
		if (grantSignaturePermission(Manifest.permission.SYSTEM_ALERT_WINDOW, newPackage, ps, saw,
		ps.getPermissionsState())) {
		ps.getPermissionsState(), true)) {
		return;
		}
		for (int userId : mUserManagerInt.getUserIds()) {
		@@ -3596,6 +3596,13 @@ public class PermissionManagerService extends IPermissionManager.Stub {

		private boolean grantSignaturePermission(String perm, AndroidPackage pkg,
		PackageSetting pkgSetting, BasePermission bp, PermissionsState origPermissions) {
		return grantSignaturePermission(perm, pkg, pkgSetting, bp, origPermissions, false);
		}


		private boolean grantSignaturePermission(String perm, AndroidPackage pkg,
		PackageSetting pkgSetting, BasePermission bp, PermissionsState origPermissions,
		boolean isApi23Upgrade) {
		boolean oemPermission = bp.isOEM();
		boolean vendorPrivilegedPermission = bp.isVendorPrivileged();
		boolean privilegedPermission = bp.isPrivileged() \|\| bp.isVendorPrivileged();
		@@ -3770,7 +3777,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		// Any pre-installed system app is allowed to get this permission.
		allowed = true;
		}
		if (!allowed && bp.isDevelopment()) {
		if (!allowed && bp.isDevelopment() && !(bp.isPre23() && isApi23Upgrade)) {
		// For development permissions, a development permission
		// is granted only if it was already granted.
		allowed = origPermissions.hasInstallPermission(perm);