commit 0e777b61ed5b2b3b385c1ce1e9961d8c2b3e68a7
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 12 10:21:36 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 12 10:21:36 2021 +0000
tree d8c85bf2cb766a65086d37e7e7a3ec23fdfc8864
parent 805727906301ef886a9887806f21bd14ccd0598d
parent c2b6f1dbef0f4f74bdf886fda8520b932ad787d7

Merge "[NS01] Add scoreless methods for non-score users"

common/device/android/net/NetworkFactory.java

diff --git a/common/device/android/net/NetworkFactory.java b/common/device/android/net/NetworkFactory.java
index 55edd29..4ddb0da 100644
--- a/common/device/android/net/NetworkFactory.java
+++ b/common/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();
     }