Catch invalid extra when launching help trampoline.

Change-Id: Ifb4b6fefe507cf403065436fca7a46d3a00afda7
Fix: 62821816
Test: robotests

diff --git a/src/com/android/settings/HelpTrampoline.java b/src/com/android/settings/HelpTrampoline.java
index 0de15e3..7d3d91e 100644 (file)
--- a/src/com/android/settings/HelpTrampoline.java
+++ b/src/com/android/settings/HelpTrampoline.java
@@ -21,6 +21,7 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.settingslib.HelpUtils;
@@ -34,6 +35,11 @@ public class HelpTrampoline extends Activity {
 
         try {
             final String name = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+            if (TextUtils.isEmpty(name)) {
+                finishAndRemoveTask();
+                return;
+            }
+
             final int id = getResources().getIdentifier(name, "string", getPackageName());
             final String value = getResources().getString(id);
 

diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
new file mode 100644 (file)
index 0000000..e10b878
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+
+import android.content.Intent;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowHelpUtils;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.robolectric.Shadows.shadowOf;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowHelpUtils.class
+        })
+public class HelpTrampolineTest {
+
+    @After
+    public void tearDown() {
+        ShadowHelpUtils.reset();
+    }
+
+    @Test
+    public void launchHelp_noExtra_shouldDoNothing() {
+        final Intent intent = new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName());
+
+        Robolectric.buildActivity(HelpTrampoline.class).withIntent(intent).create().get();
+
+        assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isFalse();
+    }
+
+    @Test
+    public void launchHelp_hasExtra_shouldLaunchHelp() {
+        final Intent intent = new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(), HelpTrampoline.class.getName())
+                .putExtra(Intent.EXTRA_TEXT, "help_url_upgrading");
+        final ShadowActivity shadow = shadowOf(Robolectric.buildActivity(HelpTrampoline.class)
+                .withIntent(intent).create().get());
+        final Intent launchedIntent = shadow.getNextStartedActivity();
+
+        assertThat(ShadowHelpUtils.isGetHelpIntentCalled()).isTrue();
+        assertThat(launchedIntent).isNotNull();
+    }
+}

diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java
new file mode 100644 (file)
index 0000000..9873502
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowHelpUtils.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.HelpUtils;
+
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@Implements(HelpUtils.class)
+public class ShadowHelpUtils {
+
+    private static boolean mGetHelpIntentCalled;
+
+    public static boolean isGetHelpIntentCalled() {
+        return mGetHelpIntentCalled;
+    }
+
+    @Resetter
+    public static void reset() {
+        mGetHelpIntentCalled = false;
+    }
+
+    @Implementation
+    public static Intent getHelpIntent(Context context, String helpUriString,
+            String backupContext) {
+        mGetHelpIntentCalled = true;
+        return new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(), SettingsActivity.class.getName());
+    }
+}