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

Resolve hidden connectivity dependency

Browse Source 
ConnectivityManager and NetwokUtils are parts of incoming
Connectivity mainline module. The hidden methods or members are
no longer accessible outside the module. Caller should either
remove or replace the usage.

The override hidden callbacks and INET_CONDITION_ACTION intent
are not really used in the code. Remove the unncessary usage.

The network id is a part of Network.toString(). The network id
is also not necessary.

Bug: 182859030
Test: m
Change-Id: I3a75afb86f5b60ea530b50771bd76887ccf9f271
This commit is contained in:
Chiachang Wang
2021-04-09 13:24:19 +08:00
parent 9382b216df
commit 03a2b4336b
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/Development/src/com/android/development/Connectivity.java
View File

@@ -33,7 +33,6 @@ import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import android.net.NetworkUtils;
import android.net.RouteInfo;
import android.net.wifi.ScanResult;
import android.net.wifi.WifiManager;
@@ -85,7 +84,6 @@ import java.util.List;
import java.util.Random;
import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
import static android.net.ConnectivityManager.INET_CONDITION_ACTION;
import static android.net.NetworkCapabilities.*;
public class Connectivity extends Activity {
@@ -280,28 +278,24 @@ public class Connectivity extends Activity {
private static class DevToolsNetworkCallback extends NetworkCallback {
private static final String TAG = "DevToolsNetworkCallback";
public void onPreCheck(Network network) {
Log.d(TAG, "onPreCheck: " + network.netId);
}
public void onAvailable(Network network) {
Log.d(TAG, "onAvailable: " + network.netId);
Log.d(TAG, "onAvailable: " + network);
}
public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
Log.d(TAG, "onCapabilitiesChanged: " + network.netId + " " + nc.toString());
Log.d(TAG, "onCapabilitiesChanged: " + network + " " + nc.toString());
}
public void onLinkPropertiesChanged(Network network, LinkProperties lp) {
Log.d(TAG, "onLinkPropertiesChanged: " + network.netId + " " + lp.toString());
Log.d(TAG, "onLinkPropertiesChanged: " + network + " " + lp.toString());
}
public void onLosing(Network network, int maxMsToLive) {
Log.d(TAG, "onLosing: " + network.netId + " " + maxMsToLive);
Log.d(TAG, "onLosing: " + network + " " + maxMsToLive);
}
public void onLost(Network network) {
Log.d(TAG, "onLost: " + network.netId);
Log.d(TAG, "onLost: " + network);
}
}
private DevToolsNetworkCallback mCallback;
@@ -484,7 +478,6 @@ public class Connectivity extends Activity {
IntentFilter broadcastFilter = new IntentFilter();
broadcastFilter.addAction(CONNECTIVITY_ACTION);
broadcastFilter.addAction(CONNECTIVITY_TEST_ALARM);
broadcastFilter.addAction(INET_CONDITION_ACTION);
broadcastFilter.addAction(NETWORK_CONDITIONS_MEASURED);
registerReceiver(mReceiver, broadcastFilter);