Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I7f20d977667c58a90b3842572c1ed9249e364cd8
Change-Id: Ic6a71239087145e3cb577ba32807a6e036a87688
diff --git a/srcs/android/sysprop/InputProperties.sysprop b/srcs/android/sysprop/InputProperties.sysprop
index ec18e19..47375ad 100644
--- a/srcs/android/sysprop/InputProperties.sysprop
+++ b/srcs/android/sysprop/InputProperties.sysprop
@@ -16,13 +16,12 @@
owner: Platform
# A debug flag that converts all touch pointers to stylus pointers.
-# Requires a reboot to take effect.
prop {
api_name: "simulate_stylus_with_touch"
type: Boolean
scope: Internal
access: Readonly
- prop_name: "persist.debug.input.simulate_stylus_with_touch"
+ prop_name: "debug.input.simulate_stylus_with_touch"
}
# A flag to enable the new touchpad input mapper introduced in Android U, based around the ChromeOS
diff --git a/srcs/android/sysprop/WidevineProperties.sysprop b/srcs/android/sysprop/WidevineProperties.sysprop
new file mode 100644
index 0000000..b3eb7b8
--- /dev/null
+++ b/srcs/android/sysprop/WidevineProperties.sysprop
@@ -0,0 +1,24 @@
+# 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.
+
+owner: Platform
+module: "android.sysprop.WidevineProperties"
+
+prop {
+ api_name: "forcel3_enabled"
+ type: Boolean
+ scope: Public
+ access: ReadWrite
+ prop_name: "persist.drm.forcel3.enabled"
+}
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index 70eef1a..6d62302 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -496,6 +496,14 @@
}
}
props {
+ module: "android.sysprop.WidevineProperties"
+ prop {
+ api_name: "forcel3_enabled"
+ access: ReadWrite
+ prop_name: "persist.drm.forcel3.enabled"
+ }
+}
+props {
module: "android.sysprop.WifiProperties"
prop {
api_name: "start_supplicant"
