Merge "Add Thread resource overlay support" into main
diff --git a/service/ServiceConnectivityResources/res/values/config_thread.xml b/service/ServiceConnectivityResources/res/values/config_thread.xml
new file mode 100644
index 0000000..14b5427
--- /dev/null
+++ b/service/ServiceConnectivityResources/res/values/config_thread.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds for Thread Network. All
+ configuration names should use the "config_thread" prefix.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Whether to use location APIs in the algorithm to determine country code or not.
+ If disabled, will use other sources (telephony, wifi, etc) to determine device location for
+ Thread Network regulatory purposes.
+ -->
+ <bool name="config_thread_location_use_for_country_code_enabled">true</bool>
+
+</resources>
diff --git a/service/ServiceConnectivityResources/res/values/overlayable.xml b/service/ServiceConnectivityResources/res/values/overlayable.xml
index 4c85e8c..1c07599 100644
--- a/service/ServiceConnectivityResources/res/values/overlayable.xml
+++ b/service/ServiceConnectivityResources/res/values/overlayable.xml
@@ -43,6 +43,9 @@
<item type="string" name="config_ethernet_iface_regex"/>
<item type="integer" name="config_validationFailureAfterRoamIgnoreTimeMillis" />
<item type="integer" name="config_netstats_validate_import" />
+
+ <!-- Configuration values for ThreadNetworkService -->
+ <item type="bool" name="config_thread_location_use_for_country_code_enabled" />
</policy>
</overlayable>
</resources>
diff --git a/thread/service/Android.bp b/thread/service/Android.bp
index 92cdedc..b5fee95 100644
--- a/thread/service/Android.bp
+++ b/thread/service/Android.bp
@@ -37,6 +37,7 @@
"framework-connectivity-t-pre-jarjar",
"framework-location.stubs.module_lib",
"service-connectivity-pre-jarjar",
+ "ServiceConnectivityResources",
],
static_libs: [
"modules-utils-shell-command-handler",
diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkCountryCode.java b/thread/service/java/com/android/server/thread/ThreadNetworkCountryCode.java
index b05183c..df2c56e 100644
--- a/thread/service/java/com/android/server/thread/ThreadNetworkCountryCode.java
+++ b/thread/service/java/com/android/server/thread/ThreadNetworkCountryCode.java
@@ -27,7 +27,9 @@
import android.os.Build;
import android.util.Log;
+import com.android.connectivity.resources.R;
import com.android.internal.annotations.VisibleForTesting;
+import com.android.server.connectivity.ConnectivityResources;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -73,6 +75,7 @@
private static final CountryCodeInfo DEFAULT_COUNTRY_CODE_INFO =
new CountryCodeInfo(DEFAULT_COUNTRY_CODE, COUNTRY_CODE_SOURCE_DEFAULT);
+ private final ConnectivityResources mResources;
private final LocationManager mLocationManager;
@Nullable private final Geocoder mGeocoder;
private final ThreadNetworkControllerService mThreadNetworkControllerService;
@@ -123,17 +126,20 @@
}
private boolean isLocationUseForCountryCodeEnabled() {
- // TODO: b/311324956 read the configuration from the overlay configuration.
- return true;
+ return mResources
+ .get()
+ .getBoolean(R.bool.config_thread_location_use_for_country_code_enabled);
}
public ThreadNetworkCountryCode(
LocationManager locationManager,
ThreadNetworkControllerService threadNetworkControllerService,
- @Nullable Geocoder geocoder) {
+ @Nullable Geocoder geocoder,
+ ConnectivityResources resources) {
mLocationManager = locationManager;
mThreadNetworkControllerService = threadNetworkControllerService;
mGeocoder = geocoder;
+ mResources = resources;
}
/** Sets up this country code module to listen to location country code changes. */
diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkService.java b/thread/service/java/com/android/server/thread/ThreadNetworkService.java
index 287bb8a..95c7256 100644
--- a/thread/service/java/com/android/server/thread/ThreadNetworkService.java
+++ b/thread/service/java/com/android/server/thread/ThreadNetworkService.java
@@ -29,6 +29,7 @@
import android.os.ParcelFileDescriptor;
import com.android.server.SystemService;
+import com.android.server.connectivity.ConnectivityResources;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -62,8 +63,10 @@
new ThreadNetworkCountryCode(
mContext.getSystemService(LocationManager.class),
mControllerService,
- Geocoder.isPresent() ? new Geocoder(mContext) : null);
+ Geocoder.isPresent() ? new Geocoder(mContext) : null,
+ new ConnectivityResources(mContext));
mCountryCode.initialize();
+
mShellCommand = new ThreadNetworkShellCommand(mCountryCode);
}
}
diff --git a/thread/tests/unit/Android.bp b/thread/tests/unit/Android.bp
index 74b4a35..c7887bc 100644
--- a/thread/tests/unit/Android.bp
+++ b/thread/tests/unit/Android.bp
@@ -39,12 +39,14 @@
"guava-android-testlib",
"mockito-target-extended-minus-junit4",
"net-tests-utils",
+ "service-connectivity-pre-jarjar",
"service-thread-pre-jarjar",
"truth",
],
libs: [
"android.test.base",
"android.test.runner",
+ "ServiceConnectivityResources",
],
jarjar_rules: ":connectivity-jarjar-rules",
jni_libs: [
diff --git a/thread/tests/unit/src/com/android/server/thread/ThreadNetworkCountryCodeTest.java b/thread/tests/unit/src/com/android/server/thread/ThreadNetworkCountryCodeTest.java
index f51aa0a..a0eff6c 100644
--- a/thread/tests/unit/src/com/android/server/thread/ThreadNetworkCountryCodeTest.java
+++ b/thread/tests/unit/src/com/android/server/thread/ThreadNetworkCountryCodeTest.java
@@ -34,9 +34,11 @@
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import android.content.pm.PackageManager;
+import android.content.res.Resources;
import android.location.Address;
import android.location.Geocoder;
import android.location.Location;
@@ -47,6 +49,9 @@
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
+import com.android.connectivity.resources.R;
+import com.android.server.connectivity.ConnectivityResources;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -71,6 +76,8 @@
@Mock ThreadNetworkControllerService mThreadNetworkControllerService;
@Mock PackageManager mPackageManager;
@Mock Location mLocation;
+ @Mock Resources mResources;
+ @Mock ConnectivityResources mConnectivityResources;
private ThreadNetworkCountryCode mThreadNetworkCountryCode;
private boolean mErrorSetCountryCode;
@@ -83,6 +90,9 @@
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
+ when(mConnectivityResources.get()).thenReturn(mResources);
+ when(mResources.getBoolean(anyInt())).thenReturn(true);
+
when(mLocation.getLatitude()).thenReturn(0.0);
when(mLocation.getLongitude()).thenReturn(0.0);
@@ -105,7 +115,10 @@
mThreadNetworkCountryCode =
new ThreadNetworkCountryCode(
- mLocationManager, mThreadNetworkControllerService, mGeocoder);
+ mLocationManager,
+ mThreadNetworkControllerService,
+ mGeocoder,
+ mConnectivityResources);
}
private static Address newAddress(String countryCode) {
@@ -122,6 +135,17 @@
}
@Test
+ public void initialize_locationUseIsDisabled_locationFunctionIsNotCalled() {
+ when(mResources.getBoolean(R.bool.config_thread_location_use_for_country_code_enabled))
+ .thenReturn(false);
+
+ mThreadNetworkCountryCode.initialize();
+
+ verifyNoMoreInteractions(mGeocoder);
+ verifyNoMoreInteractions(mLocationManager);
+ }
+
+ @Test
public void locationCountryCode_locationChanged_locationCountryCodeIsUsed() {
mThreadNetworkCountryCode.initialize();