From 6f99e869ef8fd8bf193a4e5133fb45b7ca56a13e Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Tue, 12 Jan 2021 16:03:22 +0900 Subject: [PATCH] [NS01] Add scoreless methods for non-score users Test: FrameworksNetTests NetworkStackTests Change-Id: I9ebd5cf17ec96b3e7c09ff041d65ee88d0b37cbf --- .../device/android/net/NetworkFactory.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/staticlibs/device/android/net/NetworkFactory.java b/staticlibs/device/android/net/NetworkFactory.java index 55edd293de..4ddb0dac0a 100644 --- a/staticlibs/device/android/net/NetworkFactory.java +++ b/staticlibs/device/android/net/NetworkFactory.java @@ -244,6 +244,12 @@ public class NetworkFactory extends Handler { 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 @@ public class NetworkFactory extends Handler { * * @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 @@ public class NetworkFactory extends Handler { 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(); }