Snap for 8426163 from 353e2d7a7edcf7a708369a4e8b60009c6e0fe25d to mainline-tzdata2-release

Change-Id: I928dc029485616cc6735ac96789323deea774ef2
diff --git a/srcs/Android.bp b/srcs/Android.bp
index 22e681d..37bb396 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -13,10 +13,6 @@
 // limitations under the License.
 //
 
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 sysprop_library {
     name: "PlatformProperties",
     srcs: ["**/*.sysprop"],
@@ -25,11 +21,7 @@
 
     apex_available: [
         "//apex_available:platform",
-        "com.android.art",
+        "com.android.art.release",
         "com.android.art.debug",
-        "com.android.tethering",
     ],
-    cpp: {
-        min_sdk_version: "S",
-    },
 }
diff --git a/srcs/android/sysprop/CarProperties.sysprop b/srcs/android/sysprop/CarProperties.sysprop
index a1e298c..8fe0d82 100644
--- a/srcs/android/sysprop/CarProperties.sysprop
+++ b/srcs/android/sysprop/CarProperties.sysprop
@@ -51,6 +51,15 @@
     prop_name: "android.car.number_pre_created_guests"
 }
 
+# Whether the Vehicle HAL should be used for user management tasks.
+prop {
+    api_name: "user_hal_enabled"
+    type: Boolean
+    scope: Internal
+    access: ReadWrite
+    prop_name: "android.car.user_hal_enabled"
+}
+
 # Timeout (in ms) waiting for Vehicle HAL responses for user management requests.
 prop {
     api_name: "user_hal_timeout"
@@ -59,12 +68,3 @@
     access: ReadWrite
     prop_name: "android.car.user_hal_timeout"
 }
-
-# Timeout (in ms) waiting for Device Policy Manager responses for user management requests.
-prop {
-    api_name: "device_policy_manager_timeout"
-    type: Integer
-    scope: Internal
-    access: ReadWrite
-    prop_name: "android.car.device_policy_manager_timeout"
-}
diff --git a/srcs/android/sysprop/DeviceProperties.sysprop b/srcs/android/sysprop/DeviceProperties.sysprop
deleted file mode 100644
index 820e481..0000000
--- a/srcs/android/sysprop/DeviceProperties.sysprop
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2021 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.
-
-module: "android.sysprop.DeviceProperties"
-owner: Odm
-
-# The media performance class of the device.
-prop {
-    api_name: "media_performance_class"
-    type: Integer
-    scope: Public
-    access: Readonly
-    prop_name: "ro.odm.build.media_performance_class"
-}
diff --git a/srcs/android/sysprop/DisplayProperties.sysprop b/srcs/android/sysprop/DisplayProperties.sysprop
index 67498e2..bc54bd4 100644
--- a/srcs/android/sysprop/DisplayProperties.sysprop
+++ b/srcs/android/sysprop/DisplayProperties.sysprop
@@ -47,13 +47,4 @@
     scope: Internal
     access: ReadWrite
     prop_name: "debug.layout"
-}
-
-# When set to true, apps frame rate can be overridden with a non natively-supported refresh rate
-prop {
-    api_name: "debug_allow_non_native_refresh_rate_override"
-    type: Boolean
-    scope: Internal
-    access: Readonly
-    prop_name: "debug.display.allow_non_native_refresh_rate_override"
 }
\ No newline at end of file
diff --git a/srcs/android/sysprop/HdmiProperties.sysprop b/srcs/android/sysprop/HdmiProperties.sysprop
index 1d57d06..e78977e 100644
--- a/srcs/android/sysprop/HdmiProperties.sysprop
+++ b/srcs/android/sysprop/HdmiProperties.sysprop
@@ -23,69 +23,13 @@
     scope: Internal
     access: Readonly
     prop_name: "ro.hdmi.device_type"
-    deprecated: true
-}
-
-# The HDMI CEC device types supported by this device
-# See HDMI CEC 1.4b Supplement 1 CEC Table 29 Operand Descriptions.
-prop {
-    api_name: "cec_device_types"
-    type: EnumList
-    scope: Internal
-    access: Readonly
-    prop_name: "ro.hdmi.cec_device_types"
-    enum_values: "tv|recording_device|reserved|tuner|playback_device|audio_system|pure_cec_switch|video_processor"
 }
 
 # Set this to true to enable 'Set Menu Language' CEC feature.
 prop {
-    api_name: "set_menu_language_enabled"
+    api_name: "set_menu_language"
     type: Boolean
     scope: Internal
     access: Readonly
     prop_name: "ro.hdmi.set_menu_language"
-}
-
-# When ARC is initiated, this port will be used to turn on ARC.
-prop {
-    api_name: "arc_port"
-    type: String
-    scope: Internal
-    access: Readonly
-    prop_name: "ro.hdmi.property_sytem_audio_device_arc_port"
-}
-
-# True means CEC audio device should forward volume keys when system audio mode is off.
-# Default is false.
-prop {
-    api_name: "forward_volume_keys_when_system_audio_mode_off"
-    type: Boolean
-    scope: Internal
-    access: Readonly
-    prop_name: "ro.hdmi.cec_audio_device_forward_volume_keys_system_audio_mode_off"
-}
-
-# True means the current device is a cec switch device.
-# Default is false.
-prop {
-    api_name: "is_switch"
-    type: Boolean
-    scope: Internal
-    access: Readonly
-    prop_name: "ro.hdmi.property_is_device_hdmi_cec_switch"
-}
-
-# Determines playback device action upon receiving routing control messages.
-# <ul>
-# <li><b>none</b> No action taken.
-# <li><b>wake_up_only</b> PowerManager.wakeUp() is called.
-# <li><b>wake_up_and_send_active_source</b> Same as above and additionally <Active Source> is sent.
-# </ul>
-prop {
-    api_name: "playback_device_action_on_routing_control"
-    type: Enum
-    scope: Internal
-    access: Readonly
-    enum_values: "none|wake_up_only|wake_up_and_send_active_source"
-    prop_name: "ro.hdmi.cec.source.playback_device_action_on_routing_control"
-}
+}
\ No newline at end of file
diff --git a/srcs/android/sysprop/MediaProperties.sysprop b/srcs/android/sysprop/MediaProperties.sysprop
index 5f72e0c..df8b6b1 100644
--- a/srcs/android/sysprop/MediaProperties.sysprop
+++ b/srcs/android/sysprop/MediaProperties.sysprop
@@ -35,10 +35,4 @@
     scope: Public
     prop_name: "ro.com.android.media.swcodec.ion.flags"
 }
-prop {
-    api_name: "codec2_dmabuf_padding"
-    type: Integer
-    access: Readonly
-    scope: Public
-    prop_name: "media.c2.dmabuf.padding"
-}
+
diff --git a/srcs/android/sysprop/NetworkProperties.sysprop b/srcs/android/sysprop/NetworkProperties.sysprop
deleted file mode 100644
index 84c0f14..0000000
--- a/srcs/android/sysprop/NetworkProperties.sysprop
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2020 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.
-
-module: "android.sysprop.NetworkProperties"
-owner: Platform
-
-prop {
-    api_name: "tcp_init_rwnd"
-    type: Integer
-    scope: Public
-    access: ReadWrite
-    prop_name: "net.tcp_def_init_rwnd"
-}
-
-prop {
-    api_name: "isCellular464XlatEnabled"
-    type: Boolean
-    scope: Public
-    access: Readonly
-    prop_name: "net.464xlat.cellular.enabled"
-}
diff --git a/srcs/android/sysprop/OtaProperties.sysprop b/srcs/android/sysprop/OtaProperties.sysprop
index e529df7..a645237 100644
--- a/srcs/android/sysprop/OtaProperties.sysprop
+++ b/srcs/android/sysprop/OtaProperties.sysprop
@@ -22,42 +22,3 @@
     prop_name: "ota.warm_reset"
     integer_as_bool : true
 }
-
-prop {
-    api_name: "ab_ota_partitions"
-    type: String
-    scope: Public
-    access: Readonly
-    prop_name: "ro.product.ab_ota_partitions"
-}
-
-prop {
-    api_name: "virtual_ab_enabled"
-    type: Boolean
-    scope: Public
-    access: Readonly
-    prop_name: "ro.virtual_ab.enabled",
-}
-
-prop {
-    api_name: "virtual_ab_retrofit"
-    type: Boolean
-    scope: Public
-    access: Readonly
-    prop_name: "ro.virtual_ab.retrofit",
-}
-
-# The VBMeta digest is a digest over all VBMeta structs, usually a SHA256
-# digest. Details in
-# https://android.googlesource.com/platform/external/avb/+/master/README.md#The-VBMeta-Digest
-#
-# Update_engine sets the vbmeta digest for the inactive slot, after installing
-# ota updates to the b partition of a/b devices.
-prop {
-    api_name: "other_vbmeta_digest"
-    type: String
-    scope: Internal
-    access: ReadWrite
-    prop_name: "ota.other.vbmeta_digest",
-}
-
diff --git a/srcs/android/sysprop/PowerProperties.sysprop b/srcs/android/sysprop/PowerProperties.sysprop
index a1d5636..58d99f6 100644
--- a/srcs/android/sysprop/PowerProperties.sysprop
+++ b/srcs/android/sysprop/PowerProperties.sysprop
@@ -24,13 +24,3 @@
     access: Readonly
     prop_name: "ro.power.fixed_performance_scale_factor"
 }
-
-# Suspends charge input into the battery. When this property is set,
-# the device will drain battery even when connected to a power source.
-prop {
-    api_name: "battery_input_suspended"
-    type: Boolean
-    scope: Internal
-    access: ReadWrite
-    prop_name: "power.battery_input.suspended"
-}
diff --git a/srcs/android/sysprop/SocProperties.sysprop b/srcs/android/sysprop/SocProperties.sysprop
deleted file mode 100644
index 58eedcb..0000000
--- a/srcs/android/sysprop/SocProperties.sysprop
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (C) 2021 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.
-
-module: "android.sysprop.SocProperties"
-owner: Platform
-
-# The manufacturer of the device's primary system-on-chip.
-prop {
-    api_name: "soc_manufacturer"
-    type: String
-    scope: Public
-    access: Readonly
-    prop_name: "ro.soc.manufacturer"
-}
-
-# The model name of the device's primary system-on-chip.
-prop {
-    api_name: "soc_model"
-    type: String
-    scope: Public
-    access: Readonly
-    prop_name: "ro.soc.model"
-}
diff --git a/srcs/android/sysprop/TraceProperties.sysprop b/srcs/android/sysprop/TraceProperties.sysprop
index 1ace6d3..925bdff 100644
--- a/srcs/android/sysprop/TraceProperties.sysprop
+++ b/srcs/android/sysprop/TraceProperties.sysprop
@@ -23,3 +23,12 @@
     prop_name: "debug.atrace.user_initiated"
     integer_as_bool : true
 }
+
+prop {
+    api_name: "enable"
+    type: Boolean
+    scope: Internal
+    access: ReadWrite
+    prop_name: "persist.traced.enable"
+    integer_as_bool : true
+}
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
index 002e98b..4266ba0 100644
--- a/srcs/api/PlatformProperties-current.txt
+++ b/srcs/api/PlatformProperties-current.txt
@@ -1,4 +1,13 @@
 props {
+  module: "android.sysprop.AdbProperties"
+  prop {
+    api_name: "secure"
+    access: Writeonce
+    scope: Internal
+    prop_name: "ro.adb.secure"
+  }
+}
+props {
   module: "android.sysprop.ApkVerityProperties"
   prop {
     api_name: "apk_verity_mode"
@@ -8,22 +17,141 @@
   }
 }
 props {
-  owner: Odm
-  module: "android.sysprop.DeviceProperties"
+  module: "android.sysprop.CarProperties"
   prop {
-    api_name: "media_performance_class"
+    api_name: "boot_user_override_id"
     type: Integer
-    prop_name: "ro.odm.build.media_performance_class"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "android.car.systemuser.bootuseroverrideid"
+  }
+  prop {
+    api_name: "number_pre_created_guests"
+    type: Integer
+    access: ReadWrite
+    scope: Internal
+    prop_name: "android.car.number_pre_created_guests"
+  }
+  prop {
+    api_name: "number_pre_created_users"
+    type: Integer
+    access: ReadWrite
+    scope: Internal
+    prop_name: "android.car.number_pre_created_users"
+  }
+  prop {
+    api_name: "trusted_device_device_name_prefix"
+    type: String
+    scope: Internal
+    prop_name: "ro.android.car.trusteddevice.device_name_prefix"
+  }
+  prop {
+    api_name: "user_hal_enabled"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "android.car.user_hal_enabled"
+  }
+  prop {
+    api_name: "user_hal_timeout"
+    type: Integer
+    access: ReadWrite
+    scope: Internal
+    prop_name: "android.car.user_hal_timeout"
+  }
+}
+props {
+  module: "android.sysprop.ContactsProperties"
+  prop {
+    api_name: "aggregate_contacts"
+    scope: Internal
+    prop_name: "sync.contacts.aggregate"
+  }
+  prop {
+    api_name: "debug_scan_all_packages"
+    scope: Internal
+    prop_name: "debug.cp2.scan_all_packages"
+  }
+  prop {
+    api_name: "display_photo_size"
+    type: Integer
+    scope: Internal
+    prop_name: "contacts.display_photo_size"
+  }
+  prop {
+    api_name: "keep_stale_account_data"
+    scope: Internal
+    prop_name: "debug.contacts.ksad"
+  }
+  prop {
+    api_name: "thumbnail_size"
+    type: Integer
+    scope: Internal
+    prop_name: "contacts.thumbnail_size"
+  }
+}
+props {
+  module: "android.sysprop.CryptoProperties"
+  prop {
+    api_name: "state"
+    type: Enum
+    scope: Internal
+    prop_name: "ro.crypto.state"
+    enum_values: "encrypted|unencrypted|unsupported"
+  }
+  prop {
+    api_name: "type"
+    type: Enum
+    access: Writeonce
+    scope: Internal
+    prop_name: "ro.crypto.type"
+    enum_values: "block|file|none"
+  }
+}
+props {
+  module: "android.sysprop.DisplayProperties"
+  prop {
+    api_name: "debug_force_msaa"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "debug.egl.force_msaa"
+  }
+  prop {
+    api_name: "debug_force_rtl"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "debug.force_rtl"
+  }
+  prop {
+    api_name: "debug_layout"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "debug.layout"
+  }
+  prop {
+    api_name: "debug_opengl_trace"
+    type: String
+    access: ReadWrite
+    scope: Internal
+    prop_name: "debug.egl.trace"
+  }
+}
+props {
+  module: "android.sysprop.HdmiProperties"
+  prop {
+    api_name: "device_type"
+    type: IntegerList
+    scope: Internal
+    prop_name: "ro.hdmi.device_type"
+  }
+  prop {
+    api_name: "set_menu_language"
+    scope: Internal
+    prop_name: "ro.hdmi.set_menu_language"
   }
 }
 props {
   module: "android.sysprop.MediaProperties"
   prop {
-    api_name: "codec2_dmabuf_padding"
-    type: Integer
-    prop_name: "media.c2.dmabuf.padding"
-  }
-  prop {
     api_name: "swcodec_ion_align"
     type: Integer
     prop_name: "ro.com.android.media.swcodec.ion.align"
@@ -40,34 +168,8 @@
   }
 }
 props {
-  module: "android.sysprop.NetworkProperties"
-  prop {
-    api_name: "isCellular464XlatEnabled"
-    prop_name: "net.464xlat.cellular.enabled"
-  }
-  prop {
-    api_name: "tcp_init_rwnd"
-    type: Integer
-    access: ReadWrite
-    prop_name: "net.tcp_def_init_rwnd"
-  }
-}
-props {
   module: "android.sysprop.OtaProperties"
   prop {
-    api_name: "ab_ota_partitions"
-    type: String
-    prop_name: "ro.product.ab_ota_partitions"
-  }
-  prop {
-    api_name: "virtual_ab_enabled"
-    prop_name: "ro.virtual_ab.enabled"
-  }
-  prop {
-    api_name: "virtual_ab_retrofit"
-    prop_name: "ro.virtual_ab.retrofit"
-  }
-  prop {
     api_name: "warm_reset"
     access: ReadWrite
     prop_name: "ota.warm_reset"
@@ -83,26 +185,75 @@
   }
 }
 props {
-  module: "android.sysprop.SocProperties"
+  module: "android.sysprop.SetupWizardProperties"
   prop {
-    api_name: "soc_manufacturer"
-    type: String
-    prop_name: "ro.soc.manufacturer"
+    api_name: "esim_cid_ignore"
+    type: StringList
+    scope: Internal
+    prop_name: "ro.setupwizard.esim_cid_ignore"
   }
   prop {
-    api_name: "soc_model"
+    api_name: "theme"
     type: String
-    prop_name: "ro.soc.model"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "setupwizard.theme"
   }
 }
 props {
   module: "android.sysprop.TelephonyProperties"
   prop {
+    api_name: "airplane_mode_on"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "persist.radio.airplane_mode_on"
+    integer_as_bool: true
+  }
+  prop {
+    api_name: "baseband_version"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.version.baseband"
+  }
+  prop {
     api_name: "call_ring_delay"
     type: Integer
     prop_name: "ro.telephony.call_ring.delay"
   }
   prop {
+    api_name: "cdma_msg_id"
+    type: Integer
+    access: ReadWrite
+    scope: Internal
+    prop_name: "persist.radio.cdma.msgid"
+  }
+  prop {
+    api_name: "current_active_phone"
+    type: IntegerList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.current.phone-type"
+  }
+  prop {
+    api_name: "data_network_type"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.network.type"
+  }
+  prop {
+    api_name: "data_roaming"
+    scope: Internal
+    prop_name: "ro.com.android.dataroaming"
+  }
+  prop {
+    api_name: "default_network"
+    type: IntegerList
+    scope: Internal
+    prop_name: "ro.telephony.default_network"
+  }
+  prop {
     api_name: "disable_call"
     prop_name: "ro.telephony.disable-call"
   }
@@ -112,6 +263,32 @@
     prop_name: "ro.cdma.ecmexittimer"
   }
   prop {
+    api_name: "enable_esim_ui_by_default"
+    scope: Internal
+    prop_name: "esim.enable_esim_system_ui_by_default"
+  }
+  prop {
+    api_name: "icc_operator_alpha"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.sim.operator.alpha"
+  }
+  prop {
+    api_name: "icc_operator_iso_country"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.sim.operator.iso-country"
+  }
+  prop {
+    api_name: "icc_operator_numeric"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.sim.operator.numeric"
+  }
+  prop {
     api_name: "ignore_nitz"
     prop_name: "telephony.test.ignore.nitz"
   }
@@ -121,6 +298,18 @@
     prop_name: "ril.cdma.inecmmode"
   }
   prop {
+    api_name: "lte_on_cdma_device"
+    type: Integer
+    scope: Internal
+    prop_name: "telephony.lteOnCdmaDevice"
+  }
+  prop {
+    api_name: "lte_on_cdma_product_type"
+    type: String
+    scope: Internal
+    prop_name: "telephony.lteOnCdmaProductType"
+  }
+  prop {
     api_name: "max_active_modems"
     type: Integer
     prop_name: "telephony.active_modems.max_count"
@@ -136,22 +325,65 @@
     prop_name: "persist.radio.multisim.config"
   }
   prop {
+    api_name: "operator_alpha"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.operator.alpha"
+  }
+  prop {
     api_name: "operator_idp_string"
     type: String
     access: ReadWrite
     prop_name: "gsm.operator.idpstring"
   }
   prop {
+    api_name: "operator_is_manual"
+    scope: Internal
+    prop_name: "operator.ismanual"
+  }
+  prop {
+    api_name: "operator_is_roaming"
+    type: BooleanList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.operator.isroaming"
+  }
+  prop {
     api_name: "operator_iso_country"
     type: StringList
     access: ReadWrite
     prop_name: "gsm.operator.iso-country"
   }
   prop {
+    api_name: "operator_numeric"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.operator.numeric"
+  }
+  prop {
+    api_name: "otasp_num_schema"
+    type: StringList
+    scope: Internal
+    prop_name: "ro.cdma.otaspnumschema"
+  }
+  prop {
+    api_name: "reboot_on_modem_change"
+    scope: Internal
+    prop_name: "persist.radio.reboot_on_modem_change"
+  }
+  prop {
     api_name: "reset_on_radio_tech_change"
     prop_name: "persist.radio.reset_on_switch"
   }
   prop {
+    api_name: "ril_impl"
+    type: String
+    scope: Internal
+    prop_name: "gsm.version.ril-impl"
+  }
+  prop {
     api_name: "ril_sends_multiple_call_ring"
     prop_name: "ro.telephony.call_ring.multiple"
   }
@@ -161,14 +393,62 @@
     prop_name: "ro.telephony.sim_slots.count"
   }
   prop {
+    api_name: "sim_state"
+    type: StringList
+    access: ReadWrite
+    scope: Internal
+    prop_name: "gsm.sim.state"
+  }
+  prop {
+    api_name: "sms_receive"
+    type: BooleanList
+    scope: Internal
+    prop_name: "telephony.sms.receive"
+  }
+  prop {
+    api_name: "sms_send"
+    type: BooleanList
+    scope: Internal
+    prop_name: "telephony.sms.send"
+  }
+  prop {
     api_name: "test_csim"
     prop_name: "persist.radio.test-csim"
   }
   prop {
+    api_name: "videocall_audio_output"
+    type: Integer
+    scope: Internal
+    prop_name: "persist.radio.call.audio.output"
+  }
+  prop {
     api_name: "wake_lock_timeout"
     type: Integer
     prop_name: "ro.ril.wake_lock_timeout"
   }
+  prop {
+    api_name: "wps_info"
+    type: Integer
+    scope: Internal
+    prop_name: "wifidirect.wps"
+  }
+}
+props {
+  module: "android.sysprop.TraceProperties"
+  prop {
+    api_name: "enable"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "persist.traced.enable"
+    integer_as_bool: true
+  }
+  prop {
+    api_name: "user_initiated"
+    access: ReadWrite
+    scope: Internal
+    prop_name: "debug.atrace.user_initiated"
+    integer_as_bool: true
+  }
 }
 props {
   module: "android.sysprop.VndkProperties"
@@ -184,6 +464,30 @@
   }
 }
 props {
+  module: "android.sysprop.VoldProperties"
+  prop {
+    api_name: "decrypt"
+    type: String
+    access: ReadWrite
+    scope: Internal
+    prop_name: "vold.decrypt"
+  }
+  prop {
+    api_name: "encrypt_progress"
+    type: String
+    access: ReadWrite
+    scope: Internal
+    prop_name: "vold.encrypt_progress"
+  }
+  prop {
+    api_name: "encrypt_time_remaining"
+    type: Integer
+    access: ReadWrite
+    scope: Internal
+    prop_name: "vold.encrypt_time_remaining"
+  }
+}
+props {
   module: "android.sysprop.WifiProperties"
   prop {
     api_name: "start_supplicant"
diff --git a/srcs/api/PlatformProperties-latest.txt b/srcs/api/PlatformProperties-latest.txt
index e33fc1b..5a66f03 100644
--- a/srcs/api/PlatformProperties-latest.txt
+++ b/srcs/api/PlatformProperties-latest.txt
@@ -8,15 +8,6 @@
   }
 }
 props {
-  module: "android.sysprop.ApkVerityProperties"
-  prop {
-    api_name: "apk_verity_mode"
-    type: Integer
-    access: Writeonce
-    prop_name: "ro.apk_verity.mode"
-  }
-}
-props {
   module: "android.sysprop.CarProperties"
   prop {
     api_name: "boot_user_override_id"
@@ -26,32 +17,11 @@
     prop_name: "android.car.systemuser.bootuseroverrideid"
   }
   prop {
-    api_name: "number_pre_created_guests"
-    type: Integer
-    access: ReadWrite
-    scope: Internal
-    prop_name: "android.car.number_pre_created_guests"
-  }
-  prop {
-    api_name: "number_pre_created_users"
-    type: Integer
-    access: ReadWrite
-    scope: Internal
-    prop_name: "android.car.number_pre_created_users"
-  }
-  prop {
     api_name: "trusted_device_device_name_prefix"
     type: String
     scope: Internal
     prop_name: "ro.android.car.trusteddevice.device_name_prefix"
   }
-  prop {
-    api_name: "user_hal_timeout"
-    type: Integer
-    access: ReadWrite
-    scope: Internal
-    prop_name: "android.car.user_hal_timeout"
-  }
 }
 props {
   module: "android.sysprop.ContactsProperties"
@@ -130,113 +100,11 @@
   }
 }
 props {
-  module: "android.sysprop.HdmiProperties"
+  module: "android.sysprop.ProductProperties"
   prop {
-    api_name: "arc_port"
-    type: String
+    api_name: "unbundled_apps"
     scope: Internal
-    prop_name: "ro.hdmi.cec.audio.arc_port.config"
-  }
-  prop {
-    api_name: "cec_device_types"
-    type: EnumList
-    scope: Internal
-    prop_name: "ro.hdmi.cec_device_types"
-    enum_values: "tv|recording_device|reserved|tuner|playback_device|audio_system|pure_cec_switch|video_processor"
-  }
-  prop {
-    api_name: "device_type"
-    type: IntegerList
-    scope: Internal
-    prop_name: "ro.hdmi.device_type"
-    deprecated: true
-  }
-  prop {
-    api_name: "forward_volume_keys_when_system_audio_mode_off"
-    scope: Internal
-    prop_name: "ro.hdmi.cec.audio.forward_volume_keys_when_system_audio_mode_off.enabled"
-  }
-  prop {
-    api_name: "is_switch"
-    scope: Internal
-    prop_name: "ro.hdmi.cec.source.is_switch.enabled."
-  }
-  prop {
-    api_name: "playback_device_action_on_routing_control"
-    type: Enum
-    scope: Internal
-    prop_name: "ro.hdmi.cec.source.playback_device_action_on_routing_control"
-    enum_values: "none|wake_up_only|wake_up_and_send_active_source"
-  }
-  prop {
-    api_name: "power_state_change_on_active_source_lost"
-    type: Enum
-    scope: Internal
-    prop_name: "ro.hdmi.cec.source.power_state_change_on_active_source_lost"
-    enum_values: "none|standby_now"
-  }
-  prop {
-    api_name: "send_standby_on_sleep"
-    type: Enum
-    scope: Internal
-    prop_name: "ro.hdmi.cec.source.send_standby_on_sleep"
-    enum_values: "to_tv|broadcast|none"
-  }
-  prop {
-    api_name: "set_menu_language_enabled"
-    scope: Internal
-    prop_name: "ro.hdmi.cec.source.set_menu_language.enabled"
-  }
-  prop {
-    api_name: "system_audio_mode_muting"
-    scope: Internal
-    prop_name: "ro.hdmi.cec.audio.system_audio_mode_muting.enabled"
-  }
-}
-props {
-  module: "android.sysprop.MediaProperties"
-  prop {
-    api_name: "swcodec_ion_align"
-    type: Integer
-    prop_name: "ro.com.android.media.swcodec.ion.align"
-  }
-  prop {
-    api_name: "swcodec_ion_flags"
-    type: Integer
-    prop_name: "ro.com.android.media.swcodec.ion.flags"
-  }
-  prop {
-    api_name: "swcodec_ion_heapmask"
-    type: Integer
-    prop_name: "ro.com.android.media.swcodec.ion.heapmask"
-  }
-}
-props {
-  module: "android.sysprop.OtaProperties"
-  prop {
-    api_name: "ab_ota_partitions"
-    type: String
-    prop_name: "ro.product.ab_ota_partitions"
-  }
-  prop {
-    api_name: "warm_reset"
-    access: ReadWrite
-    prop_name: "ota.warm_reset"
-    integer_as_bool: true
-  }
-}
-props {
-  module: "android.sysprop.PowerProperties"
-  prop {
-    api_name: "battery_input_suspended"
-    access: ReadWrite
-    scope: Internal
-    prop_name: "power.battery_input.suspended"
-  }
-  prop {
-    api_name: "fixed_performance_scale_factor"
-    type: Integer
-    prop_name: "ro.power.fixed_performance_scale_factor"
+    prop_name: "ro.product.apps.unbundled"
   }
 }
 props {
@@ -256,239 +124,6 @@
   }
 }
 props {
-  module: "android.sysprop.TelephonyProperties"
-  prop {
-    api_name: "airplane_mode_on"
-    access: ReadWrite
-    scope: Internal
-    prop_name: "persist.radio.airplane_mode_on"
-    integer_as_bool: true
-  }
-  prop {
-    api_name: "baseband_version"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.version.baseband"
-  }
-  prop {
-    api_name: "call_ring_delay"
-    type: Integer
-    prop_name: "ro.telephony.call_ring.delay"
-  }
-  prop {
-    api_name: "cdma_msg_id"
-    type: Integer
-    access: ReadWrite
-    scope: Internal
-    prop_name: "persist.radio.cdma.msgid"
-  }
-  prop {
-    api_name: "current_active_phone"
-    type: IntegerList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.current.phone-type"
-  }
-  prop {
-    api_name: "data_network_type"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.network.type"
-  }
-  prop {
-    api_name: "data_roaming"
-    scope: Internal
-    prop_name: "ro.com.android.dataroaming"
-  }
-  prop {
-    api_name: "default_network"
-    type: IntegerList
-    scope: Internal
-    prop_name: "ro.telephony.default_network"
-  }
-  prop {
-    api_name: "disable_call"
-    prop_name: "ro.telephony.disable-call"
-  }
-  prop {
-    api_name: "ecm_exit_timer"
-    type: Long
-    prop_name: "ro.cdma.ecmexittimer"
-  }
-  prop {
-    api_name: "enable_esim_ui_by_default"
-    scope: Internal
-    prop_name: "esim.enable_esim_system_ui_by_default"
-  }
-  prop {
-    api_name: "icc_operator_alpha"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.sim.operator.alpha"
-  }
-  prop {
-    api_name: "icc_operator_iso_country"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.sim.operator.iso-country"
-  }
-  prop {
-    api_name: "icc_operator_numeric"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.sim.operator.numeric"
-  }
-  prop {
-    api_name: "ignore_nitz"
-    prop_name: "telephony.test.ignore.nitz"
-  }
-  prop {
-    api_name: "in_ecm_mode"
-    access: ReadWrite
-    prop_name: "ril.cdma.inecmmode"
-  }
-  prop {
-    api_name: "lte_on_cdma_device"
-    type: Integer
-    scope: Internal
-    prop_name: "telephony.lteOnCdmaDevice"
-  }
-  prop {
-    api_name: "lte_on_cdma_product_type"
-    type: String
-    scope: Internal
-    prop_name: "telephony.lteOnCdmaProductType"
-  }
-  prop {
-    api_name: "max_active_modems"
-    type: Integer
-    prop_name: "telephony.active_modems.max_count"
-  }
-  prop {
-    api_name: "mobile_data"
-    prop_name: "ro.com.android.mobiledata"
-  }
-  prop {
-    api_name: "multi_sim_config"
-    type: String
-    access: ReadWrite
-    prop_name: "persist.radio.multisim.config"
-  }
-  prop {
-    api_name: "operator_alpha"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.operator.alpha"
-  }
-  prop {
-    api_name: "operator_idp_string"
-    type: String
-    access: ReadWrite
-    prop_name: "gsm.operator.idpstring"
-  }
-  prop {
-    api_name: "operator_is_manual"
-    scope: Internal
-    prop_name: "operator.ismanual"
-  }
-  prop {
-    api_name: "operator_is_roaming"
-    type: BooleanList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.operator.isroaming"
-  }
-  prop {
-    api_name: "operator_iso_country"
-    type: StringList
-    access: ReadWrite
-    prop_name: "gsm.operator.iso-country"
-  }
-  prop {
-    api_name: "operator_numeric"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.operator.numeric"
-  }
-  prop {
-    api_name: "otasp_num_schema"
-    type: StringList
-    scope: Internal
-    prop_name: "ro.cdma.otaspnumschema"
-  }
-  prop {
-    api_name: "reboot_on_modem_change"
-    scope: Internal
-    prop_name: "persist.radio.reboot_on_modem_change"
-  }
-  prop {
-    api_name: "reset_on_radio_tech_change"
-    prop_name: "persist.radio.reset_on_switch"
-  }
-  prop {
-    api_name: "ril_impl"
-    type: String
-    scope: Internal
-    prop_name: "gsm.version.ril-impl"
-  }
-  prop {
-    api_name: "ril_sends_multiple_call_ring"
-    prop_name: "ro.telephony.call_ring.multiple"
-  }
-  prop {
-    api_name: "sim_slots_count"
-    type: Integer
-    prop_name: "ro.telephony.sim_slots.count"
-  }
-  prop {
-    api_name: "sim_state"
-    type: StringList
-    access: ReadWrite
-    scope: Internal
-    prop_name: "gsm.sim.state"
-  }
-  prop {
-    api_name: "sms_receive"
-    type: BooleanList
-    scope: Internal
-    prop_name: "telephony.sms.receive"
-  }
-  prop {
-    api_name: "sms_send"
-    type: BooleanList
-    scope: Internal
-    prop_name: "telephony.sms.send"
-  }
-  prop {
-    api_name: "test_csim"
-    prop_name: "persist.radio.test-csim"
-  }
-  prop {
-    api_name: "videocall_audio_output"
-    type: Integer
-    scope: Internal
-    prop_name: "persist.radio.call.audio.output"
-  }
-  prop {
-    api_name: "wake_lock_timeout"
-    type: Integer
-    prop_name: "ro.ril.wake_lock_timeout"
-  }
-  prop {
-    api_name: "wps_info"
-    type: Integer
-    scope: Internal
-    prop_name: "wifidirect.wps"
-  }
-}
-props {
   module: "android.sysprop.TraceProperties"
   prop {
     api_name: "enable"
@@ -506,19 +141,6 @@
   }
 }
 props {
-  module: "android.sysprop.VndkProperties"
-  prop {
-    api_name: "product_vndk_version"
-    type: String
-    prop_name: "ro.product.vndk.version"
-  }
-  prop {
-    api_name: "vendor_vndk_version"
-    type: String
-    prop_name: "ro.vndk.version"
-  }
-}
-props {
   module: "android.sysprop.VoldProperties"
   prop {
     api_name: "decrypt"
@@ -542,16 +164,3 @@
     prop_name: "vold.encrypt_time_remaining"
   }
 }
-props {
-  module: "android.sysprop.WifiProperties"
-  prop {
-    api_name: "start_supplicant"
-    access: Writeonce
-    prop_name: "ctl.start$supplicant"
-  }
-  prop {
-    api_name: "stop_supplicant"
-    access: Writeonce
-    prop_name: "ctl.stop$supplicant"
-  }
-}