diff options
Diffstat (limited to 'core/java/android')
4 files changed, 1 insertions, 75 deletions
diff --git a/core/java/android/net/INetworkRecommendationProvider.aidl b/core/java/android/net/INetworkRecommendationProvider.aidl index 052c92c0309f..cde0185d2288 100644 --- a/core/java/android/net/INetworkRecommendationProvider.aidl +++ b/core/java/android/net/INetworkRecommendationProvider.aidl @@ -17,8 +17,6 @@ package android.net; import android.net.NetworkKey; -import android.net.RecommendationRequest; -import android.os.IRemoteCallback; /** * The service responsible for answering network recommendation requests. @@ -27,20 +25,6 @@ import android.os.IRemoteCallback; oneway interface INetworkRecommendationProvider { /** - * Request a recommendation for the best network to connect to - * taking into account the inputs from the {@link RecommendationRequest}. - * - * @param request a {@link RecommendationRequest} instance containing the details of the request - * @param callback a {@link IRemoteCallback} instance to invoke when the recommendation - * is available - * @param sequence an internal number used for tracking the request - * @hide - */ - void requestRecommendation(in RecommendationRequest request, - in IRemoteCallback callback, - int sequence); - - /** * Request scoring for networks. * * Implementations should use {@link NetworkScoreManager#updateScores(ScoredNetwork[])} to diff --git a/core/java/android/net/NetworkRecommendationProvider.java b/core/java/android/net/NetworkRecommendationProvider.java index a96a39d9176c..1eaa1f90d64c 100644 --- a/core/java/android/net/NetworkRecommendationProvider.java +++ b/core/java/android/net/NetworkRecommendationProvider.java @@ -83,10 +83,7 @@ public abstract class NetworkRecommendationProvider { * {@link ResultCallback#onResult(RecommendationResult)}. * @deprecated to be removed. */ - public void onRequestRecommendation(RecommendationRequest request, - ResultCallback callback) { - callback.onResult(RecommendationResult.createDoNotConnectRecommendation()); - } + public void onRequestRecommendation(RecommendationRequest request, ResultCallback callback) {} /** * Invoked when network scores have been requested. @@ -185,23 +182,6 @@ public abstract class NetworkRecommendationProvider { } @Override - public void requestRecommendation(final RecommendationRequest request, - final IRemoteCallback callback, final int sequence) throws RemoteException { - enforceCallingPermission(); - if (VERBOSE) Log.v(TAG, "requestRecommendation(seq=" + sequence + ")"); - execute(new Runnable() { - @Override - public void run() { - if (VERBOSE) { - Log.v(TAG, "requestRecommendation(seq=" + sequence + ") running..."); - } - ResultCallback resultCallback = new ResultCallback(callback, sequence); - onRequestRecommendation(request, resultCallback); - } - }); - } - - @Override public void requestScores(final NetworkKey[] networks) throws RemoteException { enforceCallingPermission(); if (networks != null && networks.length > 0) { diff --git a/core/java/android/net/RecommendationRequest.aidl b/core/java/android/net/RecommendationRequest.aidl deleted file mode 100644 index 76497b8a2270..000000000000 --- a/core/java/android/net/RecommendationRequest.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) 2016, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net; - -parcelable RecommendationRequest; diff --git a/core/java/android/net/RecommendationResult.aidl b/core/java/android/net/RecommendationResult.aidl deleted file mode 100644 index f36995b8cc68..000000000000 --- a/core/java/android/net/RecommendationResult.aidl +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) 2016, The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.net; - -parcelable RecommendationResult; |