commit 11ff8041a3740c0a5867fb2a8c715455af66172c
author Kevin Lau Fang <fangk@google.com> Thu Nov 14 20:06:42 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Nov 14 22:33:00 2019 +0000
tree d690b507278fb5689944fd502aac7b7ba84cf3cc
parent d98c13ce4933e37f77124093be8a589d901f4f71

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: I228981a6917e6cf591f40205981e30530e08ca57
(cherry picked from commit 52208c7c616dbed0e0679650827c2b3151b6552a)

src/com/android/providers/downloads/Constants.java

diff --git a/src/com/android/providers/downloads/Constants.java b/src/com/android/providers/downloads/Constants.java
index dfef8d1..c822c7c 100644
--- a/src/com/android/providers/downloads/Constants.java
+++ b/src/com/android/providers/downloads/Constants.java
@@ -97,18 +97,18 @@
     static {
         final StringBuilder builder = new StringBuilder();
 
-        final boolean validRelease = !TextUtils.isEmpty(Build.VERSION.RELEASE_OR_CODENAME);
+        final boolean validRelease = !TextUtils.isEmpty(Build.VERSION.RELEASE);
         final boolean validId = !TextUtils.isEmpty(Build.ID);
         final boolean includeModel = "REL".equals(Build.VERSION.CODENAME)
                 && !TextUtils.isEmpty(Build.MODEL);
 
         builder.append("AndroidDownloadManager");
         if (validRelease) {
-            builder.append("/").append(Build.VERSION.RELEASE_OR_CODENAME);
+            builder.append("/").append(Build.VERSION.RELEASE);
         }
         builder.append(" (Linux; U; Android");
         if (validRelease) {
-            builder.append(" ").append(Build.VERSION.RELEASE_OR_CODENAME);
+            builder.append(" ").append(Build.VERSION.RELEASE);
         }
         if (includeModel || validId) {
             builder.append(";");