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

Commit 2585ce5d authored by Felix Bechstein's avatar Felix Bechstein Committed by Ricardo Cerqueira
Browse files

Fix profile's xml 

Patch Set 1:
Fix parsing profile's xml for airplane mode and ring mode.
Reading the xml used to turn all settings below airplane mode and ring mode to default.

Patch Set 2:
Rebase
Clean up

Patch Set 3+4:
Rebase

Change-Id: I902318fd4db82bb628e0d157c48c4e86ba30cf71
parent 09764a46

core/java/android/app/AirplaneModeSettings.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -85,19 +85,19 @@ public final class AirplaneModeSettings implements Parcelable { 
    public static AirplaneModeSettings fromXml(XmlPullParser xpp, Context context)

    public static AirplaneModeSettings fromXml(XmlPullParser xpp, Context context)

            throws XmlPullParserException, IOException {

            throws XmlPullParserException, IOException {

        int event = xpp.next();

        int event = xpp.next();

        AirplaneModeSettings connectionDescriptor = new AirplaneModeSettings();

        AirplaneModeSettings airplaneModeDescriptor = new AirplaneModeSettings();

        while (event != XmlPullParser.END_TAG) {

        while (event != XmlPullParser.END_TAG || !xpp.getName().equals("airplaneModeDescriptor")) {

            if (event == XmlPullParser.START_TAG) {

            if (event == XmlPullParser.START_TAG) {

                String name = xpp.getName();

                String name = xpp.getName();

                if (name.equals("value")) {

                if (name.equals("value")) {

                    connectionDescriptor.mValue = Integer.parseInt(xpp.nextText());

                    airplaneModeDescriptor.mValue = Integer.parseInt(xpp.nextText());

                } else if (name.equals("override")) {

                } else if (name.equals("override")) {

                    connectionDescriptor.mOverride = Boolean.parseBoolean(xpp.nextText());

                    airplaneModeDescriptor.mOverride = Boolean.parseBoolean(xpp.nextText());

                }

                }

            }

            }

            event = xpp.next();

            event = xpp.next();

        }

        }

        return connectionDescriptor;

        return airplaneModeDescriptor;

    }

    }





    /** @hide */

    /** @hide */

core/java/android/app/RingModeSettings.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -87,19 +87,19 @@ public final class RingModeSettings implements Parcelable { 
    public static RingModeSettings fromXml(XmlPullParser xpp, Context context)

    public static RingModeSettings fromXml(XmlPullParser xpp, Context context)

            throws XmlPullParserException, IOException {

            throws XmlPullParserException, IOException {

        int event = xpp.next();

        int event = xpp.next();

        RingModeSettings connectionDescriptor = new RingModeSettings();

        RingModeSettings ringModeDescriptor = new RingModeSettings();

        while (event != XmlPullParser.END_TAG) {

        while (event != XmlPullParser.END_TAG || !xpp.getName().equals("ringModeDescriptor")) {

            if (event == XmlPullParser.START_TAG) {

            if (event == XmlPullParser.START_TAG) {

                String name = xpp.getName();

                String name = xpp.getName();

                if (name.equals("value")) {

                if (name.equals("value")) {

                    connectionDescriptor.mValue = xpp.nextText();

                    ringModeDescriptor.mValue = xpp.nextText();

                } else if (name.equals("override")) {

                } else if (name.equals("override")) {

                    connectionDescriptor.mOverride = Boolean.parseBoolean(xpp.nextText());

                    ringModeDescriptor.mOverride = Boolean.parseBoolean(xpp.nextText());

                }

                }

            }

            }

            event = xpp.next();

            event = xpp.next();

        }

        }

        return connectionDescriptor;

        return ringModeDescriptor;

    }

    }





    /** @hide */

    /** @hide */