commit 59846cb57adc99181600307c0d30c87ad973e426
author Kevin Lau Fang <fangk@google.com> Thu Nov 14 20:06:32 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 14 22:32:35 2019 +0000
tree 373d1d32404eed063b41e708432a5b1b723f61c5
parent c622c904a299fd1ce28066203c0f83529b2475ec

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: I5896e292053d55d4978965bd0ca9e853fe6de225
(cherry picked from commit 3ec8d259b2b72771976ac91e9990176d43ec4ab4)

src/com/android/car/settings/system/FirmwareVersionPreferenceController.java

diff --git a/src/com/android/car/settings/system/FirmwareVersionPreferenceController.java b/src/com/android/car/settings/system/FirmwareVersionPreferenceController.java
index 5dd415f..31aef17 100644
--- a/src/com/android/car/settings/system/FirmwareVersionPreferenceController.java
+++ b/src/com/android/car/settings/system/FirmwareVersionPreferenceController.java
@@ -42,7 +42,7 @@
     @Override
     protected void updateState(Preference preference) {
         preference.setSummary(
-                getContext().getString(R.string.about_summary, Build.VERSION.RELEASE_OR_CODENAME));
+                getContext().getString(R.string.about_summary, Build.VERSION.RELEASE));
     }
 
     @Override