diff options
| -rw-r--r-- | apps/SampleEmailPolicy/Android.mk | 2 | ||||
| -rw-r--r-- | apps/client/Android.mk | 2 | ||||
| -rw-r--r-- | apps/tv/LeanbackCustomizer/Android.mk | 2 | ||||
| -rw-r--r-- | apps/tv/LeanbackWidget/Android.mk | 2 | ||||
| -rw-r--r-- | apps/upgrade/Android.mk | 2 | ||||
| -rw-r--r-- | etc/apns-full-conf.xml | 70 |
6 files changed, 39 insertions, 41 deletions
diff --git a/apps/SampleEmailPolicy/Android.mk b/apps/SampleEmailPolicy/Android.mk index a8453c1..c775a04 100644 --- a/apps/SampleEmailPolicy/Android.mk +++ b/apps/SampleEmailPolicy/Android.mk @@ -28,6 +28,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := SampleEmailPolicy +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform diff --git a/apps/client/Android.mk b/apps/client/Android.mk index dfb6357..c2c8ba5 100644 --- a/apps/client/Android.mk +++ b/apps/client/Android.mk @@ -26,6 +26,8 @@ LOCAL_MODULE_TAGS := optional # This is the target being built. LOCAL_PACKAGE_NAME := PlatformLibraryClient +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/apps/tv/LeanbackCustomizer/Android.mk b/apps/tv/LeanbackCustomizer/Android.mk index fb4f41c..54db7c3 100644 --- a/apps/tv/LeanbackCustomizer/Android.mk +++ b/apps/tv/LeanbackCustomizer/Android.mk @@ -7,6 +7,8 @@ LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/priv-app LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LeanbackCustomizer +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/apps/tv/LeanbackWidget/Android.mk b/apps/tv/LeanbackWidget/Android.mk index 7209b52..1fe0dea 100644 --- a/apps/tv/LeanbackWidget/Android.mk +++ b/apps/tv/LeanbackWidget/Android.mk @@ -7,6 +7,8 @@ LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/app LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LeanbackWidget +LOCAL_LICENSE_KINDS := legacy_notice +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/apps/upgrade/Android.mk b/apps/upgrade/Android.mk index 01ec440..e67fc16 100644 --- a/apps/upgrade/Android.mk +++ b/apps/upgrade/Android.mk @@ -23,6 +23,8 @@ LOCAL_MODULE_TAGS := optional # This is the target being built. LOCAL_PACKAGE_NAME := UpgradeExample +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml index 8837bfe..692d0ad 100644 --- a/etc/apns-full-conf.xml +++ b/etc/apns-full-conf.xml @@ -3972,6 +3972,16 @@ type="mms" /> + <apn carrier="Goodspeed" + carrier_id="2512" + mcc="232" + mnc="03" + apn="uros.iot" + type="default" + mvno_type="gid" + mvno_match_data="C5" + /> + <apn carrier="Planet 3" carrier_id = "1344" mcc="232" @@ -4986,16 +4996,6 @@ mvno_match_data="TELMORE" /> - <apn carrier="GigSky" - carrier_id="2459" - mcc="238" - mnc="01" - apn="gigsky" - type="default" - mvno_type="spn" - mvno_match_data="GigSky" - /> - <apn carrier="Telenor Internet" carrier_id = "1464" mcc="238" @@ -5395,16 +5395,6 @@ mvno_match_data="240075610" /> - <apn carrier="GigSky" - carrier_id="2459" - mcc="240" - mnc="07" - apn="gigsky" - type="default" - mvno_type="spn" - mvno_match_data="GigSky" - /> - <apn carrier="Telenor Mobilsurf" carrier_id = "1695" mcc="240" @@ -5528,6 +5518,16 @@ mvno_type="spn" /> + <apn carrier="Goodspeed" + carrier_id="2512" + mcc="240" + mnc="42" + apn="uros.iot" + type="default" + mvno_type="gid" + mvno_match_data="C5" + /> + <apn carrier="Ventelo Internett" carrier_id = "2333" mcc="242" @@ -11018,7 +11018,7 @@ mvno_match_data="50FF" /> - <apn carrier="GigSky" + <apn carrier="GigSky" carrier_id="2459" mcc="310" mnc="380" @@ -16359,6 +16359,14 @@ protocol="IPV4V6" /> + <apn carrier="GigSky" + carrier_id="2459" + mcc="312" + mnc="870" + apn="gigsky" + type="default" + /> + <apn carrier="openmobile" mcc="330" mnc="000" @@ -35514,24 +35522,4 @@ type="default,supl" /> - <apn carrier="Goodspeed"> - carrier_id="2512" - mcc="240" - mnc="42" - mvno_type="gid" - mvno_match_data="C5" - apn="uros.iot" - type="default" - </apn> - - <apn carrier="Goodspeed"> - carrier_id="2512" - mcc="232" - mnc="03" - mvno_type="gid" - mvno_match_data="C5" - apn="uros.iot" - type="default" - </apn> - </apns> |