diff options
| author | Wenyi Wang <wenyiw@google.com> | 2016-02-20 01:49:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-20 01:49:02 +0000 |
| commit | 818f642b61df0cc910182c12a461f357732b0d38 (patch) | |
| tree | 27c2045d4590eb8751221fa162be0b51384242b4 | |
| parent | 8dd874e739061d0ac1111c6bbdfd3cd1f890e5ed (diff) | |
| parent | 0e11c12b05402e8197cde20c0a0d376f92e57c69 (diff) | |
Merge "Add activity, file paths and fileProvider to manifest (AOSP)" into nyc-dev
am: 0e11c12b05
* commit '0e11c12b05402e8197cde20c0a0d376f92e57c69':
Add activity, file paths and fileProvider to manifest (AOSP)
| -rw-r--r-- | AndroidManifest.xml | 13 | ||||
| -rw-r--r-- | res/xml/file_paths.xml | 20 |
2 files changed, 33 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 777faa3a5..3d043575f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -245,6 +245,9 @@ <activity android:name="com.android.contacts.common.vcard.ExportVCardActivity" android:theme="@style/BackgroundOnlyTheme"/> + <activity android:name="com.android.contacts.common.vcard.ShareVCardActivity" + android:theme="@style/BackgroundOnlyTheme" /> + <service android:name="com.android.contacts.common.vcard.VCardService" android:exported="false"/> @@ -329,5 +332,15 @@ android:exported="false" android:multiprocess="false" /> + + <provider + android:name="android.support.v4.content.FileProvider" + android:authorities="@string/contacts_file_provider_authority" + android:grantUriPermissions="true" + android:exported="false"> + <meta-data + android:name="android.support.FILE_PROVIDER_PATHS" + android:resource="@xml/file_paths" /> + </provider> </application> </manifest> diff --git a/res/xml/file_paths.xml b/res/xml/file_paths.xml new file mode 100644 index 000000000..45caed283 --- /dev/null +++ b/res/xml/file_paths.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2016 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<paths xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- Offer access to files under Context.getCacheDir() --> + <cache-path name="my_cache" /> +</paths> |