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

Commit 8bbf0b85 authored by Simon Sickle's avatar Simon Sickle
Browse files

Fixing gingerbread compiling and mms for non VM carriers 

This commit broke compiling http://review.cyanogenmod.com/#/c/20475/
I didnt realize i missed some aspects that were left in from ics and fixed
those back and added in the code, in a more os consientious way. Without this
patch GB will not compile

Change-Id: I1a8585755e5d8d9714224ce765b6579108af1a83
parent 40423f1d

telephony/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

+23 −29
Original line number Diff line number Diff line
@@ -207,16 +207,7 @@ final class CdmaSMSDispatcher extends SMSDispatcher { 
                    // The message was sent to a port, so concoct a URI for it.

                    dispatchPortAddressedPdus(pdus, smsHeader.portAddrs.destPort);

                }

            } else {

                // Normal short and non-port-addressed message, dispatch it.

                dispatchPdus(pdus);

            }

            return Activity.RESULT_OK;

        } else {

            // Process the message part.

            return processMessagePart(sms, smsHeader.concatRef, smsHeader.portAddrs);

        }



           /*

            * Check to see if we have a Virgin Mobile MMS

            * If so, do extra processsing for Virgin Mobile's non-standard format.
@@ -238,8 +229,15 @@ final class CdmaSMSDispatcher extends SMSDispatcher { 
                    } catch (Exception ourException) {

                        Log.e(TAG, "Got an exception trying to get VMUS MMS data " + ourException);

            }

            } else {

                // Normal short and non-port-addressed message, dispatch it.

                dispatchPdus(pdus);

            }

            return Activity.RESULT_OK;

        } else {

            // Process the message part.

            return processMessagePart(sms, smsHeader.concatRef, smsHeader.portAddrs);

        }

        return dispatchNormalMessage(smsb);

    }



    private synchronized byte[] getVirginMMS(final byte[] someEncodedMMSData, int[] aMessageRef) throws Exception {
@@ -265,10 +263,6 @@ final class CdmaSMSDispatcher extends SMSDispatcher { 
            for (int j1 = 0; j1 < i1; j1++) {

                abyte1[j1] = 0;

            }









            desiredBitLength = i1 * 8;

            if (ourInputStream.available() < desiredBitLength) {

                int availableBitLength = ourInputStream.available();