Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I351000b81430c58bde24de7de6e401a18ef29f56
Change-Id: Ib6931e3695458d743667dff2d59acfd156415019
diff --git a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
index f978635..d046036 100644
--- a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
+++ b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
@@ -11,7 +11,9 @@
android:theme="@style/AppTheme"
android:label="SkQP">
- <activity android:name=".MainActivity">
+ <activity
+ android:name=".MainActivity"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
@@ -20,7 +22,8 @@
<activity
android:name=".SkQPActivity"
android:label="@string/title_activity_skqp"
- android:theme="@style/AppTheme.NoActionBar">
+ android:theme="@style/AppTheme.NoActionBar"
+ android:exported="true">
<intent-filter>
<action android:name="com.google.intent.action.TEST_LOOP"/>
<category android:name="android.intent.category.DEFAULT"/>