commit 78a43b4396123119c23bbe440a16e49d7bf0b287
author Steven Laver <lavers@google.com> Fri Feb 14 13:17:29 2020 -0800
committer Steven Laver <lavers@google.com> Fri Feb 14 13:17:29 2020 -0800
tree 4c0cca7385d97e67066ef6b05492b0736e853016
parent 4387d76e43507c21d4b214c7fd48d23f35fd1850
parent a7ee4f92c8928f6e9b1e9cfa8235ab0a3490a0d4

Merge RP1A.200214.001

Change-Id: If30ac08daaff0905fcbd2ed9dd312215626066d4

prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java

diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java
index 30ee412..f54b258 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java
@@ -452,7 +452,8 @@
         } catch (PackageManager.NameNotFoundException e) {
             versionName = "?";
         }
-        return "SampleTvInput/" + versionName + " (Linux;Android " + Build.VERSION.RELEASE +
+        return "SampleTvInput/" + versionName + " (Linux;Android "
+                + Build.VERSION.RELEASE_OR_CODENAME +
                 ") " + "ExoPlayerLib/" + ExoPlayerLibraryInfo.VERSION;
     }