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

Commit ac8bb39d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 527b2578: am 9da8c37a: Merge "Move XML utility methods into shared location." into jb-mr2-dev 

* commit '527b2578':
  Move XML utility methods into shared location.
parents d6e7a2b4 527b2578

core/java/com/android/internal/util/XmlUtils.java

+41 −4
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.internal.util;

package com.android.internal.util;





import android.util.Xml;





import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;

import org.xmlpull.v1.XmlPullParserException;
@@ -24,6 +25,7 @@ import org.xmlpull.v1.XmlSerializer; 
import java.io.IOException;

import java.io.IOException;

import java.io.InputStream;

import java.io.InputStream;

import java.io.OutputStream;

import java.io.OutputStream;

import java.net.ProtocolException;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashMap;

import java.util.HashSet;

import java.util.HashSet;
@@ -32,11 +34,8 @@ import java.util.List; 
import java.util.Map;

import java.util.Map;

import java.util.Set;

import java.util.Set;





import android.util.Xml;



/** {@hide} */

/** {@hide} */

public class XmlUtils

public class XmlUtils {

{





    public static void skipCurrentTag(XmlPullParser parser)

    public static void skipCurrentTag(XmlPullParser parser)

            throws XmlPullParserException, IOException {

            throws XmlPullParserException, IOException {
@@ -900,4 +899,42 @@ public class XmlUtils 
            }

            }

        }

        }

    }

    }



    public static int readIntAttribute(XmlPullParser in, String name) throws IOException {

        final String value = in.getAttributeValue(null, name);

        try {

            return Integer.parseInt(value);

        } catch (NumberFormatException e) {

            throw new ProtocolException("problem parsing " + name + "=" + value + " as int");

        }

    }



    public static void writeIntAttribute(XmlSerializer out, String name, int value)

            throws IOException {

        out.attribute(null, name, Integer.toString(value));

    }



    public static long readLongAttribute(XmlPullParser in, String name) throws IOException {

        final String value = in.getAttributeValue(null, name);

        try {

            return Long.parseLong(value);

        } catch (NumberFormatException e) {

            throw new ProtocolException("problem parsing " + name + "=" + value + " as long");

        }

    }



    public static void writeLongAttribute(XmlSerializer out, String name, long value)

            throws IOException {

        out.attribute(null, name, Long.toString(value));

    }



    public static boolean readBooleanAttribute(XmlPullParser in, String name) {

        final String value = in.getAttributeValue(null, name);

        return Boolean.parseBoolean(value);

    }



    public static void writeBooleanAttribute(XmlSerializer out, String name, boolean value)

            throws IOException {

        out.attribute(null, name, Boolean.toString(value));

    }

}
 
}

services/java/com/android/server/net/NetworkPolicyManagerService.java

+6 −47
Original line number Original line Diff line number Diff line
@@ -63,13 +63,13 @@ import static android.telephony.TelephonyManager.SIM_STATE_READY; 
import static android.text.format.DateUtils.DAY_IN_MILLIS;

import static android.text.format.DateUtils.DAY_IN_MILLIS;

import static com.android.internal.util.ArrayUtils.appendInt;

import static com.android.internal.util.ArrayUtils.appendInt;

import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.internal.util.XmlUtils.readBooleanAttribute;

import static com.android.internal.util.XmlUtils.readIntAttribute;

import static com.android.internal.util.XmlUtils.readLongAttribute;

import static com.android.internal.util.XmlUtils.writeBooleanAttribute;

import static com.android.internal.util.XmlUtils.writeIntAttribute;

import static com.android.internal.util.XmlUtils.writeLongAttribute;

import static com.android.server.NetworkManagementService.LIMIT_GLOBAL_ALERT;

import static com.android.server.NetworkManagementService.LIMIT_GLOBAL_ALERT;

import static com.android.server.net.NetworkPolicyManagerService.XmlUtils.readBooleanAttribute;

import static com.android.server.net.NetworkPolicyManagerService.XmlUtils.readIntAttribute;

import static com.android.server.net.NetworkPolicyManagerService.XmlUtils.readLongAttribute;

import static com.android.server.net.NetworkPolicyManagerService.XmlUtils.writeBooleanAttribute;

import static com.android.server.net.NetworkPolicyManagerService.XmlUtils.writeIntAttribute;

import static com.android.server.net.NetworkPolicyManagerService.XmlUtils.writeLongAttribute;

import static com.android.server.net.NetworkStatsService.ACTION_NETWORK_STATS_UPDATED;

import static com.android.server.net.NetworkStatsService.ACTION_NETWORK_STATS_UPDATED;

import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;

import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;

import static org.xmlpull.v1.XmlPullParser.START_TAG;

import static org.xmlpull.v1.XmlPullParser.START_TAG;
@@ -149,7 +149,6 @@ import java.io.FileNotFoundException; 
import java.io.FileOutputStream;

import java.io.FileOutputStream;

import java.io.IOException;

import java.io.IOException;

import java.io.PrintWriter;

import java.io.PrintWriter;

import java.net.ProtocolException;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;

import java.util.HashMap;

import java.util.HashMap;
@@ -2088,44 +2087,4 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        }

        }

        fout.print("]");

        fout.print("]");

    }

    }



    public static class XmlUtils {

        public static int readIntAttribute(XmlPullParser in, String name) throws IOException {

            final String value = in.getAttributeValue(null, name);

            try {

                return Integer.parseInt(value);

            } catch (NumberFormatException e) {

                throw new ProtocolException("problem parsing " + name + "=" + value + " as int");

            }

        }



        public static void writeIntAttribute(XmlSerializer out, String name, int value)

                throws IOException {

            out.attribute(null, name, Integer.toString(value));

        }



        public static long readLongAttribute(XmlPullParser in, String name) throws IOException {

            final String value = in.getAttributeValue(null, name);

            try {

                return Long.parseLong(value);

            } catch (NumberFormatException e) {

                throw new ProtocolException("problem parsing " + name + "=" + value + " as long");

            }

        }



        public static void writeLongAttribute(XmlSerializer out, String name, long value)

                throws IOException {

            out.attribute(null, name, Long.toString(value));

        }



        public static boolean readBooleanAttribute(XmlPullParser in, String name) {

            final String value = in.getAttributeValue(null, name);

            return Boolean.parseBoolean(value);

        }



        public static void writeBooleanAttribute(XmlSerializer out, String name, boolean value)

                throws IOException {

            out.attribute(null, name, Boolean.toString(value));

        }

    }

}
 
}