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

Commit 951e95a7 authored by Jeremy Joslin's avatar Jeremy Joslin Committed by Joe LaPenna
Browse files

Deprecate the recommendation request code. 

All deprecated code in this CL intended to be removed before the
API freeze.

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Bug: 37357264
Change-Id: Id7eade4ede0fbe0961de140fcf7109e30d6e32c2
parent 4b0d2bf7

api/system-current.txt

+7 −7
Original line number Diff line number Diff line
@@ -27977,13 +27977,13 @@ package android.net { 
    ctor public deprecated NetworkRecommendationProvider(android.os.Handler);

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

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

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

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

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

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

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

    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 class NetworkRecommendationProvider.ResultCallback {













  public static deprecated class NetworkRecommendationProvider.ResultCallback {















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















  }
























@@ -28050,7 +28050,7 @@ package android.net {













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















  }



























  public final class RecommendationRequest implements android.os.Parcelable {













  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();









@@ -28065,7 +28065,7 @@ package android.net {













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















  }



























  public static final class RecommendationRequest.Builder {













  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[]);









@@ -28075,7 +28075,7 @@ package android.net {













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















  }



























  public final class RecommendationResult implements android.os.Parcelable {













  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();

























core/java/android/net/NetworkRecommendationProvider.java



+13
−4




























Original line number
Diff line number
Diff line








@@ -39,10 +39,14 @@ import java.util.concurrent.atomic.AtomicBoolean;













public abstract class NetworkRecommendationProvider {















    private static final String TAG = "NetworkRecProvider";















    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.













     */















    public static final String 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.













     */















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















    private final IBinder mService;


























@@ -77,9 +81,12 @@ public abstract class NetworkRecommendationProvider {













     * @param callback a {@link ResultCallback} instance. When a {@link RecommendationResult} is















     *                 available it must be passed into















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













     * @deprecated to be removed.















     */













    public abstract void onRequestRecommendation(RecommendationRequest request,













            ResultCallback callback);













    public void onRequestRecommendation(RecommendationRequest request,













            ResultCallback callback) {













        callback.onResult(RecommendationResult.createDoNotConnectRecommendation());













    }































    /**















     * Invoked when network scores have been requested.









@@ -101,6 +108,8 @@ public abstract class NetworkRecommendationProvider {













    /**















     * A callback implementing applications should invoke when a {@link RecommendationResult}















     * is available.













     *













     * @deprecated to be removed.















     */















    public static class ResultCallback {















        private final IRemoteCallback mCallback;

































core/java/android/net/RecommendationRequest.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -30,6 +30,7 @@ import com.android.internal.annotations.VisibleForTesting;













 *















 * @see {@link NetworkScoreManager#requestRecommendation(RecommendationRequest)}.















 * @hide













 * @deprecated to be removed.















 */















@SystemApi















public final class RecommendationRequest implements Parcelable {









@@ -43,6 +44,7 @@ public final class RecommendationRequest implements Parcelable {













    /**















     * Builder class for constructing {@link RecommendationRequest} instances.















     * @hide













     * @deprecated to be removed.















     */















    @SystemApi















    public static final class Builder {

































core/java/android/net/RecommendationResult.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -31,6 +31,7 @@ import com.android.internal.util.Preconditions;













 *















 * @see {@link NetworkScoreManager#requestRecommendation(RecommendationRequest)}.















 * @hide













 * @deprecated to be removed.















 */















@SystemApi















public final class RecommendationResult implements Parcelable {