Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e11c12b authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Add activity, file paths and fileProvider to manifest (AOSP)" into nyc-dev

parents eadf3152 4cae6757
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -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>

res/xml/file_paths.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line
<?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>