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

Commit 75ed3cda authored by Austen Dicken's avatar Austen Dicken
Browse files

fix some dupes with wimax defines 

Change-Id: Iab6718e6b4376d28ca8934bd3ebb5a6562eaf1d5
parent 69e15d14

core/java/android/provider/Settings.java

+0 −6
Original line number Diff line number Diff line
@@ -1128,12 +1128,6 @@ public final class Settings { 
         */

        public static final String RADIO_CELL = "cell";



        /**

         * Constant for use in AIRPLANE_MODE_RADIOS to specify WiMAX radio.

         * @hide

         */

        public static final String RADIO_WIMAX = "wimax";



        /**

         * A comma separated list of radios that need to be disabled when airplane mode

         * is on. This overrides WIFI_ON and BLUETOOTH_ON, if Wi-Fi and bluetooth are

core/java/com/google/android/mms/pdu/PduParser.java

+4 −4
Original line number Diff line number Diff line
@@ -1603,11 +1603,11 @@ public class PduParser { 
                                .android.internal.R.bool.config_mms_content_disposition_support);



                        if (contentDisposition) {

                            int len = parseValueLength(pduDataStream);

                            len = parseValueLength(pduDataStream);

                            pduDataStream.mark(1);

                            int thisStartPos = pduDataStream.available();

                            int thisEndPos = 0;

                            int value = pduDataStream.read();

                            thisStartPos = pduDataStream.available();

                            thisEndPos = 0;

                            value = pduDataStream.read();



                            if (value == PduPart.P_DISPOSITION_FROM_DATA ) {

                                part.setContentDisposition(PduPart.DISPOSITION_FROM_DATA);