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

Commit 61c48e8a authored by Alison Cichowlas's avatar Alison Cichowlas Committed by Automerger Merge Worker
Browse files

Merge "Set RESULT_OK on exit via copy button." into sc-dev am: 7014d28d am:... 

Merge "Set RESULT_OK on exit via copy button." into sc-dev am: 7014d28d am: 5e03ec24 am: 89721fcb

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

Change-Id: Ied84df4724858348304b5ecd0cdc15675935d5e7
parents a7efe4b8 89721fcb

core/java/com/android/internal/app/ChooserActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,7 @@ public class ChooserActivity extends ResolverActivity implements 
                    "",

                    -1);



            setResult(RESULT_OK);

            finish();

        }

    }

core/tests/coretests/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ 
    <!-- Allow use of PendingIntent.getIntent() -->

    <uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" />



    <!-- ChooserActivityTest permissions-->

    <uses-permission android:name="android.permission.SET_CLIP_SOURCE" />



    <application android:theme="@style/Theme" android:supportsRtl="true">

        <uses-library android:name="android.test.runner" />

        <uses-library android:name="org.apache.http.legacy" android:required="false" />

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.internal.app;



import static android.app.Activity.RESULT_OK;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.action.ViewActions.swipeUp;
@@ -558,6 +560,8 @@ public class ChooserActivityTest { 


        ClipDescription clipDescription = clipData.getDescription();

        assertThat("text/plain", is(clipDescription.getMimeType(0)));



        assertEquals(mActivityRule.getActivityResult().getResultCode(), RESULT_OK);

    }



    @Test