commit 08f5af65812dfae784080fd8ce91e934581fd1e9
author Kevin Lau Fang <fangk@google.com> Thu Nov 14 20:06:36 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 14 22:32:55 2019 +0000
tree 72d6c450de007601941a86a08c2bb036afc9e90d
parent e2b1b027f55c8f9f6f93dc158213c8a808e983b1

Revert submission

Reason for revert: This causes a boot issue on Taimen (b/144480969). It wasn't caught by TreeHugger due to Taimen tests being disabled due to a different lab outage (b/144350336).

Change-Id: I6b4cd2d286c44231cb8f4789b7e36633978cd060
(cherry picked from commit 1bd49c2ccdd59e76b2546cec8a4b02b66e7e7123)

Settings/src/com/android/tv/settings/about/AboutFragment.java

diff --git a/Settings/src/com/android/tv/settings/about/AboutFragment.java b/Settings/src/com/android/tv/settings/about/AboutFragment.java
index e3f7d98..43ac4c2 100644
--- a/Settings/src/com/android/tv/settings/about/AboutFragment.java
+++ b/Settings/src/com/android/tv/settings/about/AboutFragment.java
@@ -116,7 +116,7 @@
         PreferenceUtils.resolveSystemActivityOrRemove(getActivity(), screen, deviceNamePref, 0);
 
         final Preference firmwareVersionPref = findPreference(KEY_FIRMWARE_VERSION);
-        firmwareVersionPref.setSummary(Build.VERSION.RELEASE_OR_CODENAME);
+        firmwareVersionPref.setSummary(Build.VERSION.RELEASE);
         firmwareVersionPref.setEnabled(true);
 
         final Preference securityPatchPref = findPreference(KEY_SECURITY_PATCH);