am 532ae779: Revert "Allow _DELETE_FILE trigger to delete files in /data/media"
* commit '532ae77972f66feecc96ae31b771cf6f68fd6556':
Revert "Allow _DELETE_FILE trigger to delete files in /data/media"
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp
index 5cc39d8..34e08b4 100644
--- a/android/sqlite3_android.cpp
+++ b/android/sqlite3_android.cpp
@@ -26,7 +26,6 @@
#include <unicode/ustring.h>
#include <unicode/utypes.h>
#include <cutils/log.h>
-#include <cutils/properties.h>
#include "sqlite3_android.h"
#include "PhoneNumberUtils.h"
@@ -213,17 +212,13 @@
}
char const * path = (char const *)sqlite3_value_text(argv[0]);
- char media_storage[PROPERTY_VALUE_MAX];
char const * external_storage = getenv("EXTERNAL_STORAGE");
- if (path == NULL) {
+ if (path == NULL || external_storage == NULL) {
sqlite3_result_null(context);
return;
}
- property_get("ro.media.storage", media_storage, "");
- // path must match either ro.media.storage or EXTERNAL_STORAGE directory
- if ( !(media_storage[0] && strncmp(media_storage, path, strlen(media_storage)) == 0) &&
- !(external_storage && strncmp(external_storage, path, strlen(external_storage)) == 0)) {
+ if (strncmp(external_storage, path, strlen(external_storage)) != 0) {
sqlite3_result_null(context);
return;
}
diff --git a/dist/Android.mk b/dist/Android.mk
index 3a666cc..7537b0d 100644
--- a/dist/Android.mk
+++ b/dist/Android.mk
@@ -34,8 +34,7 @@
LOCAL_SHARED_LIBRARIES += liblog \
libicuuc \
libicui18n \
- libutils \
- libcutils
+ libutils
# include android specific methods
LOCAL_WHOLE_STATIC_LIBRARIES := libsqlite3_android
