Merge "[NS01] Add scoreless methods for non-score users" am: 0e777b61ed am: 1e5d1fdf30
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1547378
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I840d5cc782123964159b005a6a1576b76a80a8df
diff --git a/staticlibs/device/android/net/NetworkFactory.java b/staticlibs/device/android/net/NetworkFactory.java
index 55edd29..4ddb0da 100644
--- a/staticlibs/device/android/net/NetworkFactory.java
+++ b/staticlibs/device/android/net/NetworkFactory.java
@@ -244,6 +244,12 @@
evalRequests();
}
+ /** @deprecated None of the implementors use the score, remove this method */
+ @Deprecated
+ public boolean acceptRequest(NetworkRequest request, int score) {
+ return true;
+ }
+
/**
* Overridable function to provide complex filtering.
* Called for every request every time a new NetworkRequest is seen
@@ -263,7 +269,7 @@
*
* @return {@code true} to accept the request.
*/
- public boolean acceptRequest(NetworkRequest request, int score) {
+ public boolean acceptRequest(NetworkRequest request) {
return true;
}
@@ -357,11 +363,17 @@
protected void startNetwork() { }
protected void stopNetwork() { }
- // override to do fancier stuff
+ /** @deprecated none of the implementors use the score : migrate them */
+ @Deprecated
protected void needNetworkFor(NetworkRequest networkRequest, int score) {
if (++mRefCount == 1) startNetwork();
}
+ // override to do fancier stuff
+ protected void needNetworkFor(NetworkRequest networkRequest) {
+ needNetworkFor(networkRequest, 0);
+ }
+
protected void releaseNetworkFor(NetworkRequest networkRequest) {
if (--mRefCount == 0) stopNetwork();
}