commit 79cf2df3a62520939bd80c2813891456962a901c
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed May 27 21:06:17 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 27 21:06:17 2020 +0000
tree b059c9d77f2058358cb08c51b31fc69e276c8b42
parent dfaab9e236faab947c66dbd09583ae5ec70a4f39
parent d4c19d3cf152b8457d77548da0ff03404c1372b9

Merge "Snap for 6533464 from 47f31ce7ae061cb039f599f9dfd3e925f3ba0e77 to sdk-release" into sdk-release

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ee57c31..79b24f7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,8 @@
             android:theme="@style/ThemeCamera"
             android:hardwareAccelerated="true">
         <uses-library android:name="com.google.android.media.effects" android:required="false" />
-        <receiver android:name="com.android.camera.CameraButtonIntentReceiver">
+        <receiver android:name="com.android.camera.CameraButtonIntentReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CAMERA_BUTTON"/>
             </intent-filter>
@@ -31,6 +32,7 @@
         <activity android:name="com.android.camera.Camera"
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:clearTaskOnLaunch="true"
+                android:exported="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -51,6 +53,7 @@
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:icon="@mipmap/ic_launcher_video_camera"
                 android:clearTaskOnLaunch="true"
+                android:exported="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.media.action.VIDEO_CAMERA" />

MODULE_LICENSE_APACHE2

diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null