Commit 5d843906 authored by /e/ robot's avatar /e/ robot

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents ba38dadc 9cfbef4d
......@@ -42,7 +42,7 @@ ifneq ($(filter $(UM_PLATFORMS),$(TARGET_BOARD_PLATFORM)),)
endif
# Enable DRM PP driver on UM platforms that support it
ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)),true)
ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY),$(TARGET_BOARD_PLATFORM)),)
TARGET_USES_DRM_PP := true
endif
......@@ -51,7 +51,7 @@ TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS ?= 0
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 21)
# Mark GRALLOC_USAGE_PRIVATE_10BIT_TP as valid gralloc bits on UM platforms that support it
ifeq ($(call is-board-platform-in-list, $(UM_4_9_FAMILY) $(UM_4_14_FAMILY)),true)
ifneq ($(filter $(UM_4_9_FAMILY) $(UM_4_14_FAMILY),$(TARGET_BOARD_PLATFORM)),)
TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS += | (1 << 27)
endif
......
......@@ -1150,14 +1150,12 @@
<apn carrier="VivaCell MMS" mcc="283" mnc="05" apn="mms.vivacell.am" proxy="" port="" user="" password="" mmsc="http://mms.vivacell.am/mmsc" mmsproxy="83.217.226.72" mmsport="8080" type="mms" />
<apn carrier="Orange AM" mcc="283" mnc="10" apn="internet" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
<apn carrier="Orange AM MMS" mcc="283" mnc="10" apn="mms" proxy="" port="" user="" password="" mmsc="http://mms/" mmsproxy="192.168.220.251" mmsport="3128" type="mms" />
<apn carrier="M-Tel Internet" mcc="284" mnc="01" apn="inet-gprs.mtel.bg" proxy="" port="" user="" password="" mmsc="" type="default,supl" />
<apn carrier="M-Tel MMS" mcc="284" mnc="01" apn="mms-gprs.mtel.bg" proxy="" port="" user="mtel" password="mtel" mmsc="http://mmsc/" mmsproxy="10.150.0.33" mmsport="8080" type="mms" />
<apn carrier="VIVACOM Internet" mcc="284" mnc="03" apn="internet.vivacom.bg" proxy="" port="" user="VIVACOM" password="VIVACOM" mmsc="" authtype="0" type="default,supl" />
<apn carrier="VIVACOM MMS" mcc="284" mnc="03" apn="mms.vivacom.bg" proxy="" port="" user="mms" password="mms" mmsc="http://mmsc.vivacom.bg" mmsproxy="192.168.123.123" mmsport="8080" authtype="0" type="mms" />
<apn carrier="Telenor Internet" mcc="284" mnc="05" apn="telenor" user="telenor" type="default,supl" />
<apn carrier="Telenor MMS" mcc="284" mnc="05" apn="mms.telenor.bg" user="mms" mmsc="http://mmsc1.mms.telenor.bg:8002" mmsproxy="192.168.87.11" mmsport="8004" type="mms" />
<apn carrier="GLOBUL Internet" mcc="284" mnc="05" apn="globul" proxy="192.168.88.11" port="8004" user="globul" password="" mmsc="" type="default,supl" />
<apn carrier="GLOBUL MMS" mcc="284" mnc="05" apn="mms.globul.bg" proxy="" port="" user="mms" password="" mmsc="http://mmsc1.mms.globul.bg:8002" mmsproxy="192.168.87.11" mmsport="8004" type="mms" />
<apn carrier="A1" mcc="284" mnc="01" apn="internet.a1.bg" authtype="0" type="default,supl" />
<apn carrier="A1 MMS" mcc="284" mnc="01" apn="mms.a1.bg" mmsc="http://mmsc/" mmsproxy="10.150.0.33" mmsport="8080" authtype="0" type="mms" />
<apn carrier="VIVACOM INTERNET GPRS" mcc="284" mnc="03" apn="internet.vivacom.bg" user="VIVACOM" password="VIVACOM" authtype="0" type="default,supl" />
<apn carrier="VIVACOM MMS GPRS" mcc="284" mnc="03" apn="mms.vivacom.bg" user="mms" password="mms" mmsc="http://mmsc.vivacom.bg" mmsproxy="192.168.123.123" mmsport="8080" authtype="0" type="mms" />
<apn carrier="Telenor Internet" mcc="284" mnc="05" apn="telenorbg" user="telenor" authtype="0" type="default,supl" />
<apn carrier="Telenor MMS" mcc="284" mnc="05" apn="mms" user="mms" mmsc="http://mmsc" mmsproxy="192.168.87.11" mmsport="8004" authtype="0" type="mms" />
<apn carrier="Bulsatcom" mcc="284" mnc="11" apn="bulsat.com" type="default,supl" />
<apn carrier="Turkcell Internet" mcc="286" mnc="01" apn="Internet" user="" password="" type="default,supl" />
<apn carrier="Turkcell MMS" mcc="286" mnc="01" apn="mms" proxy="" port="" mmsproxy="212.252.169.217" mmsport="8080" mmsc="http://mms.turkcell.com.tr/servlets/mms" user="mms" password="mms" type="mms" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment