Merge "Use uname instead of proc/version" (e1ead4d3) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public class KernelVersionPreferenceController extends AbstractPreferenceControl
		@Override
		public void updateState(Preference preference) {
		super.updateState(preference);
		preference.setSummary(DeviceInfoUtils.getFormattedKernelVersion());
		preference.setSummary(DeviceInfoUtils.getFormattedKernelVersion(mContext));
		}

		@Override

+2 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ public class KernelVersionDialogController {
		* Updates kernel version to the dialog.
		*/
		public void initialize() {
		mDialog.setText(KERNEL_VERSION_VALUE_ID, DeviceInfoUtils.getFormattedKernelVersion());
		mDialog.setText(KERNEL_VERSION_VALUE_ID,
		DeviceInfoUtils.getFormattedKernelVersion(mDialog.getContext()));
		}
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@ import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialo
		.KERNEL_VERSION_VALUE_ID;

		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;

		import android.content.Context;

		import com.android.settings.TestConfig;
		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		@@ -30,6 +33,7 @@ import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsRobolectricTestRunner.class)
		@@ -39,11 +43,14 @@ public class KernelVersionDialogControllerTest {
		@Mock
		private FirmwareVersionDialogFragment mDialog;

		private Context mContext;
		private KernelVersionDialogController mController;

		@Before
		public void setup() {
		MockitoAnnotations.initMocks(this);
		mContext = RuntimeEnvironment.application;
		when(mDialog.getContext()).thenReturn(mContext);
		mController = new KernelVersionDialogController(mDialog);
		}

		@@ -52,6 +59,6 @@ public class KernelVersionDialogControllerTest {
		mController.initialize();

		verify(mDialog).setText(KERNEL_VERSION_VALUE_ID,
		DeviceInfoUtils.getFormattedKernelVersion());
		DeviceInfoUtils.getFormattedKernelVersion(mContext));
		}
		}