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

Merge cherrypicks of [12257241, 12257478, 12257643, 12257707, 12257297, 12257742, 12257668, 12257743, 12257513, 12257278, 12257279, 12257514, 12257644, 12257669, 12257670, 12257671] into rvc-release

Browse Source 
Change-Id: I3669363c1b98ac139f341e0bd898cbbff15cb061
This commit is contained in:
android-build-team Robot
2020-07-29 04:05:49 +00:00
parent 71d4b636fc 1c9c0c1514
commit 0fd54d2324
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/NetworkAgent.java
View File

@@ -354,8 +354,7 @@ public abstract class NetworkAgent {
private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) { private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) {
// The subtype can be changed with (TODO) setLegacySubtype, but it starts // The subtype can be changed with (TODO) setLegacySubtype, but it starts
// with the type and an empty description. // with the type and an empty description.
final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacyType, final NetworkInfo ni = new NetworkInfo(config.legacyType, 0, config.legacyTypeName, "");
config.legacyTypeName, "");
ni.setIsAvailable(true); ni.setIsAvailable(true);
ni.setExtraInfo(config.getLegacyExtraInfo()); ni.setExtraInfo(config.getLegacyExtraInfo());
return ni; return ni;