Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev am: bad8171d05

am: f3c3cd97ba Change-Id: I41a99ae57dbd5abd1309f643831aa9d20e62836a
2017-04-21 17:25:35 +00:00
parent c215b4ef7e f3c3cd97ba
commit ca32f1d354
2 changed files with 2 additions and 0 deletions
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -114,6 +114,7 @@ public class StorageItemPreferenceControllerTest {
        Intent intent = argumentCaptor.getValue();
        assertThat(intent.getType()).isEqualTo("image/*");
        assertThat(intent.getAction()).isEqualTo(android.content.Intent.ACTION_VIEW);
+        assertThat(intent.getBooleanExtra(Intent.EXTRA_FROM_STORAGE, false)).isTrue();
    }

    @Test