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

Commit 28a9fb6d authored by Tao Liejun's avatar Tao Liejun Committed by Android Git Automerger
Browse files

am 49af26f2: Merge change Ifb8562d3 into eclair-mr2 

Merge commit '49af26f2' into eclair-mr2-plus-aosp

* commit '49af26f2':
  Add a few specific file type support
parents f8c0e31f 49af26f2

android/app/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -41,6 +41,13 @@ 
                <data android:mimeType="image/*" />

                <data android:mimeType="video/*" />

                <data android:mimeType="audio/*" />

                <data android:mimeType="text/plain" />

                <data android:mimeType="text/html" />

                <data android:mimeType="application/zip" />

                <data android:mimeType="application/vnd.ms-excel" />

                <data android:mimeType="application/msword" />

                <data android:mimeType="application/vnd.ms-powerpoint" />

                <data android:mimeType="application/pdf" />

            </intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.SEND_MULTIPLE" />

android/app/src/com/android/bluetooth/opp/Constants.java

+5 −0
Original line number Diff line number Diff line
@@ -116,6 +116,11 @@ public class Constants { 
        "audio/*",

        "text/plain",

        "text/html",

        "application/zip",

        "application/vnd.ms-excel",

        "application/msword",

        "application/vnd.ms-powerpoint",

        "application/pdf",

    };



    /**