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

Commit b2ec0c39 authored by Naomi Musgrave's avatar Naomi Musgrave
Browse files

Simplify display capture config API name 

Bug: 262735616
Test: atest MediaProjectionTests:MediaProjectionConfigTest
Change-Id: Ia20e516f2c3b861bbe81d1387dfb96009cb078dc
parent b51e6c48

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -25816,7 +25816,7 @@ package android.media.projection { 
  }















  public final class MediaProjectionConfig implements android.os.Parcelable {













    method @NonNull public static android.media.projection.MediaProjectionConfig createConfigForDisplay(@IntRange(from=android.view.Display.DEFAULT_DISPLAY, to=android.view.Display.DEFAULT_DISPLAY) int);













    method @NonNull public static android.media.projection.MediaProjectionConfig createConfigForDefaultDisplay();















    method @NonNull public static android.media.projection.MediaProjectionConfig createConfigForUserChoice();















    method public int describeContents();















    method public void writeToParcel(@NonNull android.os.Parcel, int);

























media/java/android/media/projection/MediaProjectionConfig.java



+5
−17




























Original line number
Diff line number
Diff line








@@ -98,24 +98,12 @@ public final class MediaProjectionConfig implements Parcelable {













    }































    /**













     * Returns an instance which restricts the user to capturing a particular display.













     *













     * @param displayId The id of the display to capture. Only supports values of













     *                  {@link android.view.Display#DEFAULT_DISPLAY}.













     * @throws IllegalArgumentException If the given {@code displayId} is outside the range of













     * supported values.













     * Returns an instance which restricts the user to capturing the default display.















     */















    @NonNull













    public static MediaProjectionConfig createConfigForDisplay(













            @IntRange(from = DEFAULT_DISPLAY, to = DEFAULT_DISPLAY) int displayId) {













        if (displayId != DEFAULT_DISPLAY) {













            throw new IllegalArgumentException(













                    "A config for capturing the non-default display is not supported; requested "













                            + "display id "













                            + displayId);













        }













    public static MediaProjectionConfig createConfigForDefaultDisplay() {















        MediaProjectionConfig config = new MediaProjectionConfig(CAPTURE_REGION_FIXED_DISPLAY);













        config.mDisplayToCapture = displayId;













        config.mDisplayToCapture = DEFAULT_DISPLAY;















        return config;















    }


























@@ -279,10 +267,10 @@ public final class MediaProjectionConfig implements Parcelable {













    };































    @DataClass.Generated(













            time = 1671030124845L,













            time = 1673548980960L,















            codegenVersion = "1.0.23",















            sourceFile = "frameworks/base/media/java/android/media/projection/MediaProjectionConfig.java",













            inputSignatures = "public static final  int CAPTURE_REGION_USER_CHOICE\npublic static final  int CAPTURE_REGION_FIXED_DISPLAY\nprivate @android.annotation.IntRange int mDisplayToCapture\nprivate @android.media.projection.MediaProjectionConfig.CaptureRegion int mRegionToCapture\npublic static @android.annotation.NonNull android.media.projection.MediaProjectionConfig createConfigForDisplay(int)\npublic static @android.annotation.NonNull android.media.projection.MediaProjectionConfig createConfigForUserChoice()\nprivate static @android.annotation.NonNull java.lang.String captureRegionToString(int)\npublic @java.lang.Override java.lang.String toString()\nclass MediaProjectionConfig extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genSetters=false, genConstructor=false, genBuilder=false, genToString=false, genHiddenConstDefs=true, genHiddenGetters=true, genConstDefs=false)")













            inputSignatures = "public static final  int CAPTURE_REGION_USER_CHOICE\npublic static final  int CAPTURE_REGION_FIXED_DISPLAY\nprivate @android.annotation.IntRange int mDisplayToCapture\nprivate @android.media.projection.MediaProjectionConfig.CaptureRegion int mRegionToCapture\npublic static @android.annotation.NonNull android.media.projection.MediaProjectionConfig createConfigForDefaultDisplay()\npublic static @android.annotation.NonNull android.media.projection.MediaProjectionConfig createConfigForUserChoice()\nprivate static @android.annotation.NonNull java.lang.String captureRegionToString(int)\npublic @java.lang.Override java.lang.String toString()\nclass MediaProjectionConfig extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genSetters=false, genConstructor=false, genBuilder=false, genToString=false, genHiddenConstDefs=true, genHiddenGetters=true, genConstDefs=false)")















    @Deprecated















    private void __metadata() {}

















































media/java/android/media/projection/MediaProjectionManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -109,8 +109,8 @@ public final class MediaProjectionManager {













     * If {@link MediaProjectionConfig} was created from:















     * <ul>















     *     <li>













     *         {@link MediaProjectionConfig#createConfigForDisplay(int)}, then creates an













     *         {@link Intent} for capturing this particular display. The activity limits the user's













     *         {@link MediaProjectionConfig#createConfigForDefaultDisplay()}, then creates an













     *         {@link Intent} for capturing the default display. The activity limits the user's















     *         choice to just the display specified.















     *     </li>















     *     <li>

































media/tests/projection/src/android/media/projection/MediaProjectionConfigTest.java



+2
−8




























Original line number
Diff line number
Diff line








@@ -22,8 +22,6 @@ import static android.view.Display.DEFAULT_DISPLAY;





























import static com.google.common.truth.Truth.assertThat;





























import static org.junit.Assert.assertThrows;





























import android.os.Parcel;















import android.platform.test.annotations.Presubmit;

























@@ -44,7 +42,7 @@ import org.junit.runner.RunWith;













@RunWith(AndroidJUnit4.class)















public class MediaProjectionConfigTest {















    private static final MediaProjectionConfig DISPLAY_CONFIG =













            MediaProjectionConfig.createConfigForDisplay(DEFAULT_DISPLAY);













            MediaProjectionConfig.createConfigForDefaultDisplay();















    private static final MediaProjectionConfig USERS_CHOICE_CONFIG =















            MediaProjectionConfig.createConfigForUserChoice();

























@@ -60,10 +58,6 @@ public class MediaProjectionConfigTest {





























    @Test















    public void testCreateDisplayConfig() {













        assertThrows(IllegalArgumentException.class,













                () -> MediaProjectionConfig.createConfigForDisplay(-1));













        assertThrows(IllegalArgumentException.class,













                () -> MediaProjectionConfig.createConfigForDisplay(DEFAULT_DISPLAY + 1));















        assertThat(DISPLAY_CONFIG.getRegionToCapture()).isEqualTo(CAPTURE_REGION_FIXED_DISPLAY);















        assertThat(DISPLAY_CONFIG.getDisplayToCapture()).isEqualTo(DEFAULT_DISPLAY);















    }









@@ -78,7 +72,7 @@ public class MediaProjectionConfigTest {













        assertThat(MediaProjectionConfig.createConfigForUserChoice()).isEqualTo(















                USERS_CHOICE_CONFIG);















        assertThat(DISPLAY_CONFIG).isNotEqualTo(USERS_CHOICE_CONFIG);













        assertThat(MediaProjectionConfig.createConfigForDisplay(DEFAULT_DISPLAY)).isEqualTo(













        assertThat(MediaProjectionConfig.createConfigForDefaultDisplay()).isEqualTo(















                DISPLAY_CONFIG);















    }















}
























media/tests/projection/src/android/media/projection/MediaProjectionManagerTest.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.media.projection;































import static android.media.projection.MediaProjectionManager.EXTRA_MEDIA_PROJECTION_CONFIG;













import static android.view.Display.DEFAULT_DISPLAY;































import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;















import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;










@@ -59,7 +58,7 @@ public class MediaProjectionManagerTest {













    private Context mContext;















    private MockitoSession mMockingSession;















    private static final MediaProjectionConfig DISPLAY_CONFIG =













            MediaProjectionConfig.createConfigForDisplay(DEFAULT_DISPLAY);













            MediaProjectionConfig.createConfigForDefaultDisplay();















    private static final MediaProjectionConfig USERS_CHOICE_CONFIG =















            MediaProjectionConfig.createConfigForUserChoice();