Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION where possible." am: 6a41008120 am: e2183c2f7e
am: ac8bb2648d -s ours
Change-Id: I57ffbfae97d937b9d037d2c3964c4f7a133bf95f
diff --git a/Android.mk b/Android.mk
index 100cfcb..b85a651 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,6 +24,7 @@
LOCAL_PACKAGE_NAME := PartnerBookmarksProvider
LOCAL_SDK_VERSION := current
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
include $(BUILD_PACKAGE)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 46dc555..cdc215c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,7 +20,7 @@
<!-- We add an application tag here just to indicate the authorities -->
<application>
<provider android:name="PartnerBookmarksProvider"
- android:authorities="com.android.partnerbookmarks" />
+ android:authorities="com.android.partnerbookmarks"
+ android:exported="true" />
</application>
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
</manifest>
diff --git a/proguard.flags b/proguard.flags
new file mode 100644
index 0000000..07aad51
--- /dev/null
+++ b/proguard.flags
@@ -0,0 +1,4 @@
+# Needed for tests
+-keep class com.android.providers.partnerbookmarks.PartnerBookmarksContract$Bookmarks {
+ *;
+}
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 6e6ba14..40d8196 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -32,6 +32,4 @@
<instrumentation android:name="android.test.InstrumentationTestRunner"
android:targetPackage="com.android.providers.partnerbookmarks"
android:label="partner bookmarks provider tests"/>
-
- <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
</manifest>
