less log spew

10 files changed, 69 insertions, 78 deletions

diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp
index 9980c9d..fae1f26 100644
--- a/camera/libcameraservice/CameraService.cpp
+++ b/camera/libcameraservice/CameraService.cpp
@@ -16,7 +16,6 @@
 ** limitations under the License.
 */
 
-//#define LOG_NDEBUG 0
 #define LOG_TAG "CameraService"
 #include <utils/Log.h>
 
@@ -95,7 +94,7 @@ CameraService::~CameraService()
 sp<ICamera> CameraService::connect(const sp<ICameraClient>& cameraClient)
 {
     int callingPid = getCallingPid();
-    LOGD("CameraService::connect E (pid %d, client %p)", callingPid,
+    LOGV("CameraService::connect E (pid %d, client %p)", callingPid,
             cameraClient->asBinder().get());
 
     Mutex::Autolock lock(mServiceLock);
@@ -106,30 +105,30 @@ sp<ICamera> CameraService::connect(const sp<ICameraClient>& cameraClient)
             sp<ICameraClient> currentCameraClient(currentClient->getCameraClient());
             if (cameraClient->asBinder() == currentCameraClient->asBinder()) {
                 // This is the same client reconnecting...
-                LOGD("CameraService::connect X (pid %d, same client %p) is reconnecting...",
+                LOGV("CameraService::connect X (pid %d, same client %p) is reconnecting...",
                     callingPid, cameraClient->asBinder().get());
                 return currentClient;
             } else {
                 // It's another client... reject it
-                LOGD("CameraService::connect X (pid %d, new client %p) rejected. "
+                LOGV("CameraService::connect X (pid %d, new client %p) rejected. "
                     "(old pid %d, old client %p)",
                     callingPid, cameraClient->asBinder().get(),
                     currentClient->mClientPid, currentCameraClient->asBinder().get());
                 if (kill(currentClient->mClientPid, 0) == -1 && errno == ESRCH) {
-                    LOGD("The old client is dead!");
+                    LOGV("The old client is dead!");
                 }
                 return client;
             }
         } else {
             // can't promote, the previous client has died...
-            LOGD("New client (pid %d) connecting, old reference was dangling...",
+            LOGV("New client (pid %d) connecting, old reference was dangling...",
                     callingPid);
             mClient.clear();
         }
     }
 
     if (mUsers > 0) {
-        LOGD("Still have client, rejected");
+        LOGV("Still have client, rejected");
         return client;
     }
 
@@ -141,7 +140,7 @@ sp<ICamera> CameraService::connect(const sp<ICameraClient>& cameraClient)
     // the refcount.
     client->trackMe(true, true);
 #endif
-    LOGD("CameraService::connect X");
+    LOGV("CameraService::connect X");
     return client;
 }
 
@@ -157,7 +156,7 @@ void CameraService::removeClient(const sp<ICameraClient>& cameraClient)
 
     if (mClient == 0) {
         // This happens when we have already disconnected.
-        LOGD("removeClient (pid %d): already disconnected", callingPid);
+        LOGV("removeClient (pid %d): already disconnected", callingPid);
         return;
     }
 
@@ -165,7 +164,7 @@ void CameraService::removeClient(const sp<ICameraClient>& cameraClient)
     // Client::~Client() -> disconnect() -> removeClient().
     client = mClient.promote();
     if (client == 0) {
-        LOGD("removeClient (pid %d): no more strong reference", callingPid);
+        LOGV("removeClient (pid %d): no more strong reference", callingPid);
         mClient.clear();
         return;
     }
@@ -178,7 +177,7 @@ void CameraService::removeClient(const sp<ICameraClient>& cameraClient)
         mClient.clear();
     }
 
-    LOGD("removeClient (pid %d) done", callingPid);
+    LOGV("removeClient (pid %d) done", callingPid);
 }
 
 // The reason we need this count is a new CameraService::connect() request may
@@ -212,7 +211,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService,
         const sp<ICameraClient>& cameraClient, pid_t clientPid)
 {
     int callingPid = getCallingPid();
-    LOGD("Client::Client E (pid %d)", callingPid);
+    LOGV("Client::Client E (pid %d)", callingPid);
     mCameraService = cameraService;
     mCameraClient = cameraClient;
     mClientPid = clientPid;
@@ -237,7 +236,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService,
     // Callback is disabled by default
     mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP;
     cameraService->incUsers();
-    LOGD("Client::Client X (pid %d)", callingPid);
+    LOGV("Client::Client X (pid %d)", callingPid);
 }
 
 status_t CameraService::Client::checkPid()
@@ -253,7 +252,7 @@ status_t CameraService::Client::checkPid()
 status_t CameraService::Client::lock()
 {
     int callingPid = getCallingPid();
-    LOGD("lock from pid %d (mClientPid %d)", callingPid, mClientPid);
+    LOGV("lock from pid %d (mClientPid %d)", callingPid, mClientPid);
     Mutex::Autolock _l(mLock);
     // lock camera to this client if the the camera is unlocked
     if (mClientPid == 0) {
@@ -267,13 +266,13 @@ status_t CameraService::Client::lock()
 status_t CameraService::Client::unlock()
 {
     int callingPid = getCallingPid();
-    LOGD("unlock from pid %d (mClientPid %d)", callingPid, mClientPid);
+    LOGV("unlock from pid %d (mClientPid %d)", callingPid, mClientPid);
     Mutex::Autolock _l(mLock);
     // allow anyone to use camera
     status_t result = checkPid();
     if (result == NO_ERROR) {
         mClientPid = 0;
-        LOGD("clear mCameraClient (pid %d)", callingPid);
+        LOGV("clear mCameraClient (pid %d)", callingPid);
         // we need to remove the reference so that when app goes
         // away, the reference count goes to 0.
         mCameraClient.clear();
@@ -286,7 +285,7 @@ status_t CameraService::Client::connect(const sp<ICameraClient>& client)
     int callingPid = getCallingPid();
 
     // connect a new process to the camera
-    LOGD("Client::connect E (pid %d, client %p)", callingPid, client->asBinder().get());
+    LOGV("Client::connect E (pid %d, client %p)", callingPid, client->asBinder().get());
 
     // I hate this hack, but things get really ugly when the media recorder
     // service is handing back the camera to the app. The ICameraClient
@@ -310,14 +309,14 @@ status_t CameraService::Client::connect(const sp<ICameraClient>& client)
 
             // did the client actually change?
             if ((mCameraClient != NULL) && (client->asBinder() == mCameraClient->asBinder())) {
-                LOGD("Connect to the same client");
+                LOGV("Connect to the same client");
                 return NO_ERROR;
             }
 
             mCameraClient = client;
             mClientPid = -1;
             mPreviewCallbackFlag = FRAME_CALLBACK_FLAG_NOOP;
-            LOGD("Connect to the new client (pid %d, client %p)",
+            LOGV("Connect to the new client (pid %d, client %p)",
                 callingPid, mCameraClient->asBinder().get());
         }
 
@@ -344,7 +343,7 @@ CameraService::Client::~Client()
     int callingPid = getCallingPid();
 
     // tear down client
-    LOGD("Client::~Client E (pid %d, client %p)",
+    LOGV("Client::~Client E (pid %d, client %p)",
             callingPid, getCameraClient()->asBinder().get());
     if (mSurface != 0 && !mUseOverlay) {
 #if HAVE_ANDROID_OS
@@ -373,23 +372,23 @@ CameraService::Client::~Client()
     // make sure we tear down the hardware
     mClientPid = callingPid;
     disconnect();
-    LOGD("Client::~Client X (pid %d)", mClientPid);
+    LOGV("Client::~Client X (pid %d)", mClientPid);
 }
 
 void CameraService::Client::disconnect()
 {
     int callingPid = getCallingPid();
 
-    LOGD("Client::disconnect() E (pid %d client %p)",
+    LOGV("Client::disconnect() E (pid %d client %p)",
             callingPid, getCameraClient()->asBinder().get());
 
     Mutex::Autolock lock(mLock);
     if (mClientPid <= 0) {
-        LOGD("camera is unlocked (mClientPid = %d), don't tear down hardware", mClientPid);
+        LOGV("camera is unlocked (mClientPid = %d), don't tear down hardware", mClientPid);
         return;
     }
     if (checkPid() != NO_ERROR) {
-        LOGD("Different client - don't disconnect");
+        LOGV("Different client - don't disconnect");
         return;
     }
 
@@ -397,7 +396,7 @@ void CameraService::Client::disconnect()
     // from the user directly, or called by the destructor.
     if (mHardware == 0) return;
 
-    LOGD("hardware teardown");
+    LOGV("hardware teardown");
     // Before destroying mHardware, we must make sure it's in the
     // idle state.
     mHardware->stopPreview();
@@ -421,7 +420,7 @@ void CameraService::Client::disconnect()
     mCameraService->removeClient(mCameraClient);
     mCameraService->decUsers();
 
-    LOGD("Client::disconnect() X (pid %d)", callingPid);
+    LOGV("Client::disconnect() X (pid %d)", callingPid);
 }
 
 // pass the buffered ISurface to the camera service
@@ -805,14 +804,14 @@ static void dump_to_file(const char *fname,
     int nw, cnt = 0;
     uint32_t written = 0;
 
-    LOGD("opening file [%s]\n", fname);
+    LOGV("opening file [%s]\n", fname);
     int fd = open(fname, O_RDWR | O_CREAT);
     if (fd < 0) {
         LOGE("failed to create file [%s]: %s", fname, strerror(errno));
         return;
     }
 
-    LOGD("writing %d bytes to file [%s]\n", size, fname);
+    LOGV("writing %d bytes to file [%s]\n", size, fname);
     while (written < size) {
         nw = ::write(fd,
                      buf + written,
@@ -825,7 +824,7 @@ static void dump_to_file(const char *fname,
         written += nw;
         cnt++;
     }
-    LOGD("done writing %d bytes to file [%s] in %d passes\n",
+    LOGV("done writing %d bytes to file [%s] in %d passes\n",
          size, fname, cnt);
     ::close(fd);
 }
@@ -1189,7 +1188,7 @@ void CameraService::Client::dataCallbackTimestamp(nsecs_t timestamp, int32_t msg
 // set preview/capture parameters - key/value pairs
 status_t CameraService::Client::setParameters(const String8& params)
 {
-    LOGD("setParameters(%s)", params.string());
+    LOGV("setParameters(%s)", params.string());
 
     Mutex::Autolock lock(mLock);
     status_t result = checkPid();
@@ -1215,7 +1214,7 @@ String8 CameraService::Client::getParameters() const
     }
 
     String8 params(mHardware->getParameters().flatten());
-    LOGD("getParameters(%s)", params.string());
+    LOGV("getParameters(%s)", params.string());
     return params;
 }
 
@@ -1327,7 +1326,7 @@ status_t CameraService::onTransact(
     status_t err = BnCameraService::onTransact(code, data, reply, flags);
 
 #if DEBUG_HEAP_LEAKS
-    LOGD("+++ onTransact err %d code %d", err, code);
+    LOGV("+++ onTransact err %d code %d", err, code);
 
     if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) {
         // the 'service' command interrogates this binder for its name, and then supplies it
@@ -1335,7 +1334,7 @@ status_t CameraService::onTransact(
         // ISurfaceComposer (since we delegated the INTERFACE_TRANSACTION handling to
         // BnSurfaceComposer before falling through to this code).
 
-        LOGD("+++ onTransact code %d", code);
+        LOGV("+++ onTransact code %d", code);
 
         CHECK_INTERFACE(ICameraService, data, reply);
 
@@ -1345,13 +1344,13 @@ status_t CameraService::onTransact(
             if (gWeakHeap != 0) {
                 sp<IMemoryHeap> h = gWeakHeap.promote();
                 IMemoryHeap *p = gWeakHeap.unsafe_get();
-                LOGD("CHECKING WEAK REFERENCE %p (%p)", h.get(), p);
+                LOGV("CHECKING WEAK REFERENCE %p (%p)", h.get(), p);
                 if (h != 0)
                     h->printRefs();
                 bool attempt_to_delete = data.readInt32() == 1;
                 if (attempt_to_delete) {
                     // NOT SAFE!
-                    LOGD("DELETING WEAK REFERENCE %p (%p)", h.get(), p);
+                    LOGV("DELETING WEAK REFERENCE %p (%p)", h.get(), p);
                     if (p) delete p;
                 }
                 return NO_ERROR;
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index 236c0fe..a2b5d8d 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -28,7 +28,7 @@
 #include <cutils/sockets.h>
 #include "private/android_filesystem_config.h"
 
-#define LOG_NDEBUG 0
+
 #define LOG_TAG "dumpstate"
 #include <utils/Log.h>
 
diff --git a/core/java/android/hardware/SensorManager.java b/core/java/android/hardware/SensorManager.java
index 01c67cf..0c6bb1a 100644
--- a/core/java/android/hardware/SensorManager.java
+++ b/core/java/android/hardware/SensorManager.java
@@ -545,8 +545,8 @@ public class SensorManager
                     i = sensors_module_get_next_sensor(sensor, i);
 
                     if (i>=0) {
-                        Log.d(TAG, "found sensor: " + sensor.getName() +
-                                ", handle=" + sensor.getHandle());
+                        //Log.d(TAG, "found sensor: " + sensor.getName() +
+                        //        ", handle=" + sensor.getHandle());
                         sensor.setLegacyType(getLegacySensorType(sensor.getType()));
                         fullList.add(sensor);
                         sHandleToSensor.append(sensor.getHandle(), sensor);
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 11463a2..64ee4f0 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -328,7 +328,7 @@ static void android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobj
 static void android_hardware_Camera_release(JNIEnv *env, jobject thiz)
 {
     // TODO: Change to LOGV
-    LOGD("release camera");
+    LOGV("release camera");
     JNICameraContext* context = NULL;
     sp<Camera> camera;
     {
@@ -526,7 +526,7 @@ static void android_hardware_Camera_unlock(JNIEnv *env, jobject thiz)
 
 static void android_hardware_Camera_startSmoothZoom(JNIEnv *env, jobject thiz, jint value)
 {
-    LOGD("startSmoothZoom");
+    LOGV("startSmoothZoom");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
@@ -537,7 +537,7 @@ static void android_hardware_Camera_startSmoothZoom(JNIEnv *env, jobject thiz, j
 
 static void android_hardware_Camera_stopSmoothZoom(JNIEnv *env, jobject thiz)
 {
-    LOGD("stopSmoothZoom");
+    LOGV("stopSmoothZoom");
     sp<Camera> camera = get_native_camera(env, thiz, NULL);
     if (camera == 0) return;
 
diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp
index 3e27978..9a90b72 100644
--- a/core/jni/android_hardware_SensorManager.cpp
+++ b/core/jni/android_hardware_SensorManager.cpp
@@ -16,7 +16,6 @@
 
 #define LOG_TAG "SensorManager"
 
-#define LOG_NDEBUG 0
 #include "utils/Log.h"
 
 #include <hardware/sensors.h>
diff --git a/libs/rs/rsUtils.h b/libs/rs/rsUtils.h
index 07f8933..3c6da68 100644
--- a/libs/rs/rsUtils.h
+++ b/libs/rs/rsUtils.h
@@ -17,7 +17,6 @@
 #ifndef ANDROID_RS_UTILS_H
 #define ANDROID_RS_UTILS_H
 
-#define LOG_NDEBUG 0
 #define LOG_TAG "RenderScript"
 #include <utils/Log.h>
 #include <utils/Vector.h>
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 5c0b7a5..74af9b6 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -23,7 +23,6 @@ import android.os.Looper;
 import android.os.RemoteException;
 import android.os.Handler;
 import android.os.Message;
-import android.util.Config;
 import android.util.Log;
 
 import com.android.internal.location.DummyLocationProvider;
@@ -248,7 +247,7 @@ public class LocationManager {
      * factory Context.getSystemService.
      */
     public LocationManager(ILocationManager service) {
-        if (Config.LOGD) {
+        if (false) {
             Log.d(TAG, "Constructor: service = " + service);
         }
         mService = service;
@@ -277,7 +276,7 @@ public class LocationManager {
      * @return list of Strings containing names of the providers
      */
     public List<String> getAllProviders() {
-        if (Config.LOGD) {
+        if (false) {
             Log.d(TAG, "getAllProviders");
         }
         try {
@@ -829,7 +828,7 @@ public class LocationManager {
         if (listener == null) {
             throw new IllegalArgumentException("listener==null");
         }
-        if (Config.LOGD) {
+        if (false) {
             Log.d(TAG, "removeUpdates: listener = " + listener);
         }
         try {
@@ -854,7 +853,7 @@ public class LocationManager {
         if (intent == null) {
             throw new IllegalArgumentException("intent==null");
         }
-        if (Config.LOGD) {
+        if (false) {
             Log.d(TAG, "removeUpdates: intent = " + intent);
         }
         try {
@@ -909,7 +908,7 @@ public class LocationManager {
      */
     public void addProximityAlert(double latitude, double longitude,
         float radius, long expiration, PendingIntent intent) {
-        if (Config.LOGD) {
+        if (false) {
             Log.d(TAG, "addProximityAlert: latitude = " + latitude +
                 ", longitude = " + longitude + ", radius = " + radius +
                 ", expiration = " + expiration +
@@ -930,7 +929,7 @@ public class LocationManager {
      * proximity alerts
      */
     public void removeProximityAlert(PendingIntent intent) {
-        if (Config.LOGD) {
+        if (false) {
             Log.d(TAG, "removeProximityAlert: intent = " + intent);
         }
         try {
diff --git a/location/java/com/android/internal/location/GpsLocationProvider.java b/location/java/com/android/internal/location/GpsLocationProvider.java
index 7763549..ee56621 100755
--- a/location/java/com/android/internal/location/GpsLocationProvider.java
+++ b/location/java/com/android/internal/location/GpsLocationProvider.java
@@ -41,7 +41,6 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.provider.Settings;
-import android.util.Config;
 import android.util.Log;
 import android.util.SparseIntArray;
 
@@ -69,7 +68,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
 
     private static final String TAG = "GpsLocationProvider";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
     private static final boolean VERBOSE = false;
     
     /**
@@ -377,7 +376,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
     public void updateNetworkState(int state, NetworkInfo info) {
         mNetworkAvailable = (state == LocationProvider.AVAILABLE);
 
-        if (Config.LOGD) {
+        if (DEBUG) {
             Log.d(TAG, "updateNetworkState " + (mNetworkAvailable ? "available" : "unavailable")
                 + " info: " + info);
         }
@@ -498,7 +497,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
      * when the provider is enabled.
      */
     public synchronized void enable() {
-        if (Config.LOGD) Log.d(TAG, "enable");
+        if (DEBUG) Log.d(TAG, "enable");
         if (mEnabled) return;
         mEnabled = native_init();
 
@@ -534,7 +533,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
      * down while the provider is disabled.
      */
     public synchronized void disable() {
-        if (Config.LOGD) Log.d(TAG, "disable");
+        if (DEBUG) Log.d(TAG, "disable");
         if (!mEnabled) return;
 
         mEnabled = false;
@@ -602,7 +601,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
     }
 
     public void setMinTime(long minTime) {
-        if (Config.LOGD) Log.d(TAG, "setMinTime " + minTime);
+        if (DEBUG) Log.d(TAG, "setMinTime " + minTime);
         
         if (minTime >= 0) {
             int interval = (int)(minTime/1000);
@@ -623,7 +622,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
         }
         
         public void binderDied() {
-            if (Config.LOGD) Log.d(TAG, "GPS status listener died");
+            if (DEBUG) Log.d(TAG, "GPS status listener died");
 
             synchronized(mListeners) {
                 mListeners.remove(this);
@@ -721,7 +720,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
     }
 
     private boolean forceTimeInjection() {
-        if (Config.LOGD) Log.d(TAG, "forceTimeInjection");
+        if (DEBUG) Log.d(TAG, "forceTimeInjection");
         if (mNetworkThread != null) {
             mNetworkThread.timeInjectRequest();
             return true;
@@ -797,7 +796,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
         // report time to first fix
         if (mTTFF == 0 && (flags & LOCATION_HAS_LAT_LONG) == LOCATION_HAS_LAT_LONG) {
             mTTFF = (int)(mLastFixTime - mFixRequestTime);
-            if (Config.LOGD) Log.d(TAG, "TTFF: " + mTTFF);
+            if (DEBUG) Log.d(TAG, "TTFF: " + mTTFF);
 
             // notify status listeners
             synchronized(mListeners) {
@@ -1046,7 +1045,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
     }
 
     private void xtraDownloadRequest() {
-        if (Config.LOGD) Log.d(TAG, "xtraDownloadRequest");
+        if (DEBUG) Log.d(TAG, "xtraDownloadRequest");
         if (mNetworkThread != null) {
             mNetworkThread.xtraDownloadRequest();
         }
@@ -1063,7 +1062,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
     		
     		StringBuilder extrasBuf = new StringBuilder();
 
-    		if (Config.LOGD) Log.d(TAG, "sendNiResponse, notifId: " + notificationId +
+    		if (DEBUG) Log.d(TAG, "sendNiResponse, notifId: " + notificationId +
     				", response: " + userResponse);
     		
     		native_send_ni_response(notificationId, userResponse);
@@ -1149,14 +1148,14 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
         }
 
         public void run() {
-            if (Config.LOGD) Log.d(TAG, "GpsEventThread starting");
+            if (DEBUG) Log.d(TAG, "GpsEventThread starting");
             // Exit as soon as disable() is called instead of waiting for the GPS to stop.
             while (mEnabled) {
                 // this will wait for an event from the GPS,
                 // which will be reported via reportLocation or reportStatus
                 native_wait_for_event();
             }
-            if (Config.LOGD) Log.d(TAG, "GpsEventThread exiting");
+            if (DEBUG) Log.d(TAG, "GpsEventThread exiting");
         }
     }
 
@@ -1181,7 +1180,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
         }
 
         public void runLocked() {
-            if (Config.LOGD) Log.d(TAG, "NetworkThread starting");
+            if (DEBUG) Log.d(TAG, "NetworkThread starting");
             
             SntpClient client = new SntpClient();
             GpsXtraDownloader xtraDownloader = null;
@@ -1197,18 +1196,17 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
                     synchronized (this) {
                         try {
                             if (!mNetworkAvailable) {
-                                if (Config.LOGD) Log.d(TAG, 
-                                        "NetworkThread wait for network");
+                                if (DEBUG) Log.d(TAG, "NetworkThread wait for network");
                                 wait();
                             } else if (waitTime > 0) {
-                                if (Config.LOGD) {
+                                if (DEBUG) {
                                     Log.d(TAG, "NetworkThread wait for " +
                                             waitTime + "ms");
                                 }
                                 wait(waitTime);
                             }
                         } catch (InterruptedException e) {
-                            if (Config.LOGD) {
+                            if (DEBUG) {
                                 Log.d(TAG, "InterruptedException in GpsNetworkThread");
                             }
                         }
@@ -1217,12 +1215,11 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
                 } while (!mDone && ((!mXtraDownloadRequested &&
                         !mTimeInjectRequested && waitTime > 0)
                         || !mNetworkAvailable));
-                if (Config.LOGD) Log.d(TAG, "NetworkThread out of wake loop");
-                
+                if (DEBUG) Log.d(TAG, "NetworkThread out of wake loop"); 
                 if (!mDone) {
                     if (mNtpServer != null && 
                             (mTimeInjectRequested || mNextNtpTime <= System.currentTimeMillis())) {
-                        if (Config.LOGD) {
+                        if (DEBUG) {
                             Log.d(TAG, "Requesting time from NTP server " + mNtpServer);
                         }
                         mTimeInjectRequested = false;
@@ -1231,14 +1228,14 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
                             long timeReference = client.getNtpTimeReference();
                             int certainty = (int)(client.getRoundTripTime()/2);
         
-                            if (Config.LOGD) Log.d(TAG, "calling native_inject_time: " + 
+                            if (DEBUG) Log.d(TAG, "calling native_inject_time: " + 
                                     time + " reference: " + timeReference 
                                     + " certainty: " + certainty);
         
                             native_inject_time(time, timeReference, certainty);
                             mNextNtpTime = System.currentTimeMillis() + NTP_INTERVAL;
                         } else {
-                            if (Config.LOGD) Log.d(TAG, "requestTime failed");
+                            if (DEBUG) Log.d(TAG, "requestTime failed");
                             mNextNtpTime = System.currentTimeMillis() + RETRY_INTERVAL;
                         }
                     }
@@ -1249,7 +1246,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
                         mXtraDownloadRequested = false;
                         byte[] data = xtraDownloader.downloadXtraData();
                         if (data != null) {
-                            if (Config.LOGD) {
+                            if (DEBUG) {
                                 Log.d(TAG, "calling native_inject_xtra_data");
                             }
                             native_inject_xtra_data(data, data.length);
@@ -1260,7 +1257,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
                     }
                 }
             }
-            if (Config.LOGD) Log.d(TAG, "NetworkThread exiting");
+            if (DEBUG) Log.d(TAG, "NetworkThread exiting");
         }
         
         synchronized void xtraDownloadRequest() {
@@ -1278,7 +1275,7 @@ public class GpsLocationProvider extends ILocationProvider.Stub {
         }
 
         synchronized void setDone() {
-            if (Config.LOGD) Log.d(TAG, "stopping NetworkThread");
+            if (DEBUG) Log.d(TAG, "stopping NetworkThread");
             mDone = true;
             notify();
         }
diff --git a/packages/TtsService/jni/android_tts_SynthProxy.cpp b/packages/TtsService/jni/android_tts_SynthProxy.cpp
index 0ec8dab..17ece04 100644
--- a/packages/TtsService/jni/android_tts_SynthProxy.cpp
+++ b/packages/TtsService/jni/android_tts_SynthProxy.cpp
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#define LOG_NDEBUG 0
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/services/jni/com_android_server_SensorService.cpp b/services/jni/com_android_server_SensorService.cpp
index 3911d1f..77db6da 100644
--- a/services/jni/com_android_server_SensorService.cpp
+++ b/services/jni/com_android_server_SensorService.cpp
@@ -16,7 +16,6 @@
 
 #define LOG_TAG "SensorService"
 
-#define LOG_NDEBUG 0
 #include "utils/Log.h"
 
 #include <hardware/sensors.h>