commit 8a7f1ea8f863d016f9667130cb05c68a6a21413b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 30 17:52:30 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 30 17:52:30 2020 +0000
tree 284e7e2a2c929cd3c47559e8bbdfecfdc5553f12
parent 7553052328f3f90fde0b7766981f37276fcf522e
parent 95ce0c9aa8c368fcfc59ad6ff6f402ceb691400a

Merge "Camera2: Fix crash when app requesting intent has requested no permisions."

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1f13e3e..002bf5f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -55,6 +55,7 @@
             android:launchMode="singleTask"
             android:taskAffinity="com.android.camera.CameraActivity"
             android:theme="@style/Theme.Camera"
+            android:exported="true"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
             <intent-filter>
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA" />
@@ -83,6 +84,7 @@
         <activity-alias
             android:name="com.android.camera.CameraLauncher"
             android:label="@string/app_name"
+            android:exported="true"
             android:targetActivity="com.android.camera.CameraActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -98,6 +100,7 @@
             android:theme="@style/Theme.Camera"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
+            android:exported="true"
             android:visibleToInstantApps="true">
             <intent-filter>
                 <action android:name="android.media.action.IMAGE_CAPTURE" />
@@ -109,6 +112,7 @@
         <activity-alias
             android:name="com.android.camera.VideoCamera"
             android:label="@string/video_camera_label"
+            android:exported="true"
             android:targetActivity="com.android.camera.CaptureActivity">
             <intent-filter>
                 <action android:name="android.media.action.VIDEO_CAMERA" />
@@ -128,6 +132,7 @@
             android:label="@string/app_name"
             android:taskAffinity="com.android.camera.SecureCameraActivity"
             android:theme="@style/Theme.SecureCamera"
+            android:exported="true"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >
             <intent-filter>
                 <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
@@ -152,7 +157,8 @@
             android:configChanges="keyboardHidden|orientation|screenSize">
         </activity>
 
-        <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>