commit aba81423c666d0f09bdb5ab43d3998ef2dfb0674
author Leo Wang <leozwang@google.com> Wed Nov 18 18:42:55 2015 +0000
committer Daniel Xie <dxie@google.com> Mon Nov 30 23:04:21 2015 +0000
tree 7644967baf8d0936b740c38d7198c18fc937f9f1
parent 5ccc5c2d523efb4ff9431741e0eb365fbbb2bfbc

DO NOT MERGE: Revert "Add build number into CTS Verifier."

This reverts commit 237402032078703a6658c034461cdd33087fa281.

Change-Id: Ifecac1cffb00388dafcc273c7e40fd5982fd352e

apps/CtsVerifier/Android.mk

diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index c40d981..a752519 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -41,8 +41,6 @@
 
 LOCAL_PACKAGE_NAME := CtsVerifier
 
-LOCAL_AAPT_FLAGS += --version-name "6.0_r1 $(BUILD_NUMBER)"
-
 LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni libaudioloopback_jni
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags

apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java b/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java
index 05c5e77..dc2502c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/TestResultsReport.java
@@ -96,7 +96,6 @@
         xml.startTag(null, VERIFIER_INFO_TAG);
         xml.attribute(null, "version-name", Version.getVersionName(mContext));
         xml.attribute(null, "version-code", Integer.toString(Version.getVersionCode(mContext)));
-        xml.attribute(null, "build", Version.getBuildNumber(mContext));
         xml.endTag(null, VERIFIER_INFO_TAG);
 
         xml.startTag(null, DEVICE_INFO_TAG);

apps/CtsVerifier/src/com/android/cts/verifier/Version.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/Version.java b/apps/CtsVerifier/src/com/android/cts/verifier/Version.java
index dfe9508..e7b6121 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/Version.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/Version.java
@@ -24,21 +24,13 @@
 class Version {
 
     static String getVersionName(Context context) {
-        return getVersionNameStrings(context)[0];
+        return getPackageInfo(context).versionName;
     }
 
     static int getVersionCode(Context context) {
         return getPackageInfo(context).versionCode;
     }
 
-    static String getBuildNumber(Context context) {
-        return getVersionNameStrings(context)[1];
-    }
-
-    static private String[] getVersionNameStrings(Context context) {
-        return getPackageInfo(context).versionName.split(" ");
-    }
-
     static PackageInfo getPackageInfo(Context context) {
         try {
             PackageManager packageManager = context.getPackageManager();