diff options
| author | Dianne Hackborn <hackbod@google.com> | 2019-10-28 16:34:02 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2019-10-28 16:34:02 -0700 |
| commit | e1d6569106562395eb7035e52244b51d943c3adc (patch) | |
| tree | 01f2f07d5506b7da68058295ca653e6af7f1b3cc | |
| parent | cf0ffc92d1efdaaacf7e2c8045af754463e34813 (diff) | |
| download | webrtc-e1d6569106562395eb7035e52244b51d943c3adc.tar.gz | |
Rework platform version to hide codenames.
The public platform version no longer can be a codename, it is
always the most recently released platform. A new build property
and API provides either the offical version or the current codename
as appropriate. This will avoid breaking apps that look at the
platform version while development is under a codename.
Bug: 143175463
Test: manual
Change-Id: I8dec42edf5a4a6184156643c91073e33936fae56
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 + ", " |