LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove usage of Context.NETWORK_STACK_SERVICE

Browse Source 
The NetworkStack.getService() API should be used instead.

Bug: 151243982
Test: atest FrameworksNetTests TetheringTests
      Manual tethering test
Change-Id: I7855090bffbe895c8349ad4903b8f2eb55515f0b
This commit is contained in:
Remi NGUYEN VAN
2020-03-18 18:31:39 +09:00
parent ab74d2b865
commit b8fecf4b32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tethering/src/com/android/server/connectivity/tethering/TetheringService.java
View File

@@ -33,6 +33,7 @@ import android.net.ITetheringConnector;
import android.net.ITetheringEventCallback; import android.net.ITetheringEventCallback;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkStack;
import android.net.TetheringRequestParcel; import android.net.TetheringRequestParcel;
import android.net.dhcp.DhcpServerCallbacks; import android.net.dhcp.DhcpServerCallbacks;
import android.net.dhcp.DhcpServingParamsParcel; import android.net.dhcp.DhcpServingParamsParcel;
@@ -364,8 +365,7 @@ public class TetheringService extends Service {
IBinder connector; IBinder connector;
try { try {
final long before = System.currentTimeMillis(); final long before = System.currentTimeMillis();
while ((connector = (IBinder) mContext.getSystemService( while ((connector = NetworkStack.getService()) == null) {
Context.NETWORK_STACK_SERVICE)) == null) {
if (System.currentTimeMillis() - before > NETWORKSTACK_TIMEOUT_MS) { if (System.currentTimeMillis() - before > NETWORKSTACK_TIMEOUT_MS) {
Log.wtf(TAG, "Timeout, fail to get INetworkStackConnector"); Log.wtf(TAG, "Timeout, fail to get INetworkStackConnector");
return null; return null;