diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-14 22:33:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-14 22:33:40 +0000 |
| commit | 1c38afd389b38cbc617cf3653d36ac45c9bc392e (patch) | |
| tree | a918dbd5e48b0ba8139c51c8dc68a6367a85559b | |
| parent | 780c042d524edbdaacc8ebdc5ce157b985f73d3e (diff) | |
| parent | df06ef4491397c7bc2bd0f98af5b8e5839e2b8c8 (diff) | |
| download | webrtc-1c38afd389b38cbc617cf3653d36ac45c9bc392e.tar.gz | |
Merge cherrypicks of [9734022, 9734337, 9733748, 9733749, 9734338, 9734339, 9734401, 9734402, 9734403, 9734404, 9734405, 9734023, 9734456, 9734340, 9733750, 9733999, 9733853, 9734000, 9734117, 9734341, 9734342, 9734049, 9734343, 9734458, 9734001] into rvc-release
Change-Id: I713601a70e27c0ac85dd8e26bb311a9808fcf7ce
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 a52a1fa55f..db5ef3d45e 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_OR_CODENAME + ", " + + "Release: " + Build.VERSION.RELEASE + ", " + "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 fc236b310d..9f025c4f4b 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_OR_CODENAME; + return Build.VERSION.RELEASE; } 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 b216e8d49e..45f564a4dd 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_OR_CODENAME + ", " + + "Release: " + Build.VERSION.RELEASE + ", " + "Brand: " + Build.BRAND + ", " + "Device: " + Build.DEVICE + ", " + "Id: " + Build.ID + ", " |