am 3b0c2eb0: Merge "Avoid NPE when logging the entry point to Settings"

* commit '3b0c2eb09f24d86df79b99f45ef95fe8b8b63b94':
  Avoid NPE when logging the entry point to Settings
main
Jatin Matani 2015-03-24 20:02:45 +00:00 committed by Android Git Automerger
commit 9393497cf5
1 changed files with 1 additions and 1 deletions

View File

@ -50,7 +50,7 @@ public final class SettingsActivity extends PreferenceActivity {
} }
StatsUtils.onSettingsActivity( StatsUtils.onSettingsActivity(
intent.hasExtra(EXTRA_ENTRY_KEY) ? intent.getStringExtra(EXTRA_ENTRY_KEY) intent.hasExtra(EXTRA_ENTRY_KEY) ? intent.getStringExtra(EXTRA_ENTRY_KEY)
: intent.getStringExtra(EXTRA_ENTRY_VALUE_SYSTEM_SETTINGS)); : EXTRA_ENTRY_VALUE_SYSTEM_SETTINGS);
} }
@Override @Override