Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfb3937c authored by Jiyong Park's avatar Jiyong Park
Browse files

Some properties are set as optional 

Some properties that are designed to provide a safe default value are
explicitly set as optional using the 'a ?= b' syntax.

Bug: 117892318
Bug: 158735147
Test: m
Change-Id: Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90
parent b1261aac

target/product/aosp_product.mk

+3 −3
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) 


# Additional settings used in all AOSP builds

PRODUCT_PRODUCT_PROPERTIES += \

    ro.config.ringtone=Ring_Synth_04.ogg \

    ro.config.notification_sound=pixiedust.ogg \

    ro.com.android.dataroaming=true \

    ro.config.ringtone?=Ring_Synth_04.ogg \

    ro.config.notification_sound?=pixiedust.ogg \

    ro.com.android.dataroaming?=true \



# More AOSP packages

PRODUCT_PACKAGES += \

target/product/full_base.mk

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ PRODUCT_PACKAGES += \ 


# Additional settings used in all AOSP builds

PRODUCT_VENDOR_PROPERTIES := \

    ro.config.ringtone=Ring_Synth_04.ogg \

    ro.config.notification_sound=pixiedust.ogg

    ro.config.ringtone?=Ring_Synth_04.ogg \

    ro.config.notification_sound?=pixiedust.ogg



# Put en_US first in the list, so make it default.

PRODUCT_LOCALES := en_US

target/product/full_base_telephony.mk

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
# entirely appropriate to inherit from for on-device configurations.



PRODUCT_VENDOR_PROPERTIES := \

    keyguard.no_require_sim=true \

    ro.com.android.dataroaming=true

    keyguard.no_require_sim?=true \

    ro.com.android.dataroaming?=true



PRODUCT_COPY_FILES := \

    device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml \

target/product/handheld_system.mk

+3 −3
Original line number Diff line number Diff line
@@ -83,6 +83,6 @@ PRODUCT_COPY_FILES += \ 
    frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf



PRODUCT_VENDOR_PROPERTIES += \

    ro.carrier=unknown \

    ro.config.notification_sound=OnTheHunt.ogg \

    ro.config.alarm_alert=Alarm_Classic.ogg
 
    ro.carrier?=unknown \

    ro.config.notification_sound?=OnTheHunt.ogg \

    ro.config.alarm_alert?=Alarm_Classic.ogg

target/product/media_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ 
# On userdebug builds, collect more tombstones by default.

ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

PRODUCT_VENDOR_PROPERTIES += \

    tombstoned.max_tombstone_count=50

    tombstoned.max_tombstone_count?=50

endif



PRODUCT_VENDOR_PROPERTIES += \