From 0cdd620e623a226843ed518dada23f1ea3b69b6e Mon Sep 17 00:00:00 2001
From: jeffreyhuang <jeffreyhuang@google.com>
Date: Fri, 10 Nov 2017 14:20:16 -0800
Subject: [PATCH] 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
---
 .../deviceinfo/KernelVersionPreferenceController.java    | 2 +-
 .../firmwareversion/KernelVersionDialogController.java   | 3 ++-
 .../KernelVersionDialogControllerTest.java               | 9 ++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
index 5afed9c83e4..f3b98ed595f 100644
--- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
@@ -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
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
index c6c84f6f0e6..d583e0461a7 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
@@ -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()));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
index c679af53d41..0dfedf4efc3 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
@@ -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));
     }
 }