Merge branch 'aosp-fix' into gingerbread-x86

diff --combined include/telephony/ril.h
index d3c7569,2796a06..9cbb75a
--- 1/include/telephony/ril.h
--- 2/include/telephony/ril.h
+++ b/include/telephony/ril.h
@@@ -40,7 -40,7 +40,7 @@@
  extern "C" {
  #endif
  
 -#define RIL_VERSION 3
 +#define RIL_VERSION 4
  
  #define CDMA_ALPHA_INFO_BUFFER_LENGTH 64
  #define CDMA_NUMBER_INFO_BUFFER_LENGTH 81
@@@ -157,11 -157,9 +157,11 @@@ typedef struct 
  typedef struct {
      int             cid;        /* Context ID */
      int             active;     /* 0=inactive, 1=active/physical link down, 2=active/physical link up */
 -    char *          type;       /* X.25, IP, IPV6, etc. */
 +    char *          type;       /* One of the PDP_type values in TS 27.007 section 10.1.1.
 +                                   For example, "IP", "IPV6", "IPV4V6", or "PPP". */
      char *          apn;
 -    char *          address;
 +    char *          address;    /* The IPv4 or IPv6 address assigned to the call, e.g., "192.0.1.3"
 +                                   or "2001:db8::1". */
  } RIL_Data_Call_Response;
  
  typedef struct {
@@@ -1318,24 -1316,17 +1318,24 @@@ typedef struct 
   *                          1 => PAP may be performed; CHAP is never performed.
   *                          2 => CHAP may be performed; PAP is never performed.
   *                          3 => PAP / CHAP may be performed - baseband dependent.
 + * ((const char **)data)[6] is the PDP type to request if the radio technology is GSM/UMTS.
 + *                          Must be one of the PDP_type values in TS 27.007 section 10.1.1.
 + *                          For example, "IP", "IPV6", "IPV4V6", or "PPP".
   *
   * "response" is a char **
 - * ((char **)response)[0] indicating PDP CID, which is generated by RIL. This Connection ID is
 - *                          used in GSM/UMTS and CDMA
 - * ((char **)response)[1] indicating the network interface name for GSM/UMTS or CDMA
 - * ((char **)response)[2] indicating the IP address for this interface for GSM/UMTS
 - *                          and NULL for CDMA
 - *
 - * FIXME may need way to configure QoS settings
 - *
 - * replaces  RIL_REQUEST_SETUP_DEFAULT_PDP
 + * ((char **)response)[0] the Connection ID, CID, which is generated by RIL.
 + * ((char **)response)[1] the network interface name.
 + * ((char **)response)[2] a numeric IPv4 or IPv6 address that has been assigned to the interface.
 + * ((char **)response)[3] a space-separated list of numeric IPv4 or IPv6 DNS addresses.
 + *                        Ignored on Android platforms before 3.0 and instead two DNS IP addresses
 + *                        are retrieved from system properties "net.$IN.dns1" and "net.$IN.dns2".
 + * ((char **)response)[4] the numeric IPv4 or IPv6 address of the default gateway.
 + *                        Ignored on Android platforms before 3.0 and instead an IP address
 + *                        is retrieved from system property "net.$IN.gw".
 + *
 + * Notes:
 + *   1) Numeric addresses must be in the Java InetAddress parsable representation.
 + *   2) $IN in the above comments is the interface name from response[1].
   *
   * Valid errors:
   *  SUCCESS
@@@ -1630,9 -1621,6 +1630,9 @@@
   *
   * "data" is const char **
   * ((char**)data)[0] indicating CID
 + * ((char**)data)[1] indicating Disconnect Reason
 + *                   0 => No specific reason specified
 + *                   1 => Radio shutdown requested
   *
   * "response" is NULL
   *
@@@ -3294,9 -3282,13 +3294,13 @@@
   *
   * Called when new Broadcast SMS is received
   *
-  * "data" is const char * of 88 bytes which indicates each page
-  * of a CBS Message sent to the MS by the BTS as coded in 3GPP
-  * 23.041 Section 9.4.1.1
+  * "data" can be one of the following:
+  * If received from GSM network, "data" is const char of 88 bytes
+  * which indicates each page of a CBS Message sent to the MS by the
+  * BTS as coded in 3GPP 23.041 Section 9.4.1.2.
+  * If received from UMTS network, "data" is const char of 90 up to 1252
+  * bytes which contain between 1 and 15 CBS Message pages sent as one
+  * packet to the MS by the BTS as coded in 3GPP 23.041 Section 9.4.2.2.
   *
   */
  #define RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS 1021

diff --combined rild/rild.c
index f7e259d,8ee3569..e9d42c6
--- 1/rild/rild.c
--- 2/rild/rild.c
+++ b/rild/rild.c
@@@ -91,7 -91,7 +91,7 @@@ void switchUser() 
      struct __user_cap_data_struct cap;
      header.version = _LINUX_CAPABILITY_VERSION;
      header.pid = 0;
-     cap.effective = cap.permitted = 1 << CAP_NET_ADMIN;
+     cap.effective = cap.permitted = (1 << CAP_NET_ADMIN) | (1 << CAP_NET_RAW);
      cap.inheritable = 0;
      capset(&header, &cap);
  }
@@@ -133,7 -133,7 +133,7 @@@ int main(int argc, char **argv
      }
  
      /* special override when in the emulator */
 -#if 1
 +#if 0
      {
          static char*  arg_overrides[3];
          static char   arg_device[32];