Use uname instead of proc/version

- Update the displayed kernel version to use uname instead

Change-Id: Iced2540f775c03c273521c8965c2f331267982b2
Fixes: 67006899
Test: Manual with settings app
This commit is contained in:
jeffreyhuang
2017-11-10 14:20:16 -08:00
parent 4cbeaf6729
commit 0cdd620e62
3 changed files with 11 additions and 3 deletions

View File

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

View File

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

View File

@@ -20,6 +20,9 @@ import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialo
.KERNEL_VERSION_VALUE_ID; .KERNEL_VERSION_VALUE_ID;
import static org.mockito.Mockito.verify; 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.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -30,6 +33,7 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@@ -39,11 +43,14 @@ public class KernelVersionDialogControllerTest {
@Mock @Mock
private FirmwareVersionDialogFragment mDialog; private FirmwareVersionDialogFragment mDialog;
private Context mContext;
private KernelVersionDialogController mController; private KernelVersionDialogController mController;
@Before @Before
public void setup() { public void setup() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
when(mDialog.getContext()).thenReturn(mContext);
mController = new KernelVersionDialogController(mDialog); mController = new KernelVersionDialogController(mDialog);
} }
@@ -52,6 +59,6 @@ public class KernelVersionDialogControllerTest {
mController.initialize(); mController.initialize();
verify(mDialog).setText(KERNEL_VERSION_VALUE_ID, verify(mDialog).setText(KERNEL_VERSION_VALUE_ID,
DeviceInfoUtils.getFormattedKernelVersion()); DeviceInfoUtils.getFormattedKernelVersion(mContext));
} }
} }