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

Commit 539b089a authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am e0a2eeee: Merge "The phone did not reject unsupported vCalendar item" 

* commit 'e0a2eeee':
  The phone did not reject unsupported vCalendar item
parents bf08dcb3 e0a2eeee

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

+6 −3
Original line number Diff line number Diff line
@@ -230,10 +230,13 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen 
            }



            // Reject policy: anything outside the "white list" plus unspecified

            // MIME Types.

            // MIME Types. Also reject everything in the "black list".

            if (!pre_reject

                    && (mimeType == null || (!Constants.mimeTypeMatches(mimeType,

                            Constants.ACCEPTABLE_SHARE_INBOUND_TYPES)))) {

                    && (mimeType == null

                            || !Constants.mimeTypeMatches(mimeType,

                                    Constants.ACCEPTABLE_SHARE_INBOUND_TYPES)

                            || Constants.mimeTypeMatches(mimeType,

                                    Constants.UNACCEPTABLE_SHARE_INBOUND_TYPES))) {

                if (D) Log.w(TAG, "mimeType is null or in unacceptable list, reject the transfer");

                pre_reject = true;

                obexResponse = ResponseCodes.OBEX_HTTP_UNSUPPORTED_TYPE;