Merge "Misc fix for secondary user"

tests/robotests/src/com/android/settings/SettingsActivityTest.java

@@ -21,6 +21,7 @@ import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.graphics.Bitmap;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java

@@ -31,6 +31,7 @@ import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -54,8 +55,12 @@ public class HardwareInfoDialogFragmentTest {
         final HardwareInfoDialogFragment fragment = spy(HardwareInfoDialogFragment.newInstance());
         fragment.show(mActivity.getFragmentManager(), HardwareInfoDialogFragment.TAG);
 
+        verify(fragment).setText(
+                any(View.class), eq(R.id.model_label), eq(R.id.model_value),
+                anyString());
+
         verify(fragment).setText(
                 any(View.class), eq(R.id.hardware_rev_label), eq(R.id.hardware_rev_value),
-                eq(TEST_HARDWARE_REV));
+                anyString());
     }
 }