Merge "Use uname instead of proc/version" (60303333) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java

+28 −33

Original line number	Diff line number	Diff line
		@@ -22,12 +22,15 @@ import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.os.Build;
		import android.system.Os;
		import android.system.StructUtsname;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.SubscriptionInfo;
		import android.telephony.TelephonyManager;
		import android.text.TextUtils;
		import android.text.format.DateFormat;
		import android.util.Log;
		import android.support.annotation.VisibleForTesting;

		import java.io.BufferedReader;
		import java.io.FileReader;
		@@ -45,7 +48,6 @@ import static android.content.Context.TELEPHONY_SERVICE;
		public class DeviceInfoUtils {
		private static final String TAG = "DeviceInfoUtils";

		private static final String FILENAME_PROC_VERSION = "/proc/version";
		private static final String FILENAME_MSV = "/sys/board_properties/soc/msv";

		/**
		@@ -63,43 +65,36 @@ public class DeviceInfoUtils {
		}
		}

		public static String getFormattedKernelVersion() {
		try {
		return formatKernelVersion(readLine(FILENAME_PROC_VERSION));
		} catch (IOException e) {
		Log.e(TAG, "IO Exception when getting kernel version for Device Info screen",
		e);

		return "Unavailable";
		}
		}

		public static String formatKernelVersion(String rawKernelVersion) {
		// Example (see tests for more):
		// Linux version 4.9.29-g958411d (android-build@xyz) (Android clang version 3.8.256229 \
		// (based on LLVM 3.8.256229)) #1 SMP PREEMPT Wed Jun 7 00:06:03 CST 2017
		// Linux version 4.9.29-geb63318482a7 (android-build@xyz) (gcc version 4.9.x 20150123 \
		// (prerelease) (GCC) ) #1 SMP PREEMPT Thu Jun 1 03:41:57 UTC 2017
		final String PROC_VERSION_REGEX =
		"Linux version (\\S+) " + /* group 1: "3.0.31-g6fb96c9" */
		"\$(\\S+?)\$ " + /* group 2: "(x@y.com) " */
		"\$(.+?)\$ " + /* group 3: kernel toolchain version information */
		"(#\\d+) " + /* group 4: "#1" */
		"(?:.?)?" + / ignore: optional SMP, PREEMPT, and any CONFIG_FLAGS */
		"((Sun\|Mon\|Tue\|Wed\|Thu\|Fri\|Sat).+)"; /* group 5: "Thu Jun 28 11:02:39 PDT 2012" */
		public static String getFormattedKernelVersion(Context context) {
		return formatKernelVersion(context, Os.uname());
		}

		Matcher m = Pattern.compile(PROC_VERSION_REGEX).matcher(rawKernelVersion);
		@VisibleForTesting
		static String formatKernelVersion(Context context, StructUtsname uname) {
		if (uname == null) {
		return context.getString(R.string.status_unavailable);
		}
		// Example:
		// 4.9.29-g958411d
		// #1 SMP PREEMPT Wed Jun 7 00:06:03 CST 2017
		final String VERSION_REGEX =
		"(#\\d+) " + /* group 1: "#1" */
		"(?:.?)?" + / ignore: optional SMP, PREEMPT, and any CONFIG_FLAGS */
		"((Sun\|Mon\|Tue\|Wed\|Thu\|Fri\|Sat).+)"; /* group 2: "Thu Jun 28 11:02:39 PDT 2012" */
		Matcher m = Pattern.compile(VERSION_REGEX).matcher(uname.version);
		if (!m.matches()) {
		Log.e(TAG, "Regex did not match on /proc/version: " + rawKernelVersion);
		return "Unavailable";
		} else if (m.groupCount() < 4) {
		Log.e(TAG, "Regex match on /proc/version only returned " + m.groupCount()
		+ " groups");
		return "Unavailable";
		}
		return m.group(1) + " ("+ m.group(3) + ")\n" + // 3.0.31-g6fb96c9 (toolchain version)
		m.group(2) + " " + m.group(4) + "\n" + // x@y.com #1
		m.group(5); // Thu Jun 28 11:02:39 PDT 2012
		Log.e(TAG, "Regex did not match on uname version " + uname.version);
		return context.getString(R.string.status_unavailable);
		}

		// Example output:
		// 4.9.29-g958411d
		// #1 Wed Jun 7 00:06:03 CST 2017
		return new StringBuilder().append(uname.release)
		.append("\n")
		.append(m.group(1))
		.append(" ")
		.append(m.group(2)).toString();
		}

		/**

packages/SettingsLib/tests/robotests/src/com/android/settingslib/DeviceInfoUtilsTest.java

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.settingslib;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.Context;
		import android.system.StructUtsname;

		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsLibRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
		public class DeviceInfoUtilsTest {

		private Context mContext;

		@Before
		public void setup() {
		mContext = RuntimeEnvironment.application;
		}

		@Test
		public void formatKernelVersion_regularInputVersion_shouldStripOptionalValues() {
		final String sysName = "Linux";
		final String nodeName = "localhost";
		final String release = "4.4.88-g134be430baab";
		final String version = "#1 SMP PREEMPT Tue Dec 31 12:00:00 UTC 2017";
		final String machine = "aarch64";
		final StructUtsname uname = new StructUtsname(sysName, nodeName, release, version, machine);

		final String expected = release + "\n" + "#1 Tue Dec 31 12:00:00 UTC 2017";

		assertThat(DeviceInfoUtils.formatKernelVersion(mContext, uname)).isEqualTo(expected);
		}

		@Test
		public void formatKernelVersion_nonRegularInputVersion_shouldBeUnavailable() {
		final String sysName = "Linux";
		final String nodeName = "localhost";
		final String release = "4.4.88-g134be430baab";
		final String version = "%@%!asd%#@!$" + "\n " + "fasdfasdfa13ta";
		final String machine = "aarch64";
		final StructUtsname uname = new StructUtsname(sysName, nodeName, release, version, machine);

		final String expected = mContext.getString(R.string.status_unavailable);

		assertThat(DeviceInfoUtils.formatKernelVersion(mContext, uname)).isEqualTo(expected);
		}

		@Test
		public void formatKernelVersion_nullInputVersion_shouldBeUnavailable() {
		final String expected = mContext.getString(R.string.status_unavailable);

		assertThat(DeviceInfoUtils.formatKernelVersion(mContext, null)).isEqualTo(expected);
		}
		}