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

Commit 20dfb82f authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 7490efb9: am 2e4c179b: Merge "Add hwp MIME type to transfer/receive over bluetooth" 

* commit '7490efb9':
  Add hwp MIME type to transfer/receive over bluetooth
parents d203878e 7490efb9

android/app/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ 
                <data android:mimeType="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" />

                <data android:mimeType="application/vnd.openxmlformats-officedocument.wordprocessingml.document" />

                <data android:mimeType="application/vnd.openxmlformats-officedocument.presentationml.presentation" />

                <data android:mimeType="application/x-hwp" />

            </intent-filter>

            <intent-filter>

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

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

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ public class Constants { 
        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",

        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",

        "application/vnd.openxmlformats-officedocument.presentationml.presentation",

        "application/x-hwp",

    };



    /**