aboutsummaryrefslogtreecommitdiffstats
path: root/platform_tools
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2020-08-13 09:27:25 -0400
committerDerek Sollenberger <djsollen@google.com>2020-08-17 16:41:36 -0400
commit4a4c793f123f00290abde4c0bc58e2dc3d64507d (patch)
tree82dd2f909daa320d1bd342f17bfe05351c1814e6 /platform_tools
parent25bec16283807e794c3425dcad8ee81c669faa6b (diff)
downloadplatform_external_skqp-4a4c793f123f00290abde4c0bc58e2dc3d64507d.tar.gz
platform_external_skqp-4a4c793f123f00290abde4c0bc58e2dc3d64507d.tar.bz2
platform_external_skqp-4a4c793f123f00290abde4c0bc58e2dc3d64507d.zip
Add android:exported values to all SkQP activities.
This fixes an issue on newer versions of Android where activities with intent filters need to specify whether or not they are exported in order to successfully complete installation on a test device. Bug: b/163792247 Test: successful install on device with AOSP build Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309980 Reviewed-by: Leon Scroggins <scroggo@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com> Commit-Queue: Derek Sollenberger <djsollen@google.com> (cherry picked from commit 9f67b06583505b786a5244f5920cb98b3a8a7deb) Change-Id: I5f7bfe4d1afe8f532ba7d4efdb3f069ac3b6003d
Diffstat (limited to 'platform_tools')
-rw-r--r--platform_tools/android/apps/skqp/src/main/AndroidManifest.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml b/platform_tools/android/apps/skqp/src/main/AndroidManifest.xml
index f97863547e..d046036b54 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"/>