Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add maxTargetSdk restriction to unused APIs.

Browse Source 
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
This commit is contained in:
Mathew Inwood
2020-11-04 09:29:36 +00:00
parent 15075fcca0
commit 5d123b6775
638 changed files with 2392 additions and 2020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/org/apache/http/conn/ssl/SSLSocketFactory.java
View File

@@ -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) {