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

Commit bb74e395 authored by Marvin Ramin's avatar Marvin Ramin
Browse files

Remove lookup of contextual search package for recording overlay 

Only ContextualSearchService calls this API.

Bug: 432659628
Flag: EXEMPT refactor
Test: presubmit
Change-Id: I3b179f59417c00662166c8215fcc1f3bcdff8ffd
parent 6bf4a7e3

services/core/java/com/android/server/media/projection/MediaProjectionManagerService.java

+2 −7
Original line number Diff line number Diff line
@@ -1392,13 +1392,8 @@ public final class MediaProjectionManagerService extends SystemService 
                return;

            }



            Binder.withCleanCallingIdentity(() -> {

                String contextualSearchPackage = mContext.getResources().getString(

                        R.string.config_defaultContextualSearchPackageName);

                if (packageName.equals(contextualSearchPackage)) {

            mIsRecordingOverlay = isRecordingOverlay;

                }

            });



        }



        @android.annotation.EnforcePermission(android.Manifest.permission.MANAGE_MEDIA_PROJECTION)

services/tests/servicestests/src/com/android/server/media/projection/MediaProjectionManagerServiceTest.java

+1 −20
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ import androidx.test.filters.FlakyTest; 
import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.internal.R;

import com.android.media.projection.flags.Flags;

import com.android.server.LocalServices;

import com.android.server.testutils.OffsettableClock;
@@ -1200,23 +1199,9 @@ public class MediaProjectionManagerServiceTest { 
        assertThat(projection.getDisplayId()).isEqualTo(200);

    }



    @Test

    @EnableFlags(Flags.FLAG_RECORDING_OVERLAY)

    public void createProjectionForOverlay_forUnknownCaller_isNotSet() throws Exception {

        mContext.getOrCreateTestableResources().addOverride(

                R.string.config_defaultContextualSearchPackageName, "test.something");

        MediaProjectionManagerService.MediaProjection projection =

                createProjectionPreconditions(mService);

        projection.setRecordingOverlay(true);



        assertThat(projection.isRecordingOverlay()).isFalse();

    }



    @Test

    @EnableFlags(Flags.FLAG_RECORDING_OVERLAY)

    public void createProjectionForOverlay_forContextualSearch() throws Exception {

        mContext.getOrCreateTestableResources().addOverride(

                R.string.config_defaultContextualSearchPackageName, PACKAGE_NAME);

        MediaProjectionManagerService.MediaProjection projection =

                createProjectionPreconditions(mService);

        projection.setRecordingOverlay(true);
@@ -1227,8 +1212,6 @@ public class MediaProjectionManagerServiceTest { 
    @Test

    @DisableFlags(Flags.FLAG_RECORDING_OVERLAY)

    public void createProjectionForOverlay_withoutFlag() throws Exception {

        mContext.getOrCreateTestableResources().addOverride(

                R.string.config_defaultContextualSearchPackageName, PACKAGE_NAME);

        MediaProjectionManagerService.MediaProjection projection = createProjectionPreconditions(

                mService);

        projection.setRecordingOverlay(true);
@@ -1297,12 +1280,10 @@ public class MediaProjectionManagerServiceTest { 
                any(ApplicationInfoFlags.class), any(UserHandle.class));

        doReturn(mPackageInfo).when(mPackageManager).getPackageInfoAsUser(anyString(), anyInt(),

                anyInt());

        String packageName = mContext.getResources().getString(

                R.string.config_defaultContextualSearchPackageName);

        MediaProjectionManagerService.MediaProjection projection =

                mService.createProjectionInternal(

                        UID,

                        packageName,

                        PACKAGE_NAME,

                        TYPE_SCREEN_CAPTURE,

                        /* isPermanentGrant= */ false,

                        DEFAULT_DISPLAY);