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

Commit 4b6748bf authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Check URI permissions for resumable media artwork" into udc-dev-plus-aosp am: 72596e21 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24802586



Change-Id: I748425bc91b1c7b3c09c5211cbeb7ed4936559de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d59d2a58 72596e21

core/java/android/app/IUriGrantsManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -39,4 +39,7 @@ interface IUriGrantsManager { 
    void clearGrantedUriPermissions(in String packageName, int userId);

    ParceledListSlice getUriPermissions(in String packageName, boolean incoming,

            boolean persistedOnly);



    int checkGrantUriPermission_ignoreNonSystem(

            int sourceUid, String targetPkg, in Uri uri, int modeFlags, int userId);

}

packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt

+30 −3
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ import android.app.Notification.EXTRA_SUBSTITUTE_APP_NAME 
import android.app.PendingIntent

import android.app.StatusBarManager

import android.app.smartspace.SmartspaceAction

import android.app.UriGrantsManager

import android.app.smartspace.SmartspaceConfig

import android.app.smartspace.SmartspaceManager

import android.app.smartspace.SmartspaceSession

import android.app.smartspace.SmartspaceTarget

import android.content.BroadcastReceiver

import android.content.ContentProvider

import android.content.ContentResolver

import android.content.Context

import android.content.Intent
@@ -700,10 +702,13 @@ class MediaDataManager( 
            Log.d(TAG, "adding track for $userId from browser: $desc")

        }



        val currentEntry = mediaEntries.get(packageName)

        val appUid = currentEntry?.appUid ?: Process.INVALID_UID



        // Album art

        var artworkBitmap = desc.iconBitmap

        if (artworkBitmap == null && desc.iconUri != null) {

            artworkBitmap = loadBitmapFromUri(desc.iconUri!!)

            artworkBitmap = loadBitmapFromUriForUser(desc.iconUri!!, userId, appUid, packageName)

        }

        val artworkIcon =

            if (artworkBitmap != null) {
@@ -712,9 +717,7 @@ class MediaDataManager( 
                null

            }



        val currentEntry = mediaEntries.get(packageName)

        val instanceId = currentEntry?.instanceId ?: logger.getNewInstanceId()

        val appUid = currentEntry?.appUid ?: Process.INVALID_UID

        val isExplicit =

            desc.extras?.getLong(MediaConstants.METADATA_KEY_IS_EXPLICIT) ==

                MediaConstants.METADATA_VALUE_ATTRIBUTE_PRESENT &&
@@ -1261,6 +1264,30 @@ class MediaDataManager( 
            false

        }

    }



    /** Returns a bitmap if the user can access the given URI, else null */

    private fun loadBitmapFromUriForUser(

        uri: Uri,

        userId: Int,

        appUid: Int,

        packageName: String,

    ): Bitmap? {

        try {

            val ugm = UriGrantsManager.getService()

            ugm.checkGrantUriPermission_ignoreNonSystem(

                appUid,

                packageName,

                ContentProvider.getUriWithoutUserId(uri),

                Intent.FLAG_GRANT_READ_URI_PERMISSION,

                ContentProvider.getUserIdFromUri(uri, userId)

            )

            return loadBitmapFromUri(uri)

        } catch (e: SecurityException) {

            Log.e(TAG, "Failed to get URI permission: $e")

        }

        return null

    }



    /**

     * Load a bitmap from a URI

     *

packages/SystemUI/tests/src/com/android/systemui/media/controls/pipeline/MediaDataManagerTest.kt

+79 −0
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


package com.android.systemui.media.controls.pipeline



import android.app.IUriGrantsManager

import android.app.Notification

import android.app.Notification.FLAG_NO_CLEAR

import android.app.Notification.MediaStyle

import android.app.PendingIntent

import android.app.UriGrantsManager

import android.app.smartspace.SmartspaceAction

import android.app.smartspace.SmartspaceConfig

import android.app.smartspace.SmartspaceManager
@@ -27,12 +29,14 @@ import android.app.smartspace.SmartspaceTarget 
import android.content.Intent

import android.content.pm.PackageManager

import android.graphics.Bitmap

import android.graphics.ImageDecoder

import android.graphics.drawable.Icon

import android.media.MediaDescription

import android.media.MediaMetadata

import android.media.session.MediaController

import android.media.session.MediaSession

import android.media.session.PlaybackState

import android.net.Uri

import android.os.Bundle

import android.provider.Settings

import android.service.notification.StatusBarNotification
@@ -40,6 +44,7 @@ import android.testing.AndroidTestingRunner 
import android.testing.TestableLooper.RunWithLooper

import androidx.media.utils.MediaConstants

import androidx.test.filters.SmallTest

import com.android.dx.mockito.inline.extended.ExtendedMockito

import com.android.internal.logging.InstanceId

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.InstanceIdSequenceFake
@@ -83,7 +88,9 @@ import org.mockito.Mockito.reset 
import org.mockito.Mockito.verify

import org.mockito.Mockito.verifyNoMoreInteractions

import org.mockito.Mockito.`when` as whenever

import org.mockito.MockitoSession

import org.mockito.junit.MockitoJUnit

import org.mockito.quality.Strictness



private const val KEY = "KEY"

private const val KEY_2 = "KEY_2"
@@ -149,6 +156,8 @@ class MediaDataManagerTest : SysuiTestCase() { 
    @Captor lateinit var stateCallbackCaptor: ArgumentCaptor<(String, PlaybackState) -> Unit>

    @Captor lateinit var sessionCallbackCaptor: ArgumentCaptor<(String) -> Unit>

    @Captor lateinit var smartSpaceConfigBuilderCaptor: ArgumentCaptor<SmartspaceConfig>

    @Mock private lateinit var ugm: IUriGrantsManager

    @Mock private lateinit var imageSource: ImageDecoder.Source



    private val instanceIdSequence = InstanceIdSequenceFake(1 shl 20)
@@ -159,8 +168,17 @@ class MediaDataManagerTest : SysuiTestCase() { 
            1

        )



    private lateinit var staticMockSession: MockitoSession



    @Before

    fun setup() {

        staticMockSession =

            ExtendedMockito.mockitoSession()

                .mockStatic<UriGrantsManager>(UriGrantsManager::class.java)

                .mockStatic<ImageDecoder>(ImageDecoder::class.java)

                .strictness(Strictness.LENIENT)

                .startMocking()

        whenever(UriGrantsManager.getService()).thenReturn(ugm)

        foregroundExecutor = FakeExecutor(clock)

        backgroundExecutor = FakeExecutor(clock)

        uiExecutor = FakeExecutor(clock)
@@ -271,6 +289,7 @@ class MediaDataManagerTest : SysuiTestCase() { 


    @After

    fun tearDown() {

        staticMockSession.finishMocking()

        session.release()

        mediaDataManager.destroy()

        Settings.Secure.putInt(
@@ -2199,6 +2218,66 @@ class MediaDataManagerTest : SysuiTestCase() { 
        verify(listener).onMediaDataRemoved(eq(KEY))

    }



    @Test

    fun testResumeMediaLoaded_hasArtPermission_artLoaded() {

        // When resume media is loaded and user/app has permission to access the art URI,

        whenever(

                ugm.checkGrantUriPermission_ignoreNonSystem(

                    anyInt(),

                    any(),

                    any(),

                    anyInt(),

                    anyInt()

                )

            )

            .thenReturn(1)

        val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)

        val uri = Uri.parse("content://example")

        whenever(ImageDecoder.createSource(any(), eq(uri))).thenReturn(imageSource)

        whenever(ImageDecoder.decodeBitmap(any(), any())).thenReturn(artwork)



        val desc =

            MediaDescription.Builder().run {

                setTitle(SESSION_TITLE)

                setIconUri(uri)

                build()

            }

        addResumeControlAndLoad(desc)



        // Then the artwork is loaded

        assertThat(mediaDataCaptor.value.artwork).isNotNull()

    }



    @Test

    fun testResumeMediaLoaded_noArtPermission_noArtLoaded() {

        // When resume media is loaded and user/app does not have permission to access the art URI

        whenever(

                ugm.checkGrantUriPermission_ignoreNonSystem(

                    anyInt(),

                    any(),

                    any(),

                    anyInt(),

                    anyInt()

                )

            )

            .thenThrow(SecurityException("Test no permission"))

        val artwork = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)

        val uri = Uri.parse("content://example")

        whenever(ImageDecoder.createSource(any(), eq(uri))).thenReturn(imageSource)

        whenever(ImageDecoder.decodeBitmap(any(), any())).thenReturn(artwork)



        val desc =

            MediaDescription.Builder().run {

                setTitle(SESSION_TITLE)

                setIconUri(uri)

                build()

            }

        addResumeControlAndLoad(desc)



        // Then the artwork is not loaded

        assertThat(mediaDataCaptor.value.artwork).isNull()

    }



    /** Helper function to add a basic media notification and capture the resulting MediaData */

    private fun addNotificationAndLoad() {

        addNotificationAndLoad(mediaNotification)

services/core/java/com/android/server/uri/UriGrantsManagerService.java

+42 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import static org.xmlpull.v1.XmlPullParser.START_TAG; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.AppGlobals;
@@ -62,6 +63,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Looper;

import android.os.Message;

import android.os.Process;

import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;
@@ -1304,6 +1306,46 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub implements 
        return false;

    }



    /**

     * Check if the targetPkg can be granted permission to access uri by

     * the callingUid using the given modeFlags. See {@link #checkGrantUriPermissionUnlocked}.

     *

     * @param callingUid The uid of the grantor app that has permissions to the uri.

     * @param targetPkg The package name of the granted app that needs permissions to the uri.

     * @param uri The uri for which permissions should be granted.

     * @param modeFlags The modes to grant. See {@link Intent#FLAG_GRANT_READ_URI_PERMISSION}, etc.

     * @param userId The userId in which the uri is to be resolved.

     * @return uid of the target or -1 if permission grant not required. Returns -1 if the caller

     *  does not hold INTERACT_ACROSS_USERS_FULL

     * @throws SecurityException if the grant is not allowed.

     */

    @Override

    @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL)

    public int checkGrantUriPermission_ignoreNonSystem(int callingUid, String targetPkg, Uri uri,

            int modeFlags, int userId) {

        if (!isCallerIsSystemOrPrivileged()) {

            return Process.INVALID_UID;

        }

        final long origId = Binder.clearCallingIdentity();

        try {

            return checkGrantUriPermissionUnlocked(callingUid, targetPkg, uri, modeFlags,

                    userId);

        } finally {

            Binder.restoreCallingIdentity(origId);

        }

    }



    private boolean isCallerIsSystemOrPrivileged() {

        final int uid = Binder.getCallingUid();

        if (uid == Process.SYSTEM_UID || uid == Process.ROOT_UID) {

            return true;

        }

        return ActivityManager.checkComponentPermission(

                android.Manifest.permission.INTERACT_ACROSS_USERS_FULL,

                uid, /* owningUid = */-1, /* exported = */ true)

                == PackageManager.PERMISSION_GRANTED;

    }



    @Override

    public ArrayList<UriPermission> providePersistentUriGrants() {

        final ArrayList<UriPermission> result = new ArrayList<>();