Skip to content

Commit 8e4c07e

Browse files
rmccSteve Kondik
authored andcommitted
Revert "Add handheld_core_hardware.xml to telephony base"
Don't do this. handheld_core_hardware.xml includes feature declarations that aren't mandatory, particularly cameras and magnetometers, but also things like managed users. According to the CDD, these are optional. Go back to the pre-L mechanism of including the declarations per-device to make them accurate. This reverts commit dccce7b. Conflicts: target/product/full_base_telephony.mk Change-Id: I6db55082295171b78fe595e783799ee54458c4fd
1 parent 835636a commit 8e4c07e

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

target/product/full_base_telephony.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,5 @@
2222
PRODUCT_PROPERTY_OVERRIDES := \
2323
keyguard.no_require_sim=true
2424

25-
PRODUCT_COPY_FILES := \
26-
frameworks/native/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml
27-
2825
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
2926
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)

0 commit comments

Comments
 (0)