Catch invalid extra when launching help trampoline.

Change-Id: Ifb4b6fefe507cf403065436fca7a46d3a00afda7
Fix: 62821816
Test: robotests
This commit is contained in:
Fan Zhang
2017-06-22 09:40:42 -07:00
parent 28c4a576d3
commit d96f3bf04e
3 changed files with 127 additions and 0 deletions

View File

@@ -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);