am adb527a9: Make the NDEF intent creation more robust.
* commit 'adb527a9ce286d019d766a3b207a2251dea89bd1':
Make the NDEF intent creation more robust.
diff --git a/Android.mk b/Android.mk
index b5ae045..e5b93b5 100755
--- a/Android.mk
+++ b/Android.mk
@@ -12,6 +12,8 @@
LOCAL_PROGUARD_ENABLED := disabled
-include $(BUILD_PACKAGE)
+# dont build in master
+# temporary
+#include $(BUILD_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
+#include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/res/drawable-hdpi/bt_incomming_file_notification.png b/res/drawable-hdpi/bt_incomming_file_notification.png
deleted file mode 100755
index 2df6960..0000000
--- a/res/drawable-hdpi/bt_incomming_file_notification.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/bt_share.png b/res/drawable-hdpi/bt_share.png
deleted file mode 100644
index 671312d..0000000
--- a/res/drawable-hdpi/bt_share.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_launcher_folder_bluetooth.png b/res/drawable-hdpi/ic_launcher_folder_bluetooth.png
deleted file mode 100644
index 78c56b7..0000000
--- a/res/drawable-hdpi/ic_launcher_folder_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
index 671312d..bf35e9c 100644
--- a/res/drawable-hdpi/icon.png
+++ b/res/drawable-hdpi/icon.png
Binary files differ
diff --git a/res/drawable-hdpi/stat_sys_nfc.png b/res/drawable-hdpi/stat_sys_nfc.png
deleted file mode 100644
index 87f22b0..0000000
--- a/res/drawable-hdpi/stat_sys_nfc.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bt_incomming_file_notification.png b/res/drawable-mdpi/bt_incomming_file_notification.png
deleted file mode 100644
index 8d3f555..0000000
--- a/res/drawable-mdpi/bt_incomming_file_notification.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/bt_share.png b/res/drawable-mdpi/bt_share.png
deleted file mode 100644
index fc98b55..0000000
--- a/res/drawable-mdpi/bt_share.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_launcher_folder_bluetooth.png b/res/drawable-mdpi/ic_launcher_folder_bluetooth.png
deleted file mode 100644
index c22315d..0000000
--- a/res/drawable-mdpi/ic_launcher_folder_bluetooth.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
index fc98b55..7f9b9ce 100644
--- a/res/drawable-mdpi/icon.png
+++ b/res/drawable-mdpi/icon.png
Binary files differ
diff --git a/res/drawable-mdpi/stat_sys_nfc.png b/res/drawable-mdpi/stat_sys_nfc.png
deleted file mode 100644
index ce89ee7..0000000
--- a/res/drawable-mdpi/stat_sys_nfc.png
+++ /dev/null
Binary files differ
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 9b4fd3a..9454b72 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -2723,13 +2723,13 @@
// NFC stack wedges. This is *not* the correct way to fix this issue -
// configuration of the local NFC adapter should be very quick and should
// be safe on the main thread, and the NFC stack should not wedge.
- new EnableDisableDiscoveryTask().execute(new Boolean(true));
+ new EnableDisableDiscoveryTask().execute(Boolean.TRUE);
} else if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) {
// Perform discovery disable in thread to protect against ANR when the
// NFC stack wedges. This is *not* the correct way to fix this issue -
// configuration of the local NFC adapter should be very quick and should
// be safe on the main thread, and the NFC stack should not wedge.
- new EnableDisableDiscoveryTask().execute(new Boolean(false));
+ new EnableDisableDiscoveryTask().execute(Boolean.FALSE);
}
}
};
