summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBo Hu <bohu@google.com>2016-04-28 22:45:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-28 22:45:37 +0000
commit0178ee0e9fd7d279f659a3e8bff8b35f619b1c30 (patch)
tree2a8fb15f998837780bdae88ac6263713ea5eec59 /apps
parent13fdf35ecbda391a5eba1c27491a96b34d6afa4a (diff)
parent49df3f151c762a3da4b8cfcca44c07923dda03f6 (diff)
downloadandroid_development-0178ee0e9fd7d279f659a3e8bff8b35f619b1c30.tar.gz
android_development-0178ee0e9fd7d279f659a3e8bff8b35f619b1c30.tar.bz2
android_development-0178ee0e9fd7d279f659a3e8bff8b35f619b1c30.zip
Merge "Merge "Emulator-ATV: Increase SdkSetup HOME intent priority" into nyc-dev am: 981982fd0c am: 4daac254a2" into nyc-mr1-dev-plus-aosp
am: 49df3f151c * commit '49df3f151c762a3da4b8cfcca44c07923dda03f6': Emulator-ATV: Increase SdkSetup HOME intent priority Change-Id: I61ae3479e048f147ed374793dabfd4ee1f92aff7
Diffstat (limited to 'apps')
-rw-r--r--apps/SdkSetup/AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/SdkSetup/AndroidManifest.xml b/apps/SdkSetup/AndroidManifest.xml
index 5ceddcdc3..8f7268418 100644
--- a/apps/SdkSetup/AndroidManifest.xml
+++ b/apps/SdkSetup/AndroidManifest.xml
@@ -24,7 +24,7 @@
<application>
<activity android:name="DefaultActivity"
android:excludeFromRecents="true">
- <intent-filter android:priority="1">
+ <intent-filter android:priority="3">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.HOME" />
<category android:name="android.intent.category.DEFAULT" />