diff options
| author | 2022-04-08 18:06:04 +0000 | |
|---|---|---|
| committer | 2022-04-08 18:06:04 +0000 | |
| commit | 32de1b937f549969ec8191af971cfd5d37947594 (patch) | |
| tree | 1b5d8f12d7e975e96c6a11c237fb9359959dc7df /AndroidManifest.xml | |
| parent | 858d4b5e949f9fd49e6cda0d7815d008827f0000 (diff) | |
| parent | 888e1124d85a01676467b3ea13d8e316456cbb84 (diff) | |
Merge changes from topics "enable_get_content", "presubmit-am-bb6bdeffbe264443beaa80847af446d3" into sc-mainline-prod am: 888e1124d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/17570206
Change-Id: Ied90712a002369c2e2ab20ef18a0e55a5fe2ec1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 788df5d28..fdbe9b4b8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -175,14 +175,6 @@ <action android:name="android.provider.action.PICK_IMAGES" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> - </activity> - - <activity-alias - android:name="com.android.providers.media.photopicker.PhotoPickerGetContentActivity" - android:targetActivity="com.android.providers.media.photopicker.PhotoPickerActivity" - android:exported="true" - android:excludeFromRecents="true" - android:enabled="false"> <intent-filter> <action android:name="android.intent.action.GET_CONTENT" /> <category android:name="android.intent.category.OPENABLE" /> @@ -190,7 +182,7 @@ <data android:mimeType="image/*" /> <data android:mimeType="video/*" /> </intent-filter> - </activity-alias> + </activity> </application> </manifest> |