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

Commit dd554dd2 authored by Daniel Akinola's avatar Daniel Akinola Committed by Android (Google) Code Review
Browse files

Revert "Update ScreenRecorder to handle StopReason" 

This reverts commit 8f07c2af.

Reason for revert: Possible culprit for memory regression b/382608473

Change-Id: I4f8971abf2f3cd33e28290c5f4c889657ad9954e
parent 8f07c2af

media/java/android/media/projection/MediaProjection.java

+0 −13
Original line number Diff line number Diff line
@@ -323,19 +323,6 @@ public final class MediaProjection { 
        }

    }



    /**

     * Stops projection.

     * @hide

     */

    public void stop(@StopReason int stopReason) {

        try {

            Log.d(TAG, "Content Recording: stopping projection");

            mImpl.stop(stopReason);

        } catch (RemoteException e) {

            Log.e(TAG, "Unable to stop projection", e);

        }

    }



    /**

     * Get the underlying IMediaProjection.

     * @hide

packages/SystemUI/multivalentTests/src/com/android/systemui/mediarouter/data/repository/MediaRouterRepositoryTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ 


package com.android.systemui.mediarouter.data.repository



import android.media.projection.StopReason

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.Kosmos
@@ -102,7 +101,7 @@ class MediaRouterRepositoryTest : SysuiTestCase() { 
                origin = CastDevice.CastOrigin.MediaRouter,

            )



        underTest.stopCasting(device, StopReason.STOP_UNKNOWN)

        underTest.stopCasting(device)



        assertThat(castController.lastStoppedDevice).isEqualTo(device)

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/CastTileTest.java

+1 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static junit.framework.Assert.assertTrue; 
import static junit.framework.TestCase.assertEquals;



import static org.junit.Assert.assertFalse;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.same;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.mock;
@@ -31,7 +30,6 @@ import static org.mockito.Mockito.when; 
import android.media.MediaRouter;

import android.media.MediaRouter.RouteInfo;

import android.media.projection.MediaProjectionInfo;

import android.media.projection.StopReason;

import android.os.Handler;

import android.service.quicksettings.Tile;

import android.testing.TestableLooper;
@@ -338,8 +336,7 @@ public class CastTileTest extends SysuiTestCase { 
        mCastTile.handleClick(null /* view */);

        mTestableLooper.processAllMessages();



        verify(mController, times(1))

                .stopCasting(same(device), eq(StopReason.STOP_QS_TILE));

        verify(mController, times(1)).stopCasting(same(device));

    }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java

+1 −3
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ import static junit.framework.Assert.assertTrue; 
import static org.junit.Assert.assertFalse;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.Dialog;

import android.media.projection.StopReason;

import android.os.Handler;

import android.service.quicksettings.Tile;

import android.testing.TestableLooper;
@@ -216,7 +214,7 @@ public class ScreenRecordTileTest extends SysuiTestCase { 


        mTile.handleClick(null /* view */);



        verify(mController, times(1)).stopRecording(eq(StopReason.STOP_QS_TILE));

        verify(mController, times(1)).stopRecording();

    }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/screenrecord/domain/interactor/ScreenRecordTileUserActionInteractorTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.qs.tiles.impl.screenrecord.domain.interactor



import android.app.Dialog

import android.media.projection.StopReason

import android.os.UserHandle

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest
@@ -93,7 +92,7 @@ class ScreenRecordTileUserActionInteractorTest : SysuiTestCase() { 


        underTest.handleInput(QSTileInputTestKtx.click(recordingModel))



        verify(recordingController).stopRecording(eq(StopReason.STOP_QS_TILE))

        verify(recordingController).stopRecording()

    }



    @Test