diff options
| author | Mathew Inwood <mathewi@google.com> | 2020-11-04 09:29:36 +0000 |
|---|---|---|
| committer | Mathew Inwood <mathewi@google.com> | 2020-11-04 09:45:53 +0000 |
| commit | 5d123b67756dffcfdebdb936ab2de2b29c799321 (patch) | |
| tree | 9e3204e6cde333358d2400fd7adc9f12f291c54a /core/java/org | |
| parent | 15075fcca007c49c8f0e7cd017979a48989cadcf (diff) | |
Add maxTargetSdk restriction to unused APIs.
These are APIs that have @UnsupportedAppUsage but for which we don't
have any evidence of them currently being used, so should be safe to
remove from the unsupported list.
Bug: 170729553
Test: Treehugger
Merged-In: I626caf7c1fe46c5ab1f39c2895b42a34319f771a
Change-Id: I54e5ecd11e76ca1de3c5893e3a98b0108e735413
Diffstat (limited to 'core/java/org')
| -rw-r--r-- | core/java/org/apache/http/conn/ssl/SSLSocketFactory.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java index e1fe1bdbdd5f..25091263b2b0 100644 --- a/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -182,7 +182,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { private final SSLContext sslcontext; @UnsupportedAppUsage private final javax.net.ssl.SSLSocketFactory socketfactory; - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private final HostNameResolver nameResolver; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private X509HostnameVerifier hostnameVerifier = BROWSER_COMPATIBLE_HOSTNAME_VERIFIER; @@ -262,7 +262,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { this.nameResolver = null; } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static KeyManager[] createKeyManagers(final KeyStore keystore, final String password) throws KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException { if (keystore == null) { @@ -274,7 +274,7 @@ public class SSLSocketFactory implements LayeredSocketFactory { return kmfactory.getKeyManagers(); } - @UnsupportedAppUsage + @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private static TrustManager[] createTrustManagers(final KeyStore keystore) throws KeyStoreException, NoSuchAlgorithmException { if (keystore == null) { |