commit 5f0edba5c76622f316734b258f30de0c7803d62e
author Maurice Lam <yukl@google.com> Thu Jun 08 11:57:40 2017 -0700
committer Maurice Lam <yukl@google.com> Fri Jun 09 01:03:29 2017 +0000
tree e780229393825902db8b9cf489a113740a987be2
parent f928324747ad0fada2201f0a9c4a1d6196648a52

Add intent action to support page

Test: cd tests/robotests && mma
Bug: 62348910
Change-Id: I65b8290bc5bf47803349de92b2560099e7dda402
(cherry picked from commit 1bf5454f64572d9dd58897e5c4981d9a91ce98e0)

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b5339a..91cea52 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3038,6 +3038,10 @@
             <intent-filter android:priority="-2">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
             <meta-data android:name="com.android.settings.summary"

tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java

diff --git a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
index d90d8d6..3c6b5cf 100644
--- a/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
+++ b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
@@ -17,8 +17,12 @@
 package com.android.settings.support;
 
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
@@ -33,8 +37,6 @@
 
 import java.util.List;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class SupportDashboardActivityTest {
@@ -62,4 +64,17 @@
         assertThat(value.intentTargetClass).isEqualTo(SupportDashboardActivity.class.getName());
         assertThat(value.intentAction).isEqualTo(Intent.ACTION_MAIN);
     }
+
+    @Test
+    public void shouldHandleIntentAction() {
+        RuntimeEnvironment.getRobolectricPackageManager().setQueryIntentImplicitly(true);
+        // Intent action used by setup wizard to start support settings
+        Intent intent = new Intent("com.android.settings.action.SUPPORT_SETTINGS");
+        ResolveInfo resolveInfo = RuntimeEnvironment.getPackageManager().resolveActivity(
+                intent,
+                PackageManager.MATCH_DEFAULT_ONLY);
+        assertThat(resolveInfo).isNotNull();
+        assertThat(resolveInfo.activityInfo.targetActivity)
+                .isEqualTo(SupportDashboardActivity.class.getName());
+    }
 }