summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-05-20 18:47:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-20 18:47:37 +0000
commitc436e2f2a7dd793db46ab8d7fd48259b2a0631e8 (patch)
tree990801d69b816527c68d2cb9680dd6ca9b5771b0
parent0312597759b7ef376e0f3ad800a139b47a85a606 (diff)
parent6101fdd2588594ba9f3ff08e40a9ddf0eb7c4bb8 (diff)
downloadGallery-c436e2f2a7dd793db46ab8d7fd48259b2a0631e8.tar.gz
Merge "Add an exported flag in manifest" am: 6101fdd258android-r-beta-3android-r-beta-2
Change-Id: Ic805a7dfe547af35e8da2f607d0b8a7df8636093
-rw-r--r--AndroidManifest.xml12
1 files changed, 11 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ebdd07..d2b0947 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,7 @@
android:configChanges="orientation|keyboardHidden"
android:icon="@drawable/ic_launcher_gallery"
android:clearTaskOnLaunch="true"
+ android:exported="true"
android:taskAffinity="android.task.pictures">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -33,6 +34,7 @@
<activity android:name="com.android.camera.ImageGallery"
android:label="@string/gallery_label"
android:configChanges="orientation|keyboardHidden"
+ android:exported="true"
android:icon="@drawable/ic_launcher_gallery">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -76,6 +78,7 @@
android:name="com.android.camera.CropImage"
android:process=":CropImage"
android:configChanges="orientation|keyboardHidden"
+ android:exported="true"
android:label="@string/crop_label">
<intent-filter android:label="@string/crop_label">
<action android:name="com.android.camera.action.CROP" />
@@ -88,6 +91,7 @@
<activity android:name="com.android.camera.ViewImage"
android:label="@string/view_label"
android:screenOrientation="behind"
+ android:exported="true"
android:configChanges="orientation|keyboardHidden">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -99,6 +103,7 @@
android:label="@string/movieviewlabel"
android:screenOrientation="landscape"
android:configChanges="orientation|keyboardHidden"
+ android:exported="true"
android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -129,6 +134,7 @@
</activity>
<activity android:name="com.android.camera.GallerySettings"
+ android:exported="true"
android:label="@string/preferences_label">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -138,6 +144,7 @@
<activity android:name="com.android.camera.Wallpaper"
android:label="@string/camera_setas_wallpaper"
+ android:exported="true"
android:icon="@drawable/ic_launcher_gallery">
<intent-filter>
<action android:name="android.intent.action.ATTACH_DATA" />
@@ -148,6 +155,7 @@
<activity android:name="com.android.camera.PickWallpaper"
android:label="@string/camera_pick_wallpaper"
+ android:exported="true"
android:icon="@drawable/ic_launcher_gallery">
<intent-filter>
<action android:name="android.intent.action.SET_WALLPAPER" />
@@ -156,6 +164,7 @@
</activity>
<receiver android:name="com.android.camera.PhotoAppWidgetProvider"
android:label="@string/gadget_title"
+ android:exported="true"
android:icon="@drawable/ic_launcher_gallery">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -165,7 +174,8 @@
</receiver>
<!-- We configure a widget by asking to pick a photo, then crop it, and store the config internally -->
- <activity android:name="com.android.camera.PhotoAppWidgetConfigure">
+ <activity android:name="com.android.camera.PhotoAppWidgetConfigure"
+ android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>