[automerger skipped] Mark ab/7061308 as merged in stage. am: 19b9d82158 -s ours am: 31c16c1ce8 -s ours
am skip reason: Change-Id I5c56995272608cecb4a9a948e3c219d091ea7651 with SHA-1 66f15b81b3 is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idfe1e3a78575fb143005c0f57389d48d37ac0955
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a08b2bc..a99c80b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -50,6 +50,7 @@
<uses-library android:name="org.apache.http.legacy" android:required="false" />
<activity android:name="com.android.gallery3d.app.MovieActivity"
android:label="@string/movie_view_label"
+ android:exported="true"
android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@@ -88,6 +89,7 @@
</activity>
<activity android:name="com.android.gallery3d.app.GalleryActivity" android:label="@string/app_name"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -159,6 +161,7 @@
<!-- This activity acts as a trampoline to the new Gallery activity,
so that existing shortcuts are preserved. -->
<activity android:name="com.android.gallery3d.app.Gallery"
+ android:exported="true"
android:theme="@style/android:Theme.NoDisplay">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -171,6 +174,7 @@
<activity-alias android:name="com.cooliris.media.Gallery"
android:targetActivity="com.android.gallery3d.app.GalleryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -187,6 +191,7 @@
android:theme="@style/android:Theme.NoDisplay" />
<activity-alias android:name="com.android.camera.CameraLauncher"
android:label="@string/camera_label"
+ android:exported="true"
android:targetActivity="com.android.camera.CameraActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -199,6 +204,7 @@
<activity android:launchMode="singleInstance"
android:taskAffinity="" android:name="com.android.gallery3d.ingest.IngestActivity"
android:configChanges="orientation|screenSize"
+ android:exported="true"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
@@ -210,6 +216,7 @@
<activity android:name="com.android.gallery3d.app.Wallpaper"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:theme="@style/android:Theme.Translucent.NoTitleBar">
<intent-filter android:label="@string/camera_setas_wallpaper">
<action android:name="android.intent.action.ATTACH_DATA" />
@@ -224,6 +231,7 @@
android:resource="@xml/wallpaper_picker_preview" />
</activity>
<activity android:name="com.android.gallery3d.app.TrimVideo"
+ android:exported="true"
android:label="@string/trim_label">
<intent-filter android:label="@string/crop_label">
<action android:name="com.android.camera.action.TRIM" />
@@ -249,6 +257,7 @@
android:name="com.android.gallery3d.filtershow.FilterShowActivity"
android:label="@string/title_activity_filter_show"
android:theme="@style/Theme.FilterShow"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.EDIT" />
@@ -266,6 +275,7 @@
android:name="com.android.gallery3d.filtershow.crop.CropActivity"
android:label="@string/crop"
android:theme="@style/Theme.Crop"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter android:label="@string/crop_label">
<action android:name="com.android.camera.action.CROP" />
@@ -308,6 +318,7 @@
android:theme="@style/Theme.Gallery.Dialog"/>
<receiver android:name="com.android.gallery3d.gadget.PhotoAppWidgetProvider"
+ android:exported="true"
android:label="@string/appwidget_title">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -315,7 +326,8 @@
<meta-data android:name="android.appwidget.provider"
android:resource="@xml/widget_info" />
</receiver>
- <receiver android:name="com.android.gallery3d.app.PackagesMonitor">
+ <receiver android:name="com.android.gallery3d.app.PackagesMonitor"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.PACKAGE_ADDED"/>
<action android:name="android.intent.action.PACKAGE_REMOVED"/>
@@ -330,6 +342,7 @@
android:permission="android.permission.BIND_REMOTEVIEWS"/>
<activity android:name="com.android.gallery3d.gadget.WidgetConfigure"
android:configChanges="keyboardHidden|orientation|screenSize"
+ android:exported="true"
android:theme="@style/android:Theme.Translucent.NoTitleBar">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -337,7 +350,8 @@
</activity>
<service android:name="com.android.gallery3d.app.BatchService" />
- <receiver android:name="com.android.camera.DisableCameraReceiver">
+ <receiver android:name="com.android.camera.DisableCameraReceiver"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
