Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ibd73a4a2097f872029076e1014bfd1cad5a1e8ef
This commit is contained in:
Alison Cichowlas
2021-05-25 15:24:24 +00:00
committed by Automerger Merge Worker
parent 2da560b697 7014d28df9
commit 5e03ec2456
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -1093,6 +1093,7 @@ public class ChooserActivity extends ResolverActivity implements
"", "",
-1); -1);
setResult(RESULT_OK);
finish(); finish();
} }
} }

3
core/tests/coretests/AndroidManifest.xml
View File

@@ -156,6 +156,9 @@
<!-- Allow use of PendingIntent.getIntent() --> <!-- Allow use of PendingIntent.getIntent() -->
<uses-permission android:name="android.permission.GET_INTENT_SENDER_INTENT" /> <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"> <application android:theme="@style/Theme" android:supportsRtl="true">
<uses-library android:name="android.test.runner" /> <uses-library android:name="android.test.runner" />
<uses-library android:name="org.apache.http.legacy" android:required="false" /> <uses-library android:name="org.apache.http.legacy" android:required="false" />

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

@@ -16,6 +16,8 @@
package com.android.internal.app; package com.android.internal.app;
import static android.app.Activity.RESULT_OK;
import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.swipeUp; import static androidx.test.espresso.action.ViewActions.swipeUp;
@@ -558,6 +560,8 @@ public class ChooserActivityTest {
ClipDescription clipDescription = clipData.getDescription(); ClipDescription clipDescription = clipData.getDescription();
assertThat("text/plain", is(clipDescription.getMimeType(0))); assertThat("text/plain", is(clipDescription.getMimeType(0)));
assertEquals(mActivityRule.getActivityResult().getResultCode(), RESULT_OK);
} }
@Test @Test