diff options
| author | Xin Li <delphij@google.com> | 2018-08-07 16:51:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 16:51:26 +0000 |
| commit | 3a6cc4e2baf8ac1f073a337dbfcdb21836b67ff4 (patch) | |
| tree | 72b5e02633c3fc4f70c4c682dc85a033fbf4a571 | |
| parent | 6a4100812002d597ce40cbeddb8be4e9a00f517d (diff) | |
| parent | 1370c1fb215451d8eb1435de68bffec6de14bd81 (diff) | |
| download | PartnerBookmarksProvider-3a6cc4e2baf8ac1f073a337dbfcdb21836b67ff4.tar.gz | |
Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | proguard.flags | 4 | ||||
| -rw-r--r-- | tests/AndroidManifest.xml | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -24,6 +24,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 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> |