diff options
| author | Paul Duffin <paulduffin@google.com> | 2018-12-12 07:38:36 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-12 07:38:36 -0800 |
| commit | 0191226af3fb25456f43701d2bad967ceffa14f0 (patch) | |
| tree | de11d4a61c5d8d47e41c3c0694506a6ddf6d97d0 | |
| parent | bfe10e9ff873d1a40b8c3b854d73c2550f02bb83 (diff) | |
| parent | c2e7b1de712ac8e098bec6e09fb7c2fb7c8d4951 (diff) | |
| download | okhttp-0191226af3fb25456f43701d2bad967ceffa14f0.tar.gz | |
Merge "Add hiddenapi entries from bugbot scrape of bug reports" am: 47167645e9 am: 3a4e1591d4
am: c2e7b1de71
Change-Id: I1f9039f64a6d79e5ef635773228cd36fd140869a
| -rw-r--r-- | android/src/main/java/com/squareup/okhttp/internal/Version.java | 3 | ||||
| -rw-r--r-- | repackaged/android/src/main/java/com/android/okhttp/internal/Version.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/android/src/main/java/com/squareup/okhttp/internal/Version.java b/android/src/main/java/com/squareup/okhttp/internal/Version.java index 6a63f9b..85ff0da 100644 --- a/android/src/main/java/com/squareup/okhttp/internal/Version.java +++ b/android/src/main/java/com/squareup/okhttp/internal/Version.java @@ -15,7 +15,10 @@ */ package com.squareup.okhttp.internal; +import dalvik.annotation.compat.UnsupportedAppUsage; + public final class Version { + @UnsupportedAppUsage public static String userAgent() { String agent = System.getProperty("http.agent"); return agent != null ? agent : ("Java" + System.getProperty("java.version")); diff --git a/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java b/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java index f186a62..c248941 100644 --- a/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java +++ b/repackaged/android/src/main/java/com/android/okhttp/internal/Version.java @@ -16,10 +16,13 @@ */ package com.android.okhttp.internal; +import dalvik.annotation.compat.UnsupportedAppUsage; + /** * @hide This class is not part of the Android public SDK API */ public final class Version { + @UnsupportedAppUsage public static String userAgent() { String agent = System.getProperty("http.agent"); return agent != null ? agent : ("Java" + System.getProperty("java.version")); |