commit 071313e8b55e1ac3349d4f405ffff37b2ae2feb0
author Daichi Hirono <hirono@google.com> Fri Mar 18 17:34:29 2016 +0900
committer Daichi Hirono <hirono@google.com> Tue Mar 22 13:46:52 2016 +0900
tree 76da95ffdbb08fdba47e231e4e7d5c5926e503d7
parent b3383fdac0a6e1419541985f5880f632a0c6bfee

Don't map root documents in DocumentLoader.

Root documents must be added by RootScanner.
Previously DocumentLoader unintentionally tries to load unmapped root
documents, which causes crash.

BUG=27731902

Change-Id: I8674473d80d6e7f758f6636d30148f5d2118bc25

packages/MtpDocumentsProvider/Android.mk

diff --git a/packages/MtpDocumentsProvider/Android.mk b/packages/MtpDocumentsProvider/Android.mk
index b31b0b1..0f945ee 100644
--- a/packages/MtpDocumentsProvider/Android.mk
+++ b/packages/MtpDocumentsProvider/Android.mk
@@ -9,5 +9,10 @@
 LOCAL_JNI_SHARED_LIBRARIES := libappfuse_jni
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+# Only enable asserts on userdebug/eng builds
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+LOCAL_JACK_FLAGS += -D jack.assert.policy=enable
+endif
+
 include $(BUILD_PACKAGE)
 include $(call all-makefiles-under, $(LOCAL_PATH))