Snap for 6439596 from 058c0a2587c7b724a2518f3de22a38c63a803c8a to qt-aml-tzdata-release
Change-Id: I2a9b9bfaa58639372fb43715cc31b5424d98e7ee
diff --git a/srcs/Android.bp b/srcs/Android.bp
index 091fd63..d372f73 100644
--- a/srcs/Android.bp
+++ b/srcs/Android.bp
@@ -13,9 +13,7 @@
// limitations under the License.
//
-sysprop_library {
- name: "PlatformProperties",
+filegroup {
+ name: "platform-properties",
srcs: ["**/*.sysprop"],
- property_owner: "Platform",
- api_packages: ["android.sysprop"],
}
diff --git a/srcs/android/sysprop/ProductProperties.sysprop b/srcs/android/sysprop/ProductProperties.sysprop
deleted file mode 100644
index 72a5520..0000000
--- a/srcs/android/sysprop/ProductProperties.sysprop
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2019 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.ProductProperties"
-owner: Platform
-prop {
- api_name: "unbundled_apps"
- type: Boolean
- scope: Internal
- access: Readonly
- prop_name: "ro.product.apps.unbundled"
-}
diff --git a/srcs/android/sysprop/TelephonyProperties.sysprop b/srcs/android/sysprop/TelephonyProperties.sysprop
deleted file mode 100644
index 0daf467..0000000
--- a/srcs/android/sysprop/TelephonyProperties.sysprop
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2019 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.TelephonyProperties"
-owner: Platform
-prop {
- api_name: "airplane_mode_on"
- type: Boolean
- scope: Internal
- access: ReadWrite
- prop_name: "persist.radio.airplane_mode_on"
- integer_as_bool : true
-}
diff --git a/srcs/api/PlatformProperties-current.txt b/srcs/api/PlatformProperties-current.txt
deleted file mode 100644
index feeb0dd..0000000
--- a/srcs/api/PlatformProperties-current.txt
+++ /dev/null
@@ -1,196 +0,0 @@
-props {
- module: "android.sysprop.AdbProperties"
- prop {
- api_name: "secure"
- access: Writeonce
- scope: Internal
- prop_name: "ro.adb.secure"
- }
-}
-props {
- module: "android.sysprop.CarProperties"
- prop {
- api_name: "boot_user_override_id"
- type: Integer
- access: ReadWrite
- scope: Internal
- prop_name: "android.car.systemuser.bootuseroverrideid"
- }
- prop {
- api_name: "headless_system_user"
- access: ReadWrite
- scope: Internal
- prop_name: "android.car.systemuser.headless"
- }
- 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"
- }
-}
-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.ProductProperties"
- prop {
- api_name: "unbundled_apps"
- scope: Internal
- prop_name: "ro.product.apps.unbundled"
- }
-}
-props {
- module: "android.sysprop.SetupWizardProperties"
- prop {
- api_name: "esim_cid_ignore"
- type: StringList
- scope: Internal
- prop_name: "ro.setupwizard.esim_cid_ignore"
- }
- prop {
- api_name: "theme"
- type: String
- 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
- }
-}
-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.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"
- }
-}
diff --git a/srcs/api/PlatformProperties-latest.txt b/srcs/api/PlatformProperties-latest.txt
deleted file mode 100644
index 4c662d7..0000000
--- a/srcs/api/PlatformProperties-latest.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-props {
- module: "android.sysprop.AdbProperties"
- prop {
- api_name: "secure"
- access: Writeonce
- scope: Internal
- prop_name: "ro.adb.secure"
- }
-}
-props {
- module: "android.sysprop.CarProperties"
- prop {
- api_name: "boot_user_override_id"
- type: Integer
- access: ReadWrite
- scope: Internal
- prop_name: "android.car.systemuser.bootuseroverrideid"
- }
- prop {
- api_name: "headless_system_user"
- access: ReadWrite
- scope: Internal
- prop_name: "android.car.systemuser.headless"
- }
- prop {
- api_name: "trusted_device_device_name_prefix"
- type: String
- scope: Internal
- prop_name: "ro.android.car.trusteddevice.device_name_prefix"
- }
-}
-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.ProductProperties"
- prop {
- api_name: "unbundled_apps"
- scope: Internal
- prop_name: "ro.product.apps.unbundled"
- }
-}
-props {
- module: "android.sysprop.SetupWizardProperties"
- prop {
- api_name: "esim_cid_ignore"
- type: StringList
- scope: Internal
- prop_name: "ro.setupwizard.esim_cid_ignore"
- }
- prop {
- api_name: "theme"
- type: String
- access: ReadWrite
- scope: Internal
- prop_name: "setupwizard.theme"
- }
-}
-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.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"
- }
-}
