Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2caddc5e authored by Jeremy Joslin's avatar Jeremy Joslin
Browse files

Marking deprecated recommendation request code as @removed. 

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: Built & ran
Bug: 37357264
Change-Id: I6d55fbad87b11c99e7ddac07cfaa82efeee33187
parent 030107f0

api/removed.txt

+43 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,18 @@ package android.net { 
    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);

    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);

  }

  }





  public abstract class NetworkRecommendationProvider {

    ctor public deprecated NetworkRecommendationProvider(android.os.Handler);

    method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback);

    field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT";

    field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE";

  }



  public static deprecated class NetworkRecommendationProvider.ResultCallback {

    ctor public NetworkRecommendationProvider.ResultCallback(android.os.IRemoteCallback, int);

    method public void onResult(android.net.RecommendationResult);

  }



  public abstract class PskKeyManager {

  public abstract class PskKeyManager {

    ctor public PskKeyManager();

    ctor public PskKeyManager();

    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80

    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80
@@ -195,6 +207,37 @@ package android.net { 
    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100

    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100

  }

  }





  public final deprecated class RecommendationRequest implements android.os.Parcelable {

    ctor protected RecommendationRequest(android.os.Parcel);

    method public android.net.wifi.WifiConfiguration[] getConnectableConfigs();

    method public android.net.wifi.WifiConfiguration getConnectedConfig();

    method public android.net.wifi.WifiConfiguration getDefaultWifiConfig();

    method public int getLastSelectedNetworkId();

    method public long getLastSelectedNetworkTimestamp();

    method public android.net.wifi.ScanResult[] getScanResults();

    method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]);

    method public void setConnectedConfig(android.net.wifi.WifiConfiguration);

    field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR;

  }



  public static final deprecated class RecommendationRequest.Builder {

    ctor public RecommendationRequest.Builder();

    method public android.net.RecommendationRequest build();

    method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]);

    method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration);

    method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration);

    method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long);

    method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]);

  }



  public final deprecated class RecommendationResult implements android.os.Parcelable {

    method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration);

    method public static android.net.RecommendationResult createDoNotConnectRecommendation();

    method public android.net.wifi.WifiConfiguration getWifiConfiguration();

    method public boolean hasRecommendation();

    field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR;

  }



  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {

  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {

    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

  }

  }

api/system-current.txt

+0 −43
Original line number Original line Diff line number Diff line
@@ -27886,17 +27886,9 @@ package android.net { 
  }

  }

















  public abstract class NetworkRecommendationProvider {







  public abstract class NetworkRecommendationProvider {











    ctor public deprecated NetworkRecommendationProvider(android.os.Handler);














    ctor public NetworkRecommendationProvider(android.content.Context, java.util.concurrent.Executor);







    ctor public NetworkRecommendationProvider(android.content.Context, java.util.concurrent.Executor);











    method public final android.os.IBinder getBinder();







    method public final android.os.IBinder getBinder();











    method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback);














    method public abstract void onRequestScores(android.net.NetworkKey[]);







    method public abstract void onRequestScores(android.net.NetworkKey[]);











    field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT";














    field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE";














  }



























  public static deprecated class NetworkRecommendationProvider.ResultCallback {














    method public void onResult(android.net.RecommendationResult);














  }







  }



























  public class NetworkRequest implements android.os.Parcelable {







  public class NetworkRequest implements android.os.Parcelable {










@@ -27962,41 +27954,6 @@ package android.net {









    field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;







    field public static final android.os.Parcelable.Creator<android.net.ProxyInfo> CREATOR;











  }







  }



























  public final deprecated class RecommendationRequest implements android.os.Parcelable {














    ctor protected RecommendationRequest(android.os.Parcel);














    method public int describeContents();














    method public android.net.wifi.WifiConfiguration[] getConnectableConfigs();














    method public android.net.wifi.WifiConfiguration getConnectedConfig();














    method public android.net.wifi.WifiConfiguration getDefaultWifiConfig();














    method public int getLastSelectedNetworkId();














    method public long getLastSelectedNetworkTimestamp();














    method public android.net.wifi.ScanResult[] getScanResults();














    method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]);














    method public void setConnectedConfig(android.net.wifi.WifiConfiguration);














    method public void writeToParcel(android.os.Parcel, int);














    field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR;














  }



























  public static final deprecated class RecommendationRequest.Builder {














    ctor public RecommendationRequest.Builder();














    method public android.net.RecommendationRequest build();














    method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]);














    method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration);














    method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration);














    method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long);














    method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]);














  }



























  public final deprecated class RecommendationResult implements android.os.Parcelable {














    method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration);














    method public static android.net.RecommendationResult createDoNotConnectRecommendation();














    method public int describeContents();














    method public android.net.wifi.WifiConfiguration getWifiConfiguration();














    method public boolean hasRecommendation();














    method public void writeToParcel(android.os.Parcel, int);














    field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR;














  }



























  public final class RouteInfo implements android.os.Parcelable {







  public final class RouteInfo implements android.os.Parcelable {











    method public int describeContents();







    method public int describeContents();











    method public android.net.IpPrefix getDestination();







    method public android.net.IpPrefix getDestination();

























api/system-removed.txt



+43
−0




























Original line number
Original line
Diff line number
Diff line








@@ -186,6 +186,18 @@ package android.net {









    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);







    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);











  }







  }


































  public abstract class NetworkRecommendationProvider {














    ctor public deprecated NetworkRecommendationProvider(android.os.Handler);














    method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback);














    field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT";














    field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE";














  }





























  public static deprecated class NetworkRecommendationProvider.ResultCallback {














    ctor public NetworkRecommendationProvider.ResultCallback(android.os.IRemoteCallback, int);














    method public void onResult(android.net.RecommendationResult);














  }


























  public abstract class PskKeyManager {







  public abstract class PskKeyManager {











    ctor public PskKeyManager();







    ctor public PskKeyManager();











    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80







    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80









@@ -193,6 +205,37 @@ package android.net {









    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100







    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100











  }







  }


































  public final deprecated class RecommendationRequest implements android.os.Parcelable {














    ctor protected RecommendationRequest(android.os.Parcel);














    method public android.net.wifi.WifiConfiguration[] getConnectableConfigs();














    method public android.net.wifi.WifiConfiguration getConnectedConfig();














    method public android.net.wifi.WifiConfiguration getDefaultWifiConfig();














    method public int getLastSelectedNetworkId();














    method public long getLastSelectedNetworkTimestamp();














    method public android.net.wifi.ScanResult[] getScanResults();














    method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]);














    method public void setConnectedConfig(android.net.wifi.WifiConfiguration);














    field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR;














  }





























  public static final deprecated class RecommendationRequest.Builder {














    ctor public RecommendationRequest.Builder();














    method public android.net.RecommendationRequest build();














    method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]);














    method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration);














    method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration);














    method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long);














    method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]);














  }





























  public final deprecated class RecommendationResult implements android.os.Parcelable {














    method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration);














    method public static android.net.RecommendationResult createDoNotConnectRecommendation();














    method public android.net.wifi.WifiConfiguration getWifiConfiguration();














    method public boolean hasRecommendation();














    field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR;














  }


























  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {







  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {











    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);







    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);











  }







  }

































api/test-removed.txt



+43
−0




























Original line number
Original line
Diff line number
Diff line








@@ -188,6 +188,18 @@ package android.net {









    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);







    method public deprecated int stopUsingNetworkFeature(int, java.lang.String);











  }







  }


































  public abstract class NetworkRecommendationProvider {














    ctor public deprecated NetworkRecommendationProvider(android.os.Handler);














    method public deprecated void onRequestRecommendation(android.net.RecommendationRequest, android.net.NetworkRecommendationProvider.ResultCallback);














    field public static final deprecated java.lang.String EXTRA_RECOMMENDATION_RESULT = "android.net.extra.RECOMMENDATION_RESULT";














    field public static final deprecated java.lang.String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE";














  }





























  public static deprecated class NetworkRecommendationProvider.ResultCallback {














    ctor public NetworkRecommendationProvider.ResultCallback(android.os.IRemoteCallback, int);














    method public void onResult(android.net.RecommendationResult);














  }


























  public abstract class PskKeyManager {







  public abstract class PskKeyManager {











    ctor public PskKeyManager();







    ctor public PskKeyManager();











    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80







    field public static final int MAX_IDENTITY_HINT_LENGTH_BYTES = 128; // 0x80









@@ -195,6 +207,37 @@ package android.net {









    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100







    field public static final int MAX_KEY_LENGTH_BYTES = 256; // 0x100











  }







  }


































  public final deprecated class RecommendationRequest implements android.os.Parcelable {














    ctor protected RecommendationRequest(android.os.Parcel);














    method public android.net.wifi.WifiConfiguration[] getConnectableConfigs();














    method public android.net.wifi.WifiConfiguration getConnectedConfig();














    method public android.net.wifi.WifiConfiguration getDefaultWifiConfig();














    method public int getLastSelectedNetworkId();














    method public long getLastSelectedNetworkTimestamp();














    method public android.net.wifi.ScanResult[] getScanResults();














    method public void setConnectableConfigs(android.net.wifi.WifiConfiguration[]);














    method public void setConnectedConfig(android.net.wifi.WifiConfiguration);














    field public static final android.os.Parcelable.Creator<android.net.RecommendationRequest> CREATOR;














  }





























  public static final deprecated class RecommendationRequest.Builder {














    ctor public RecommendationRequest.Builder();














    method public android.net.RecommendationRequest build();














    method public android.net.RecommendationRequest.Builder setConnectableConfigs(android.net.wifi.WifiConfiguration[]);














    method public android.net.RecommendationRequest.Builder setConnectedWifiConfig(android.net.wifi.WifiConfiguration);














    method public android.net.RecommendationRequest.Builder setDefaultWifiConfig(android.net.wifi.WifiConfiguration);














    method public android.net.RecommendationRequest.Builder setLastSelectedNetwork(int, long);














    method public android.net.RecommendationRequest.Builder setScanResults(android.net.wifi.ScanResult[]);














  }





























  public final deprecated class RecommendationResult implements android.os.Parcelable {














    method public static android.net.RecommendationResult createConnectRecommendation(android.net.wifi.WifiConfiguration);














    method public static android.net.RecommendationResult createDoNotConnectRecommendation();














    method public android.net.wifi.WifiConfiguration getWifiConfiguration();














    method public boolean hasRecommendation();














    field public static final android.os.Parcelable.Creator<android.net.RecommendationResult> CREATOR;














  }


























  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {







  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {











    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);







    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);











  }







  }

































core/java/android/net/NetworkRecommendationProvider.java



+5
−0




























Original line number
Original line
Diff line number
Diff line








@@ -41,11 +41,13 @@ public abstract class NetworkRecommendationProvider {









    private static final boolean VERBOSE = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.VERBOSE);







    private static final boolean VERBOSE = Build.IS_DEBUGGABLE && Log.isLoggable(TAG, Log.VERBOSE);











    /** The key into the callback Bundle where the RecommendationResult will be found.







    /** The key into the callback Bundle where the RecommendationResult will be found.











     * @deprecated to be removed.







     * @deprecated to be removed.














     * @removed











     */







     */











    public static final String EXTRA_RECOMMENDATION_RESULT =







    public static final String EXTRA_RECOMMENDATION_RESULT =











            "android.net.extra.RECOMMENDATION_RESULT";







            "android.net.extra.RECOMMENDATION_RESULT";











    /** The key into the callback Bundle where the sequence will be found.







    /** The key into the callback Bundle where the sequence will be found.











     * @deprecated to be removed.







     * @deprecated to be removed.














     * @removed











     */







     */











    public static final String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE";







    public static final String EXTRA_SEQUENCE = "android.net.extra.SEQUENCE";











    private final IBinder mService;







    private final IBinder mService;









@@ -54,6 +56,7 @@ public abstract class NetworkRecommendationProvider {









     * Constructs a new instance.







     * Constructs a new instance.











     * @param handler indicates which thread to use when handling requests. Cannot be {@code null}.







     * @param handler indicates which thread to use when handling requests. Cannot be {@code null}.











     * @deprecated use {@link #NetworkRecommendationProvider(Context, Executor)}







     * @deprecated use {@link #NetworkRecommendationProvider(Context, Executor)}














     * @removed











     */







     */











    public NetworkRecommendationProvider(Handler handler) {







    public NetworkRecommendationProvider(Handler handler) {











        if (handler == null) {







        if (handler == null) {










@@ -82,6 +85,7 @@ public abstract class NetworkRecommendationProvider {









     *                 available it must be passed into







     *                 available it must be passed into











     *                 {@link ResultCallback#onResult(RecommendationResult)}.







     *                 {@link ResultCallback#onResult(RecommendationResult)}.











     * @deprecated to be removed.







     * @deprecated to be removed.














     * @removed











     */







     */











    public void onRequestRecommendation(RecommendationRequest request, ResultCallback callback) {}







    public void onRequestRecommendation(RecommendationRequest request, ResultCallback callback) {}





























@@ -107,6 +111,7 @@ public abstract class NetworkRecommendationProvider {









     * is available.







     * is available.











     *







     *











     * @deprecated to be removed.







     * @deprecated to be removed.














     * @removed











     */







     */











    public static class ResultCallback {







    public static class ResultCallback {











        private final IRemoteCallback mCallback;







        private final IRemoteCallback mCallback;