LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Track constructor changes in libcore/" am: f94eb29500

Browse Source 
am: 33a26e3ee4

Change-Id: I1205219e1fead95ecdb8f9ce5d503ec416baf4c2
This commit is contained in:
Neil Fuller
2018-07-05 05:25:35 -07:00
committed by android-build-merger
parent 48474a78ad 33a26e3ee4
commit fa52de540c
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/internal/net/NetworkStatsFactory.java
View File

@@ -194,7 +194,7 @@ public class NetworkStatsFactory {
reader.finishLine(); reader.finishLine();
} }
} catch (NullPointerException|NumberFormatException e) { } catch (NullPointerException|NumberFormatException e) {
throw new ProtocolException("problem parsing stats", e); throw protocolExceptionWithCause("problem parsing stats", e);
} finally { } finally {
IoUtils.closeQuietly(reader); IoUtils.closeQuietly(reader);
StrictMode.setThreadPolicy(savedPolicy); StrictMode.setThreadPolicy(savedPolicy);
@@ -244,7 +244,7 @@ public class NetworkStatsFactory {
reader.finishLine(); reader.finishLine();
} }
} catch (NullPointerException|NumberFormatException e) { } catch (NullPointerException|NumberFormatException e) {
throw new ProtocolException("problem parsing stats", e); throw protocolExceptionWithCause("problem parsing stats", e);
} finally { } finally {
IoUtils.closeQuietly(reader); IoUtils.closeQuietly(reader);
StrictMode.setThreadPolicy(savedPolicy); StrictMode.setThreadPolicy(savedPolicy);
@@ -341,7 +341,7 @@ public class NetworkStatsFactory {
reader.finishLine(); reader.finishLine();
} }
} catch (NullPointerException|NumberFormatException e) { } catch (NullPointerException|NumberFormatException e) {
throw new ProtocolException("problem parsing idx " + idx, e); throw protocolExceptionWithCause("problem parsing idx " + idx, e);
} finally { } finally {
IoUtils.closeQuietly(reader); IoUtils.closeQuietly(reader);
StrictMode.setThreadPolicy(savedPolicy); StrictMode.setThreadPolicy(savedPolicy);
@@ -378,4 +378,10 @@ public class NetworkStatsFactory {
@VisibleForTesting @VisibleForTesting
public static native int nativeReadNetworkStatsDev(NetworkStats stats); 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;
}
} }