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

Commit b3a2e3f3 authored by Nikita Dubrovsky's avatar Nikita Dubrovsky
Browse files

Expose test APIs on ContentInfo and add CTS coverage 

Bug: 183643556
Test: atest CtsViewReceiveContentTestCases:ContentInfoTest
Change-Id: I65e8fbab27433584590366292ed79d230c1b95e5
parent d560996d

core/api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -2640,6 +2640,12 @@ package android.view { 


  public final class ContentInfo {

    method @NonNull public android.util.Pair<android.view.ContentInfo,android.view.ContentInfo> partition(@NonNull java.util.function.Predicate<android.content.ClipData.Item>);

    method public void releasePermissions();

  }



  public static final class ContentInfo.Builder {

    method @NonNull public android.view.ContentInfo.Builder setDragAndDropPermissions(@Nullable android.view.DragAndDropPermissions);

    method @NonNull public android.view.ContentInfo.Builder setInputContentInfo(@Nullable android.view.inputmethod.InputContentInfo);

  }



  public final class Display {

core/java/android/view/ContentInfo.java

+5 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ public final class ContentInfo { 
     *

     * @hide

     */

    @TestApi

    public void releasePermissions() {

        if (mInputContentInfo != null) {

            mInputContentInfo.releasePermission();
@@ -388,6 +389,8 @@ public final class ContentInfo { 
         *

         * @hide

         */

        @TestApi

        @SuppressLint("MissingGetterMatchingBuilder")

        @NonNull

        public Builder setInputContentInfo(@Nullable InputContentInfo inputContentInfo) {

            mInputContentInfo = inputContentInfo;
@@ -400,6 +403,8 @@ public final class ContentInfo { 
         *

         * @hide

         */

        @TestApi

        @SuppressLint("MissingGetterMatchingBuilder")

        @NonNull

        public Builder setDragAndDropPermissions(@Nullable DragAndDropPermissions permissions) {

            mDragAndDropPermissions = permissions;

core/java/android/view/TEST_MAPPING

+15 −0
Original line number Diff line number Diff line
@@ -20,6 +20,21 @@ 
        }

      ],

      "file_patterns": ["(/|^)ViewConfiguration.java", "(/|^)GestureDetector.java"]

    },

    {

      "name": "CtsViewReceiveContentTestCases",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        },

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ],

      "file_patterns": ["ContentInfo\\.java", "OnReceiveContentListener\\.java", "View\\.java"]

    }

  ],

  "imports": [