Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I7f20d977667c58a90b3842572c1ed9249e364cd8
Change-Id: Ic6a71239087145e3cb577ba32807a6e036a87688
diff --git a/srcs/Android.bp b/srcs/Android.bp
index d155b38..344bc85 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -32,6 +32,7 @@
"com.android.media.swcodec",
"com.android.tethering",
"com.android.virt",
+ "com.android.wifi",
],
cpp: {
min_sdk_version: "S",
diff --git a/srcs/android/sysprop/ThreadNetworkProperties.sysprop b/srcs/android/sysprop/ThreadNetworkProperties.sysprop
new file mode 100644
index 0000000..2b6ea33
--- /dev/null
+++ b/srcs/android/sysprop/ThreadNetworkProperties.sysprop
@@ -0,0 +1,24 @@
+# Copyright (C) 2024 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.
+
+owner: Platform
+module: "android.sysprop.ThreadNetworkProperties"
+
+prop {
+ api_name: "country_code"
+ type: String
+ prop_name: "threadnetwork.country_code"
+ scope: Public
+ access: Readonly
+}
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index b74f637..6d62302 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -475,6 +475,14 @@
}
}
props {
+ module: "android.sysprop.ThreadNetworkProperties"
+ prop {
+ api_name: "country_code"
+ type: String
+ prop_name: "threadnetwork.country_code"
+ }
+}
+props {
module: "android.sysprop.VndkProperties"
prop {
api_name: "product_vndk_version"
