Update to 07.00.00.253.035

Change-Id: Ic51cd6a6cdee099957a9ef9e0e675070f9e2d425

dataservices/datatop/src/Android.mk

@@ -26,6 +26,7 @@ LOCAL_CFLAGS += -D _BSD_SOURCE
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
+LOCAL_CLANG := true
 LOCAL_MODULE := datatop
 LOCAL_MODULE_TAGS := optional
 

dataservices/datatop/src/datatop.c

@@ -93,7 +93,7 @@ int dtop_poll_periodically(struct dtop_linked_list *dpg_list, FILE *fw)
 	struct timeval tv, timeout;
 	fd_set rfds;
 	time_t curtime, endtime;
-	int inp, quit;
+	int inp, quit = 0;
 	struct dtop_linked_list *curr_ptr = dpg_list;
 	struct dtop_data_point_gatherer *dpset;
 	struct timeval ftime, itime, polltime;

dataservices/rmnetctl/src/Android.mk

@@ -12,7 +12,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)
 LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
-
+LOCAL_CLANG := true
 LOCAL_MODULE := librmnetctl
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRELINK_MODULE := false

dataservices/sockev/src/Android.mk

@@ -8,6 +8,7 @@ LOCAL_CFLAGS := -Wall -Werror
 LOCAL_C_INCLUDES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
 
+LOCAL_CLANG := true
 LOCAL_MODULE := sockev
 LOCAL_MODULE_TAGS := optional
 

location/izat_api/IzatRemoteApi.h

@@ -53,9 +53,6 @@ public:
 
 
 class LocationUpdater : public IzatNotifier {
-    static const char* const sLatTag;
-    static const char* const sLonTag;
-    static const char* const sAccuracyTag;
     static const OutCard* sSubscriptionCard;
 protected:
     inline LocationUpdater() : IzatNotifier(sName, sSubscriptionCard) {}
@@ -85,6 +82,18 @@ public:
     virtual void mccUpdate(uint32_t mcc, const char* confidence) = 0;
 };
 
+class NmeaUpdater : public IzatNotifier {
+    static const OutCard* sSubscriptionCard;
+protected:
+    inline NmeaUpdater() : IzatNotifier(sName, sSubscriptionCard) {}
+    virtual inline ~NmeaUpdater() {}
+public:
+    static const char sName[];
+    virtual void handleMsg(qc_loc_fw::InPostcard * const in_card) final;
+    virtual void nmeaUpdate(UlpNmea& nmea) = 0;
+};
+
+
 } // izat_remote_api
 
 #endif //__IZATREMOTEAPIS_H__

location/izat_api/izat_remote_api.h

@@ -49,7 +49,7 @@ typedef void (*locationUpdateCb)(UlpLocation *location,
                 or statemachine etc.
                 Can be NULL.
    return: an opaque pointer that serves as a request handle. This handle
-           is to be fed to theunregisterLocationUpdater() call.
+           to be fed to the unregisterLocationUpdater() call.
 */
 void* registerLocationUpdater(locationUpdateCb locationCb, void* clientData);
 
@@ -97,6 +97,25 @@ void unregisterSstpUpdater(void* sstpUpdaterHandle);
 */
 void stopSstpUpdate(void* sstpUpdaterHandle);
 
+typedef void (*nmeaUpdateCb)(UlpNmea *nmea,  void* clientData);
+
+/* registers a client callback for listening to nmea updates
+   nmeaCb - nmea callback function pointer implemented by client
+   clientData - an opaque data pointer from client. This pointer will be
+                provided back when the nmeaUpdateCb() callbacak is called.
+                This can be used by client to store application context
+                or statemachine etc. This parameter can be NULL.
+   return: an opaque pointer that serves as a request handle. This handle
+           to be fed to the unregisterNmeaUpdater() call.
+*/
+void* registerNmeaUpdater(nmeaUpdateCb nmeaCb, void* clientData);
+
+/* unregisters the client callback
+   nmeaUpdaterHandle - the opaque pointer from the return of
+                           registerNmeaUpdater()
+*/
+void unregisterNmeaUpdater(void* nmeaUpdaterHandle);
+
 
 #ifdef __cplusplus
 } // extern "C"

telephony/ims/src/org/codeaurora/ims/QtiCarrierConfigs.java

@@ -67,4 +67,11 @@ public class QtiCarrierConfigs {
        FALSE - default capabilities will be retained
        TRUE - remove modify call capabilities which will hide modify call button*/
     public static final String REMOVE_MODIFY_CALL_CAPABILITY = "remove_modify_call_capability";
+
+    /* Config to show/hide Video quality toast */
+    public static final String SHOW_VIDEO_QUALITY_TOAST = "show_video_quality_toast";
+    /* Config to show/hide call session event toast like player start/stop */
+    public static final String SHOW_CALL_SESSION_EVENT_TOAST = "show_call_session_event_toast";
+    /* Config to show/hide data usage toast */
+    public static final String SHOW_DATA_USAGE_TOAST = "show_data_usage_toast";
 }

telephony/ims/src/org/codeaurora/ims/utils/QtiImsExtUtils.java

@@ -230,6 +230,11 @@ public class QtiImsExtUtils {
     }
 
     private static PersistableBundle getConfigForPhoneId(Context context, int phoneId) {
+        if (context == null) {
+            Log.e(LOG_TAG, "getConfigForPhoneId context is null");
+            return null;
+        }
+
         CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(
                 Context.CARRIER_CONFIG_SERVICE);
         if (configManager == null) {