Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a050cb authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge changes Iaf59e345,I18ab8227 into main 

* changes:
  Revert "Check sound Uri permission when creating a notification channel"
  Revert "Cleanup flag for notification sound Uri permission check"
parents 94d03ec5 494dd981

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

+7 −2
Original line number Diff line number Diff line
@@ -2809,7 +2809,6 @@ public class NotificationManagerService extends SystemService { 
                mNotificationChannelLogger,

                mAppOps,

                mUserProfiles,

                mUgmInternal,

                mShowReviewPermissionsNotification,

                Clock.systemUTC());

        mRankingHelper = new RankingHelper(getContext(), mRankingHandler, mPreferencesHelper,
@@ -7210,7 +7209,13 @@ public class NotificationManagerService extends SystemService { 
            final Uri originalSoundUri =

                    (originalChannel != null) ? originalChannel.getSound() : null;

            if (soundUri != null && !Objects.equals(originalSoundUri, soundUri)) {

                PermissionHelper.grantUriPermission(mUgmInternal, soundUri, sourceUid);

                Binder.withCleanCallingIdentity(() -> {

                    mUgmInternal.checkGrantUriPermission(sourceUid, null,

                            ContentProvider.getUriWithoutUserId(soundUri),

                            Intent.FLAG_GRANT_READ_URI_PERMISSION,

                            ContentProvider.getUserIdFromUri(soundUri,

                            UserHandle.getUserId(sourceUid)));

                });

            }

        }

































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



+15
−3




























Original line number
Diff line number
Diff line








@@ -37,7 +37,10 @@ import android.app.KeyguardManager;













import android.app.Notification;















import android.app.NotificationChannel;















import android.app.Person;













import android.content.ContentProvider;













import android.content.ContentResolver;















import android.content.Context;













import android.content.Intent;















import android.content.pm.PackageManager;















import android.content.pm.PackageManagerInternal;















import android.content.pm.ShortcutInfo;









@@ -46,6 +49,7 @@ import android.media.AudioAttributes;













import android.media.AudioSystem;















import android.metrics.LogMaker;















import android.net.Uri;













import android.os.Binder;















import android.os.Build;















import android.os.Bundle;















import android.os.IBinder;










@@ -1532,15 +1536,21 @@ public final class NotificationRecord {













     * {@link #mGrantableUris}. Otherwise, this will either log or throw















     * {@link SecurityException} depending on target SDK of enqueuing app.















     */













    private void visitGrantableUri(Uri uri, boolean userOverriddenUri,













            boolean isSound) {













    private void visitGrantableUri(Uri uri, boolean userOverriddenUri, boolean isSound) {













        if (uri == null || !ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) return;





























        if (mGrantableUris != null && mGrantableUris.contains(uri)) {















            return; // already verified this URI















        }































        final int sourceUid = getSbn().getUid();













        final long ident = Binder.clearCallingIdentity();















        try {













            PermissionHelper.grantUriPermission(mUgmInternal, uri, sourceUid);













            // This will throw a SecurityException if the caller can't grant.













            mUgmInternal.checkGrantUriPermission(sourceUid, null,













                    ContentProvider.getUriWithoutUserId(uri),













                    Intent.FLAG_GRANT_READ_URI_PERMISSION,













                    ContentProvider.getUserIdFromUri(uri, UserHandle.getUserId(sourceUid)));































            if (mGrantableUris == null) {















                mGrantableUris = new ArraySet<>();









@@ -1560,6 +1570,8 @@ public final class NotificationRecord {













                    }















                }















            }













        } finally {













            Binder.restoreCallingIdentity(ident);















        }















    }

















































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



+1
−20




























Original line number
Diff line number
Diff line








@@ -25,25 +25,19 @@ import android.Manifest;













import android.annotation.NonNull;















import android.annotation.UserIdInt;















import android.companion.virtual.VirtualDeviceManager;













import android.content.ContentProvider;













import android.content.ContentResolver;















import android.content.Context;













import android.content.Intent;















import android.content.pm.IPackageManager;















import android.content.pm.PackageInfo;















import android.content.pm.PackageManager;















import android.content.pm.ParceledListSlice;













import android.net.Uri;















import android.os.Binder;















import android.os.RemoteException;













import android.os.UserHandle;















import android.permission.IPermissionManager;















import android.util.ArrayMap;















import android.util.Pair;















import android.util.Slog;































import com.android.internal.util.ArrayUtils;













import com.android.server.uri.UriGrantsManagerInternal;































import java.util.Collections;















import java.util.HashSet;










@@ -304,19 +298,6 @@ public final class PermissionHelper {













        return false;















    }





























    static void grantUriPermission(final UriGrantsManagerInternal ugmInternal, Uri uri,













            int sourceUid) {













        if (uri == null || !ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) return;



























        Binder.withCleanCallingIdentity(() -> {













            // This will throw a SecurityException if the caller can't grant.













            ugmInternal.checkGrantUriPermission(sourceUid, null,













                    ContentProvider.getUriWithoutUserId(uri),













                    Intent.FLAG_GRANT_READ_URI_PERMISSION,













                    ContentProvider.getUserIdFromUri(uri, UserHandle.getUserId(sourceUid)));













        });













    }





























    public static class PackagePermission {















        public final String packageName;















        public final @UserIdInt int userId;

































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



+0
−9




























Original line number
Diff line number
Diff line








@@ -100,7 +100,6 @@ import com.android.internal.util.XmlUtils;













import com.android.modules.utils.TypedXmlPullParser;















import com.android.modules.utils.TypedXmlSerializer;















import com.android.server.notification.PermissionHelper.PackagePermission;













import com.android.server.uri.UriGrantsManagerInternal;































import org.json.JSONArray;















import org.json.JSONException;










@@ -228,7 +227,6 @@ public class PreferencesHelper implements RankingConfig {













    private final NotificationChannelLogger mNotificationChannelLogger;















    private final AppOpsManager mAppOps;















    private final ManagedServices.UserProfiles mUserProfiles;













    private final UriGrantsManagerInternal mUgmInternal;































    private SparseBooleanArray mBadgingEnabled;















    private SparseBooleanArray mBubblesEnabled;









@@ -247,7 +245,6 @@ public class PreferencesHelper implements RankingConfig {













            ZenModeHelper zenHelper, PermissionHelper permHelper, PermissionManager permManager,















            NotificationChannelLogger notificationChannelLogger,















            AppOpsManager appOpsManager, ManagedServices.UserProfiles userProfiles,













            UriGrantsManagerInternal ugmInternal,















            boolean showReviewPermissionsNotification, Clock clock) {















        mContext = context;















        mZenModeHelper = zenHelper;









@@ -258,7 +255,6 @@ public class PreferencesHelper implements RankingConfig {













        mNotificationChannelLogger = notificationChannelLogger;















        mAppOps = appOpsManager;















        mUserProfiles = userProfiles;













        mUgmInternal = ugmInternal;















        mShowReviewPermissionsNotification = showReviewPermissionsNotification;















        mIsMediaNotificationFilteringEnabled = context.getResources()















                .getBoolean(R.bool.config_quickSettingsShowMediaPlayer);










@@ -1195,11 +1191,6 @@ public class PreferencesHelper implements RankingConfig {













                }















                clearLockedFieldsLocked(channel);





























                // Verify that the app has permission to read the sound Uri













                // Only check for new channels, as regular apps can only set sound













                // before creating. See: {@link NotificationChannel#setSound}













                PermissionHelper.grantUriPermission(mUgmInternal, channel.getSound(), uid);





























                channel.setImportanceLockedByCriticalDeviceFunction(















                        r.defaultAppLockedImportance || r.fixedImportance);

















































services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java



+0
−35




























Original line number
Diff line number
Diff line








@@ -5210,41 +5210,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {













                eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED));















    }



























    @Test













    public void













        updateNotificationChannelFromPrivilegedListener_oldSoundNoUriPerm_newSoundHasUriPerm()













            throws Exception {













        mService.setPreferencesHelper(mPreferencesHelper);













        when(mCompanionMgr.getAssociations(mPkg, mUserId))













                .thenReturn(singletonList(mock(AssociationInfo.class)));













        when(mPreferencesHelper.getNotificationChannel(eq(mPkg), anyInt(),













                eq(mTestNotificationChannel.getId()), anyBoolean()))













                .thenReturn(mTestNotificationChannel);

























        // Missing Uri permissions for the old channel sound













        final Uri oldSoundUri = Settings.System.DEFAULT_NOTIFICATION_URI;













        doThrow(new SecurityException("no access")).when(mUgmInternal)













                .checkGrantUriPermission(eq(Process.myUid()), any(), eq(oldSoundUri),













                anyInt(), eq(Process.myUserHandle().getIdentifier()));

























        // Has Uri permissions for the old channel sound













        final Uri newSoundUri = Uri.parse("content://media/test/sound/uri");













        final NotificationChannel updatedNotificationChannel = new NotificationChannel(













                TEST_CHANNEL_ID, TEST_CHANNEL_ID, IMPORTANCE_DEFAULT);













        updatedNotificationChannel.setSound(newSoundUri,













                updatedNotificationChannel.getAudioAttributes());

























        mBinderService.updateNotificationChannelFromPrivilegedListener(













                null, mPkg, Process.myUserHandle(), updatedNotificationChannel);

























        verify(mPreferencesHelper, times(1)).updateNotificationChannel(













                anyString(), anyInt(), any(), anyBoolean(),  anyInt(), anyBoolean());

























        verify(mListeners, never()).notifyNotificationChannelChanged(eq(mPkg),













                eq(Process.myUserHandle()), eq(mTestNotificationChannel),













                eq(NotificationListenerService.NOTIFICATION_CHANNEL_OR_GROUP_UPDATED));













    }



























    @Test















    public void testGetNotificationChannelFromPrivilegedListener_cdm_success() throws Exception {















        mService.setPreferencesHelper(mPreferencesHelper);