commit 59caeb14a7cb7cbc74db725343922c81f0e2e3aa
author Glenn Kasten <gkasten@google.com> Thu Aug 22 22:26:35 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 22 22:26:35 2013 +0000
tree 940dce7857cf96dfe640fc80d55f62f4ea8c7a42
parent 69e82d2df615b77ff868309b8f2c0323eadb42c5
parent 08708c5e1fda39bf0111b5e1175533e6763219e2

Merge "Fix file permissions" into klp-dev

include/hardware/fused_location.h

diff --git a/include/hardware/fused_location.h b/include/hardware/fused_location.h
index fecf822..5c7821c 100644
--- a/include/hardware/fused_location.h
+++ b/include/hardware/fused_location.h
@@ -406,7 +406,7 @@
 #define FLP_DEVICE_CONTEXT_NETWORK_POSITIONING_ENABLED     (1U<<2)
 #define FLP_DEVICE_CONTEXT_WIFI_CONNECTIVITY_ENABLED       (1U<<3)
 #define FLP_DEVICE_CONTEXT_WIFI_POSITIONING_ENABLED        (1U<<4)
-#define FIP_DEVICE_CONTEXT_HW_NETWORK_POSITIONING ENABLED  (1U<<5)
+#define FLP_DEVICE_CONTEXT_HW_NETWORK_POSITIONING_ENABLED  (1U<<5)
 #define FLP_DEVICE_CONTEXT_AIRPLANE_MODE_ON                (1U<<6)
 #define FLP_DEVICE_CONTEXT_DATA_ENABLED                    (1U<<7)
 #define FLP_DEVICE_CONTEXT_ROAMING_ENABLED                 (1U<<8)

modules/audio_remote_submix/audio_hw.cpp

diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp
index 5e88ef7..9df17b6 100644
--- a/modules/audio_remote_submix/audio_hw.cpp
+++ b/modules/audio_remote_submix/audio_hw.cpp
@@ -271,7 +271,7 @@
             return 0;
         } else {
             // write() returned UNDERRUN or WOULD_BLOCK, retry
-            ALOGE("out_write() write to pipe returned unexpected %16lx", written_frames);
+            ALOGE("out_write() write to pipe returned unexpected %d", written_frames);
             written_frames = sink->write(buffer, frames);
         }
     }
@@ -281,7 +281,7 @@
     pthread_mutex_unlock(&out->dev->lock);
 
     if (written_frames < 0) {
-        ALOGE("out_write() failed writing to pipe with %16lx", written_frames);
+        ALOGE("out_write() failed writing to pipe with %d", written_frames);
         return 0;
     } else {
         ALOGV("out_write() wrote %lu bytes)", written_frames * frame_size);
@@ -549,7 +549,7 @@
     config->channel_mask = AUDIO_CHANNEL_OUT_STEREO;
     rsxadev->config.channel_mask = config->channel_mask;
 
-    if ((config->sample_rate != 48000) || (config->sample_rate != 44100)) {
+    if ((config->sample_rate != 48000) && (config->sample_rate != 44100)) {
         config->sample_rate = DEFAULT_RATE_HZ;
     }
     rsxadev->config.rate = config->sample_rate;
@@ -708,7 +708,7 @@
     config->channel_mask = AUDIO_CHANNEL_IN_STEREO;
     rsxadev->config.channel_mask = config->channel_mask;
 
-    if ((config->sample_rate != 48000) || (config->sample_rate != 44100)) {
+    if ((config->sample_rate != 48000) && (config->sample_rate != 44100)) {
         config->sample_rate = DEFAULT_RATE_HZ;
     }
     rsxadev->config.rate = config->sample_rate;