commit 419d11c8330561f3bd79bfa8d527528c2a411f00
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Dec 04 11:12:16 2019 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Dec 04 11:12:16 2019 +0000
tree a918dbd5e48b0ba8139c51c8dc68a6367a85559b
parent 630a6d42f1778c75237eefe4e160873b3b4f07f3
parent 586cc7fae1b05b6f7a649b542bb937cdc2a3921b

Snap for 6048185 from 586cc7fae1b05b6f7a649b542bb937cdc2a3921b to r-keystone-qcom-release

Change-Id: Ie922c37cdc41af0e739825ffc2a34b1975ea2c22

webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java

diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
index a52a1fa..db5ef3d 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/util/AppRTCUtils.java
@@ -55,7 +55,7 @@
   /** Information about the current build, taken from system properties. */
   public static void logDeviceInfo(String tag) {
     Log.d(tag, "Android SDK: " + Build.VERSION.SDK_INT + ", "
-        + "Release: " + Build.VERSION.RELEASE_OR_CODENAME + ", "
+        + "Release: " + Build.VERSION.RELEASE + ", "
         + "Brand: " + Build.BRAND + ", "
         + "Device: " + Build.DEVICE + ", "
         + "Id: " + Build.ID + ", "

webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java

diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
index fc236b3..9f025c4 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java
@@ -43,7 +43,7 @@
   }
 
   public static String getBuildRelease() {
-    return Build.VERSION.RELEASE_OR_CODENAME;
+    return Build.VERSION.RELEASE;
   }
 
   public static String getSdkVersion() {

webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java

diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
index b216e8d..45f564a 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java
@@ -182,7 +182,7 @@
   // Information about the current build, taken from system properties.
   public static void logDeviceInfo(String tag) {
     Logging.d(tag, "Android SDK: " + Build.VERSION.SDK_INT + ", "
-        + "Release: " + Build.VERSION.RELEASE_OR_CODENAME + ", "
+        + "Release: " + Build.VERSION.RELEASE + ", "
         + "Brand: " + Build.BRAND + ", "
         + "Device: " + Build.DEVICE + ", "
         + "Id: " + Build.ID + ", "