Merge "Track constructor changes in libcore/" am: f94eb29500 am: 67dcf6da3c (6e162540) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/net/NetworkStatsFactory.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ public class NetworkStatsFactory {
		reader.finishLine();
		}
		} catch (NullPointerException\|NumberFormatException e) {
		throw new ProtocolException("problem parsing stats", e);
		throw protocolExceptionWithCause("problem parsing stats", e);
		} finally {
		IoUtils.closeQuietly(reader);
		StrictMode.setThreadPolicy(savedPolicy);
		@@ -244,7 +244,7 @@ public class NetworkStatsFactory {
		reader.finishLine();
		}
		} catch (NullPointerException\|NumberFormatException e) {
		throw new ProtocolException("problem parsing stats", e);
		throw protocolExceptionWithCause("problem parsing stats", e);
		} finally {
		IoUtils.closeQuietly(reader);
		StrictMode.setThreadPolicy(savedPolicy);
		@@ -341,7 +341,7 @@ public class NetworkStatsFactory {
		reader.finishLine();
		}
		} catch (NullPointerException\|NumberFormatException e) {
		throw new ProtocolException("problem parsing idx " + idx, e);
		throw protocolExceptionWithCause("problem parsing idx " + idx, e);
		} finally {
		IoUtils.closeQuietly(reader);
		StrictMode.setThreadPolicy(savedPolicy);
		@@ -378,4 +378,10 @@ public class NetworkStatsFactory {

		@VisibleForTesting
		public static native int nativeReadNetworkStatsDev(NetworkStats stats);

		private static ProtocolException protocolExceptionWithCause(String message, Throwable cause) {
		ProtocolException pe = new ProtocolException(message);
		pe.initCause(cause);
		return pe;
		}
		}