Merge commit '886710c23c1b8fc1fa3b24b47accf560230bc410' into HEAD

Change-Id: I4ce2a7df0c851c98940bb1e1197f1df45fdb2f33
diff --git a/etc/apns-full-conf.xml b/etc/apns-full-conf.xml
index a875eb3..0ec5f0f 100644
--- a/etc/apns-full-conf.xml
+++ b/etc/apns-full-conf.xml
@@ -1037,6 +1037,13 @@
       type="mms"
   />
 
+  <apn carrier="BICS Internet"
+      mcc="206"
+      mnc="28"
+      apn="bicsapn"
+      type="default,supl"
+  />
+
   <apn carrier="Orange World"
       mcc="208"
       mnc="01"
@@ -32105,6 +32112,14 @@
       apn="em"
       type="default"
   />
+
+  <apn carrier="BICS Internet"
+      mcc="901"
+      mnc="58"
+      apn="bicsapn"
+      type="default,supl"
+  />
+
   <apn carrier="Sberbank-Telecom Internet"
       mcc="250"
       mnc="050"
diff --git a/frameworks/PlatformLibrary/jni/Android.mk b/frameworks/PlatformLibrary/jni/Android.mk
index d19b6cc..2b91f05 100644
--- a/frameworks/PlatformLibrary/jni/Android.mk
+++ b/frameworks/PlatformLibrary/jni/Android.mk
@@ -43,7 +43,6 @@
 LOCAL_C_INCLUDES += \
 	$(JNI_H_INCLUDE)
 
-# No specia compiler flags.
-LOCAL_CFLAGS +=
+LOCAL_CFLAGS += -Wall -Werror
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp b/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp
index 428d0a8..b03c385 100644
--- a/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp
+++ b/frameworks/PlatformLibrary/jni/PlatformLibrary.cpp
@@ -250,7 +250,7 @@
 /*
  * This is called by the VM when the shared library is first loaded.
  */
-jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/) {
     JNIEnv* env = NULL;
     jint result = -1;