auto import from //branches/cupcake/...@126645

9 files changed, 27 insertions, 14 deletions

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index c074b69..32c3a54 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -119,6 +119,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/android/graphics \
 	$(call include-path-for, bluedroid) \
 	$(call include-path-for, libhardware)/hardware \
+	$(call include-path-for, libhardware_legacy)/hardware_legacy \
 	$(LOCAL_PATH)/../../include/ui \
 	$(LOCAL_PATH)/../../include/utils \
 	external/skia/include/core \
@@ -147,6 +148,7 @@ LOCAL_SHARED_LIBRARIES := \
 	libdvm \
 	libGLES_CM \
 	libhardware \
+	libhardware_legacy \
 	libsonivox \
 	libcrypto \
 	libssl \
@@ -167,6 +169,9 @@ endif
 ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += \
 	libdl
+  # we need to access the private Bionic header
+  # <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
+  LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../bionic/libc/private
 endif
 
 LOCAL_LDLIBS += -lpthread -ldl
diff --git a/core/jni/android_database_SQLiteStatement.cpp b/core/jni/android_database_SQLiteStatement.cpp
index b615895..ff2ed5d 100644
--- a/core/jni/android_database_SQLiteStatement.cpp
+++ b/core/jni/android_database_SQLiteStatement.cpp
@@ -59,7 +59,7 @@ static void native_execute(JNIEnv* env, jobject object)
 
     // Throw an exception if an error occured
     if (err != SQLITE_DONE) {
-        throw_sqlite3_exception_errcode(env, err, NULL);
+        throw_sqlite3_exception_errcode(env, err, sqlite3_errmsg(handle));
     }
 
     // Reset the statment so it's ready to use again
@@ -81,7 +81,7 @@ static jlong native_1x1_long(JNIEnv* env, jobject object)
         // No errors, read the data and return it
         value = sqlite3_column_int64(statement, 0);
     } else {
-        throw_sqlite3_exception_errcode(env, err, NULL);
+        throw_sqlite3_exception_errcode(env, err, sqlite3_errmsg(handle));
     }
 
     // Reset the statment so it's ready to use again
@@ -106,7 +106,7 @@ static jstring native_1x1_string(JNIEnv* env, jobject object)
         char const * text = (char const *)sqlite3_column_text(statement, 0);
         value = env->NewStringUTF(text);
     } else {
-        throw_sqlite3_exception_errcode(env, err, NULL);
+        throw_sqlite3_exception_errcode(env, err, sqlite3_errmsg(handle));
     }
 
     // Reset the statment so it's ready to use again
diff --git a/core/jni/android_location_GpsLocationProvider.cpp b/core/jni/android_location_GpsLocationProvider.cpp
index 264cc51..dee3fdd 100644
--- a/core/jni/android_location_GpsLocationProvider.cpp
+++ b/core/jni/android_location_GpsLocationProvider.cpp
@@ -18,7 +18,7 @@
 
 #include "JNIHelp.h"
 #include "jni.h"
-#include "hardware/gps.h"
+#include "hardware_legacy/gps.h"
 #include "utils/Log.h"
 #include "utils/misc.h"
 
diff --git a/core/jni/android_os_Hardware.cpp b/core/jni/android_os_Hardware.cpp
index a302498..bc8af78 100644
--- a/core/jni/android_os_Hardware.cpp
+++ b/core/jni/android_os_Hardware.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
 */
 
-#include <hardware/flashlight.h>
-#include <hardware/led.h>
-#include <hardware/power.h>
+#include <hardware_legacy/flashlight.h>
+#include <hardware_legacy/led.h>
+#include <hardware_legacy/power.h>
 
 #include <nativehelper/jni.h>
 #include <android_runtime/AndroidRuntime.h>
diff --git a/core/jni/android_os_Power.cpp b/core/jni/android_os_Power.cpp
index 4e70f63..c2d75b1 100644
--- a/core/jni/android_os_Power.cpp
+++ b/core/jni/android_os_Power.cpp
@@ -19,7 +19,7 @@
 #include "jni.h"
 #include "android_runtime/AndroidRuntime.h"
 #include <utils/misc.h>
-#include <hardware/power.h>
+#include <hardware_legacy/power.h>
 #include <sys/reboot.h>
 
 namespace android
diff --git a/core/jni/android_os_UEventObserver.cpp b/core/jni/android_os_UEventObserver.cpp
index cac4372..7f31b00 100644
--- a/core/jni/android_os_UEventObserver.cpp
+++ b/core/jni/android_os_UEventObserver.cpp
@@ -17,7 +17,7 @@
 #define LOG_TAG "UEventObserver"
 #include "utils/Log.h"
 
-#include "hardware/uevent.h"
+#include "hardware_legacy/uevent.h"
 #include "jni.h"
 #include "JNIHelp.h"
 #include "android_runtime/AndroidRuntime.h"
diff --git a/core/jni/android_server_BluetoothA2dpService.cpp b/core/jni/android_server_BluetoothA2dpService.cpp
index 19ed39f..062f893 100644
--- a/core/jni/android_server_BluetoothA2dpService.cpp
+++ b/core/jni/android_server_BluetoothA2dpService.cpp
@@ -270,11 +270,18 @@ static void onDisconnectSinkResult(DBusMessage *msg, void *user) {
     if (dbus_set_error_from_message(&err, msg)) {
         /* if (!strcmp(err.name, BLUEZ_DBUS_BASE_IFC ".Error.AuthenticationFailed")) */
         LOGE("%s: D-Bus error: %s (%s)\n", __FUNCTION__, err.name, err.message);
+        if (strcmp(err.name, "org.bluez.Error.NotConnected") == 0) {
+            // we were already disconnected, so report disconnect
+            env->CallVoidMethod(nat->me,
+                                method_onSinkDisconnected,
+                                env->NewStringUTF(c_path));
+        } else {
+            // Assume it is still connected
+            env->CallVoidMethod(nat->me,
+                                method_onSinkConnected,
+                                env->NewStringUTF(c_path));
+        }
         dbus_error_free(&err);
-        // Assume it is still connected
-        env->CallVoidMethod(nat->me,
-                            method_onSinkConnected,
-                            env->NewStringUTF(c_path));
         if (env->ExceptionCheck()) {
             LOGE("VM Exception occurred in native function %s (%s:%d)",
                  __FUNCTION__, __FILE__, __LINE__);
diff --git a/core/jni/server/Android.mk b/core/jni/server/Android.mk
index bd08da3..2f48edf 100644
--- a/core/jni/server/Android.mk
+++ b/core/jni/server/Android.mk
@@ -16,6 +16,7 @@ LOCAL_C_INCLUDES += \
 LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	libhardware \
+	libhardware_legacy \
 	libnativehelper \
     libsystem_server \
 	libutils \
diff --git a/core/jni/server/com_android_server_HardwareService.cpp b/core/jni/server/com_android_server_HardwareService.cpp
index 479e57d..224ab18 100644
--- a/core/jni/server/com_android_server_HardwareService.cpp
+++ b/core/jni/server/com_android_server_HardwareService.cpp
@@ -23,7 +23,7 @@
 #include "android_runtime/AndroidRuntime.h"
 #include <utils/misc.h>
 #include <utils/Log.h>
-#include <hardware/vibrator.h>
+#include <hardware_legacy/vibrator.h>
 
 namespace android
 {