Merge "Use new app header in more screens."
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index acd3bcf..128c211 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -110,12 +110,13 @@
 
         verify(mScreen, never()).removePreference(any(Preference.class));
     }
-/*
+
     @Test
     public void handlePreferenceTreeClick_shouldStartActivity() {
-        final Preference preference = mock(Preference.class);
         final ShadowApplication application = ShadowApplication.getInstance();
         final Context context = application.getApplicationContext();
+        final Preference preference = new Preference(context);
+        preference.setKey("emergency_info");
         mController = new EmergencyInfoPreferenceController(context);
 
         mController.handlePreferenceTreeClick(preference);
@@ -123,5 +124,4 @@
         assertThat(application.getNextStartedActivity().getAction())
                 .isEqualTo("android.settings.EDIT_EMERGENGY_INFO");
     }
-*/
 }