Merge remote-tracking branch 'cm/cm-11.0' into kk-4.4

Conflicts:
	include/system/audio.h

adb/backup_service.c

@@ -126,8 +126,11 @@ int backup_service(BackupOperation op, char* args) {
         adb_close(s[0]);
 
         // off we go
-        execvp("/system/bin/bu", (char * const *)bu_args);
-        execvp("/sbin/bu", (char * const *)bu_args);
+        if (access("/system/bin/bu", F_OK) == 0)
+            execvp("/system/bin/bu", (char * const *)bu_args);
+        else if (access("/sbin/bu", F_OK) == 0)
+            execvp("/sbin/bu", (char * const *)bu_args);
+
         // oops error - close up shop and go home
         fprintf(stderr, "Unable to exec 'bu', bailing\n");
         exit(-1);

include/system/audio.h

@@ -80,10 +80,8 @@ typedef enum {
                                           /* An example of remote presentation is Wifi Display */
                                           /*  where a dongle attached to a TV can be used to   */
                                           /*  play the mix captured by this audio source.      */
-//#ifdef QCOM_FM_ENABLED
     AUDIO_SOURCE_FM_RX               = 9,
     AUDIO_SOURCE_FM_RX_A2DP          = 10,
-//#endif
     AUDIO_SOURCE_CNT,
     AUDIO_SOURCE_MAX                 = AUDIO_SOURCE_CNT - 1,
     AUDIO_SOURCE_HOTWORD             = 1999, /* A low-priority, preemptible audio source for
@@ -397,7 +395,6 @@ enum {
     AUDIO_DEVICE_OUT_ANC_HEADSET               = 0x10000,
     AUDIO_DEVICE_OUT_ANC_HEADPHONE             = 0x20000,
     AUDIO_DEVICE_OUT_PROXY                     = 0x40000,
-
 #ifdef QCOM_HARDWARE
     AUDIO_DEVICE_OUT_FM                        = 0x80000,
     AUDIO_DEVICE_OUT_FM_TX                     = 0x100000,
@@ -451,6 +448,8 @@ enum {
     AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET     = AUDIO_DEVICE_BIT_IN * 0x400,
     AUDIO_DEVICE_IN_USB_ACCESSORY         = AUDIO_DEVICE_BIT_IN * 0x800,
     AUDIO_DEVICE_IN_USB_DEVICE            = AUDIO_DEVICE_BIT_IN * 0x1000,
+    AUDIO_DEVICE_IN_ANC_HEADSET           = AUDIO_DEVICE_BIT_IN | 0x2000,
+    AUDIO_DEVICE_IN_PROXY                 = AUDIO_DEVICE_BIT_IN | 0x4000,
     AUDIO_DEVICE_IN_DEFAULT               = AUDIO_DEVICE_IN_BUILTIN_MIC,
 #else
     AUDIO_DEVICE_IN_COMMUNICATION         = AUDIO_DEVICE_BIT_IN | 0x1,
@@ -833,3 +832,4 @@ typedef enum {
 __END_DECLS
 
 #endif  // ANDROID_AUDIO_CORE_H
+

include/utils/VectorImpl.h

@@ -106,6 +106,7 @@ class VectorImpl
     virtual void            do_move_forward(void* dest, const void* from, size_t num) const = 0;
     virtual void            do_move_backward(void* dest, const void* from, size_t num) const = 0;
 
+#if NEEDS_VECTORIMPL_SYMBOLS
     // take care of FBC...
     virtual void            reservedVectorImpl1();
     virtual void            reservedVectorImpl2();
@@ -115,7 +116,8 @@ class VectorImpl
     virtual void            reservedVectorImpl6();
     virtual void            reservedVectorImpl7();
     virtual void            reservedVectorImpl8();
-
+#endif
+
 private:
         void* _grow(size_t where, size_t amount);
         void  _shrink(size_t where, size_t amount);
@@ -166,6 +168,7 @@ class SortedVectorImpl : public VectorImpl
 protected:
     virtual int             do_compare(const void* lhs, const void* rhs) const = 0;
 
+#if NEEDS_VECTORIMPL_SYMBOLS
     // take care of FBC...
     virtual void            reservedSortedVectorImpl1();
     virtual void            reservedSortedVectorImpl2();
@@ -175,6 +178,7 @@ class SortedVectorImpl : public VectorImpl
     virtual void            reservedSortedVectorImpl6();
     virtual void            reservedSortedVectorImpl7();
     virtual void            reservedSortedVectorImpl8();
+#endif
 
 private:
             ssize_t         _indexOrderOf(const void* item, size_t* order = 0) const;

libutils/VectorImpl.cpp

@@ -504,6 +504,7 @@ void VectorImpl::_do_move_backward(void* dest, const void* from, size_t num) con
     do_move_backward(dest, from, num);
 }
 
+#if NEEDS_VECTORIMPL_SYMBOLS
 void VectorImpl::reservedVectorImpl1() { }
 void VectorImpl::reservedVectorImpl2() { }
 void VectorImpl::reservedVectorImpl3() { }
@@ -512,6 +513,7 @@ void VectorImpl::reservedVectorImpl5() { }
 void VectorImpl::reservedVectorImpl6() { }
 void VectorImpl::reservedVectorImpl7() { }
 void VectorImpl::reservedVectorImpl8() { }
+#endif
 
 /*****************************************************************************/
 
@@ -628,6 +630,7 @@ ssize_t SortedVectorImpl::remove(const void* item)
     return i;
 }
 
+#if NEEDS_VECTORIMPL_SYMBOLS
 void SortedVectorImpl::reservedSortedVectorImpl1() { };
 void SortedVectorImpl::reservedSortedVectorImpl2() { };
 void SortedVectorImpl::reservedSortedVectorImpl3() { };
@@ -636,7 +639,7 @@ void SortedVectorImpl::reservedSortedVectorImpl5() { };
 void SortedVectorImpl::reservedSortedVectorImpl6() { };
 void SortedVectorImpl::reservedSortedVectorImpl7() { };
 void SortedVectorImpl::reservedSortedVectorImpl8() { };
-
+#endif
 
 /*****************************************************************************/
 

sdcard/sdcard.c

@@ -1751,11 +1751,11 @@ static int usage()
     ERROR("usage: sdcard [OPTIONS] <source_path> <dest_path>\n"
             "    -u: specify UID to run as\n"
             "    -g: specify GID to run as\n"
-            "    -w: specify GID required to write (default sdcard_rw, requires -d or -l)\n"
+            "    -w: specify GID required to write (default sdcard_rw)\n"
             "    -t: specify number of threads to use (default %d)\n"
             "    -d: derive file permissions based on path\n"
             "    -l: derive file permissions based on legacy internal layout\n"
-            "    -s: split derived permissions for pics, av\n"
+            "    -s: split derived permissions for pics, av (requires -d or -l)\n"
             "\n", DEFAULT_NUM_THREADS);
     return 1;
 }