diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-15 03:26:29 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-02-15 03:26:29 +0000 |
| commit | c86d8d9512ffce459885bd8276789f57b88f769c (patch) | |
| tree | 01f2f07d5506b7da68058295ca653e6af7f1b3cc | |
| parent | 113b0f85e087878d2c25ba3ec320bbe3ce55a5f8 (diff) | |
| parent | 661e84967bb2600427cb65715caeeba112b94244 (diff) | |
| download | webrtc-android11-d1-s7-release.tar.gz | |
Snap for 6210127 from 661e84967bb2600427cb65715caeeba112b94244 to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-release
Change-Id: I1568d6bc9a59b6dcefe02cf607aab032c4085b0e
3 files changed, 3 insertions, 3 deletions
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 db5ef3d45e..a52a1fa55f 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 @@ public final class AppRTCUtils { /** 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 + ", " + + "Release: " + Build.VERSION.RELEASE_OR_CODENAME + ", " + "Brand: " + Build.BRAND + ", " + "Device: " + Build.DEVICE + ", " + "Id: " + Build.ID + ", " 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 9f025c4f4b..fc236b310d 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 final class BuildInfo { } public static String getBuildRelease() { - return Build.VERSION.RELEASE; + return Build.VERSION.RELEASE_OR_CODENAME; } public static String getSdkVersion() { 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 45f564a4dd..b216e8d49e 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 @@ public final class WebRtcAudioUtils { // 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 + ", " + + "Release: " + Build.VERSION.RELEASE_OR_CODENAME + ", " + "Brand: " + Build.BRAND + ", " + "Device: " + Build.DEVICE + ", " + "Id: " + Build.ID + ", " |