joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Move some utility methods to MdnsUtils

Browse source 
Bug: 265787401
Test: atest FrameworksNetTests
(cherry picked from https://android-review.googlesource.com/q/commit:5fffb2d96022eab667f822c06c7acf7ee2d24b83)
Merged-In: I92ba54809c2b291fd1f176fbda80a347f5944288
Change-Id: I92ba54809c2b291fd1f176fbda80a347f5944288
This commit is contained in:
Paul Hu 2023-04-26 08:11:54 +00:00 • committed by Cherrypicker Worker
commit 64732f379f
7 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service-t/src/com/android/server/connectivity/mdns/MdnsDiscoveryManager.java
View file

@ -16,7 +16,7 @@
package com.android.server.connectivity.mdns;
import static com.android.server.connectivity.mdns.MdnsSocketProvider.isNetworkMatched;
import static com.android.server.connectivity.mdns.util.MdnsUtils.isNetworkMatched;
import android.Manifest.permission;
import android.annotation.NonNull;

4
service-t/src/com/android/server/connectivity/mdns/MdnsMultinetworkSocketClient.java
View file

@ -16,8 +16,8 @@
package com.android.server.connectivity.mdns;
import static com.android.server.connectivity.mdns.MdnsSocketProvider.ensureRunningOnHandlerThread;
import static com.android.server.connectivity.mdns.MdnsSocketProvider.isNetworkMatched;
import static com.android.server.connectivity.mdns.util.MdnsUtils.ensureRunningOnHandlerThread;
import static com.android.server.connectivity.mdns.util.MdnsUtils.isNetworkMatched;
import android.annotation.NonNull;
import android.annotation.Nullable;

2
service-t/src/com/android/server/connectivity/mdns/MdnsReplySender.java
View file

@ -16,7 +16,7 @@
package com.android.server.connectivity.mdns;
import static com.android.server.connectivity.mdns.MdnsSocketProvider.ensureRunningOnHandlerThread;
import static com.android.server.connectivity.mdns.util.MdnsUtils.ensureRunningOnHandlerThread;
import android.annotation.NonNull;
import android.os.Handler;

2
service-t/src/com/android/server/connectivity/mdns/MdnsServiceCache.java
View file

@ -16,7 +16,7 @@
package com.android.server.connectivity.mdns;
import static com.android.server.connectivity.mdns.MdnsSocketProvider.ensureRunningOnHandlerThread;
import static com.android.server.connectivity.mdns.util.MdnsUtils.ensureRunningOnHandlerThread;
import static com.android.server.connectivity.mdns.util.MdnsUtils.equalsIgnoreDnsCase;
import static com.android.server.connectivity.mdns.util.MdnsUtils.toDnsLowerCase;

17
service-t/src/com/android/server/connectivity/mdns/MdnsSocketProvider.java
View file

@ -20,6 +20,9 @@ import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static com.android.server.connectivity.mdns.util.MdnsUtils.ensureRunningOnHandlerThread;
import static com.android.server.connectivity.mdns.util.MdnsUtils.isNetworkMatched;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context;
@ -242,14 +245,6 @@ public class MdnsSocketProvider {
}
}
/*** Ensure that current running thread is same as given handler thread */
public static void ensureRunningOnHandlerThread(Handler handler) {
if (handler.getLooper().getThread() != Thread.currentThread()) {
throw new IllegalStateException(
"Not running on Handler thread: " + Thread.currentThread().getName());
}
}
/*** Start monitoring sockets by listening callbacks for sockets creation or removal */
public void startMonitoringSockets() {
ensureRunningOnHandlerThread(mHandler);
@ -317,12 +312,6 @@ public class MdnsSocketProvider {
maybeStopMonitoringSockets();
}
/*** Check whether the target network is matched current network */
public static boolean isNetworkMatched(@Nullable Network targetNetwork,
@Nullable Network currentNetwork) {
return targetNetwork == null || targetNetwork.equals(currentNetwork);
}
private boolean matchRequestedNetwork(Network network) {
return hasAllNetworksRequest()
|| mCallbacksToRequestedNetworks.containsValue(network);

2
service-t/src/com/android/server/connectivity/mdns/MulticastPacketReader.java
View file

@ -16,7 +16,7 @@
package com.android.server.connectivity.mdns;
import static com.android.server.connectivity.mdns.MdnsSocketProvider.ensureRunningOnHandlerThread;
import static com.android.server.connectivity.mdns.util.MdnsUtils.ensureRunningOnHandlerThread;
import android.annotation.NonNull;
import android.os.Handler;

17
service-t/src/com/android/server/connectivity/mdns/util/MdnsUtils.java
View file

@ -17,6 +17,9 @@
package com.android.server.connectivity.mdns.util;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.net.Network;
import android.os.Handler;
/**
* Mdns utility functions.
@ -56,4 +59,18 @@ public class MdnsUtils {
private static char toDnsLowerCase(char a) {
return a >= 'A' && a <= 'Z' ? (char) (a + ('a' - 'A')) : a;
}
/*** Ensure that current running thread is same as given handler thread */
public static void ensureRunningOnHandlerThread(@NonNull Handler handler) {
if (handler.getLooper().getThread() != Thread.currentThread()) {
throw new IllegalStateException(
"Not running on Handler thread: " + Thread.currentThread().getName());
}
}
/*** Check whether the target network is matched current network */
public static boolean isNetworkMatched(@Nullable Network targetNetwork,
@Nullable Network currentNetwork) {
return targetNetwork == null || targetNetwork.equals(currentNetwork);
}
}