am 54767217: Merge "Added new APN values for a new operator (YouPhone) in Israel."
* commit '547672178798b2e46299b8bb6497b350b0c0903e':
Added new APN values for a new operator (YouPhone) in Israel.
diff --git a/apps/SampleEmailPolicy/Android.mk b/apps/SampleEmailPolicy/Android.mk
index 9ae9308..9217018 100644
--- a/apps/SampleEmailPolicy/Android.mk
+++ b/apps/SampleEmailPolicy/Android.mk
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ifneq ($(TARGET_BUILD_PDK),true)
+ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
# This is the makefile for the Email Policy package contained elsewhere in this sample.
# When deploying to an actual device, you must change LOCAL_PACKAGE_NAME to the name desired for
@@ -34,4 +34,4 @@
include $(BUILD_PACKAGE)
-endif # !PDK
\ No newline at end of file
+endif # JAVA_SUPPORT
diff --git a/apps/client/Android.mk b/apps/client/Android.mk
index 2318fe3..dfb6357 100644
--- a/apps/client/Android.mk
+++ b/apps/client/Android.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-ifneq ($(TARGET_BUILD_PDK),true)
+ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
# This makefile is an example of writing an application that will link against
# a custom shared library included with an Android system.
@@ -40,4 +40,4 @@
include $(BUILD_PACKAGE)
-endif # !PDK
\ No newline at end of file
+endif # JAVA_SUPPORT
diff --git a/apps/upgrade/Android.mk b/apps/upgrade/Android.mk
index 4cba7e4..01ec440 100644
--- a/apps/upgrade/Android.mk
+++ b/apps/upgrade/Android.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-ifneq ($(TARGET_BUILD_PDK),true)
+ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -34,4 +34,4 @@
include $(BUILD_PACKAGE)
-endif # !PDK
\ No newline at end of file
+endif # JAVA_SUPPORT
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index c9be5a6..fcf2b4c 100755
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -535,6 +535,25 @@
type="mms"
/>
+ <apn carrier="Darty Surf&Mails"
+ mcc="208"
+ mnc="10"
+ apn="wap68"
+ proxy="192.168.21.11"
+ port="8080"
+ type="default,supl"
+ />
+
+ <apn carrier="Darty MMS"
+ mcc="208"
+ mnc="10"
+ apn="mms68"
+ mmsc="http://mms68/"
+ mmsproxy="10.143.156.11"
+ mmsport="8080"
+ type="mms"
+ />
+
<apn carrier="Internet movil"
mcc="214"
mnc="01"
@@ -743,6 +762,86 @@
type="mms"
/>
+ <apn carrier="Jazztel Internet"
+ mcc="214"
+ mnc="07"
+ apn="jazzinternet"
+ type="default,supl"
+ />
+
+ <apn carrier="Jazztel MMS"
+ mcc="214"
+ mnc="07"
+ apn="jazzmms"
+ user=""
+ password=""
+ mmsc="http://jazztelmms.com/servlets/mms/"
+ mmsproxy="37.132.0.10"
+ mmsport="8080"
+ authtype="1"
+ type="mms"
+ />
+
+ <apn carrier="Jazztel Internet"
+ mcc="214"
+ mnc="21"
+ apn="jazzinternet"
+ type="default,supl"
+ />
+
+ <apn carrier="Jazztel MMS"
+ mcc="214"
+ mnc="21"
+ apn="jazzmms"
+ user=""
+ password=""
+ authtype="1"
+ mmsc="http://jazztelmms.com/servlets/mms/"
+ mmsproxy="37.132.0.10"
+ mmsport="8080"
+ type="mms"
+ />
+
+ <apn carrier="TeleCable Internet"
+ mcc="214"
+ mnc="06"
+ apn="internet.telecable.es"
+ user="telecable"
+ password="telecable"
+ authtype="1"
+ type="default,supl"
+ />
+
+ <apn carrier="TeleCable MMS"
+ mcc="214"
+ mnc="06"
+ apn="mms.telecable.es"
+ user="telecable"
+ password="telecable"
+ authtype="1"
+ mmsc="http://mms.telecable.es/mms/"
+ mmsproxy="212.89.0.84"
+ mmsport="8080"
+ type="mms"
+ />
+
+ <apn carrier="ONO Internet"
+ mcc="214"
+ mnc="18"
+ apn="internet.ono.com"
+ type="default,supl"
+ />
+
+ <apn carrier="ONO MMS"
+ mcc="214"
+ mnc="18"
+ apn="mms.ono.com"
+ mmsc="http://mms.ono.com/"
+ mmsproxy="10.126.0.50"
+ mmsport="8080"
+ type="mms"
+ />
+
<apn carrier="Telenor MMS"
mcc="216"
mnc="01"
@@ -2066,12 +2165,10 @@
type="mms"
/>
- <apn carrier="Telia SE WAP"
+ <apn carrier="Telia SurfPort"
mcc="240"
mnc="01"
apn="online.telia.se"
- proxy="10.254.254.254"
- port="8080"
type="default,supl"
/>
@@ -3911,12 +4008,12 @@
type="mms"
/>
- <apn carrier="Cingular 410"
+ <apn carrier="ATT WAP"
mcc="310"
mnc="410"
apn="wap.cingular"
- user="WAP@CINGULARGPRS.COM"
- password="CINGULAR1"
+ proxy="wireless.cingular.com"
+ port="80"
server="cingulargprs.com"
mmsc="http://mmsc.cingular.com/"
mmsproxy="wireless.cingular.com"
@@ -13483,6 +13580,38 @@
type="default"
/>
+ <apn carrier="Full Internet SRR"
+ mcc="647"
+ mnc="10"
+ apn="sl2sfr"
+ type="default,supl"
+ />
+
+ <apn carrier="OnlyWap"
+ mcc="647"
+ mnc="02"
+ apn="onlywap"
+ user="only"
+ password="only"
+ authtype="1"
+ proxy="10.4.85.50"
+ port="8080"
+ type="default,supl"
+ />
+
+ <apn carrier="OnlyMMS"
+ mcc="647"
+ mnc="02"
+ apn="onlymms"
+ user="only"
+ password="only"
+ authtype="1"
+ mmsc="http://10.4.85.50:8514"
+ mmsproxy="10.4.85.50"
+ mmsport="8080"
+ type="mms"
+ />
+
<apn carrier="Orange MG MMS"
mcc="646"
mnc="02"
diff --git a/frameworks/PlatformLibrary/Android.mk b/frameworks/PlatformLibrary/Android.mk
index ef2651d..b40061b 100644
--- a/frameworks/PlatformLibrary/Android.mk
+++ b/frameworks/PlatformLibrary/Android.mk
@@ -14,7 +14,7 @@
# limitations under the License.
#
-ifneq ($(TARGET_BUILD_PDK),true)
+ifneq ($(TARGET_BUILD_JAVA_SUPPORT_LEVEL),)
# This makefile shows how to build your own shared library that can be
# shipped on the system of a phone, and included additional examples of
@@ -57,4 +57,4 @@
include $(call all-makefiles-under,$(LOCAL_PATH))
-endif # !PDK
\ No newline at end of file
+endif # JAVA_SUPPORT
diff --git a/overlays/location/frameworks/base/core/res/res/values/config.xml b/overlays/location/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..f11f045
--- /dev/null
+++ b/overlays/location/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2012, 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.
+ */
+-->
+<resources>
+
+ <!--
+ Sets the package names whose certificates should be used to
+ verify location providers are allowed to be loaded.
+ -->
+ <string-array name="config_locationProviderPackageNames" translatable="false">
+ <item>com.google.android.location</item>
+ <item>com.android.location.fused</item>
+ </string-array>
+</resources>
diff --git a/products/location_overlay.mk b/products/location_overlay.mk
new file mode 100644
index 0000000..6831145
--- /dev/null
+++ b/products/location_overlay.mk
@@ -0,0 +1,25 @@
+#
+# Copyright (C) 2008 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.
+#
+
+# This is an example of how to set an overlay that configures the
+# default backup transport. In this example, the configuration points
+# to the Google implementation, to show the exact syntax in a real-world
+# example.
+
+PRODUCT_PACKAGE_OVERLAYS := device/sample/overlays/location
+
+# Uncomment this line to include the Google network and fused location providers
+#PRODUCT_PACKAGES := NetworkLocation
