summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/NetworkManagementService.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-08-25 11:13:38 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-25 11:13:38 -0700
commited191e1fae0f860323f6ed76ea982287c42ec83e (patch)
tree584738551e9a43e285d1bd9dd4913f41ad36c40f /services/java/com/android/server/NetworkManagementService.java
parent235c47ff3edc9228609e82d2201275e70889921f (diff)
parent558a23200697d306b75750cf4612cf0717e73537 (diff)
downloadframeworks_base-ed191e1fae0f860323f6ed76ea982287c42ec83e.zip
frameworks_base-ed191e1fae0f860323f6ed76ea982287c42ec83e.tar.gz
frameworks_base-ed191e1fae0f860323f6ed76ea982287c42ec83e.tar.bz2
Merge "Data usage buckets active time, parsing ISE."
Diffstat (limited to 'services/java/com/android/server/NetworkManagementService.java')
-rw-r--r--services/java/com/android/server/NetworkManagementService.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/services/java/com/android/server/NetworkManagementService.java b/services/java/com/android/server/NetworkManagementService.java
index c679dcf..e72d09f 100644
--- a/services/java/com/android/server/NetworkManagementService.java
+++ b/services/java/com/android/server/NetworkManagementService.java
@@ -1063,8 +1063,12 @@ public class NetworkManagementService extends INetworkManagementService.Stub
Slog.w(TAG, "problem parsing stats row '" + line + "': " + e);
}
}
+ } catch (NullPointerException e) {
+ throw new IllegalStateException("problem parsing stats: " + e);
+ } catch (NumberFormatException e) {
+ throw new IllegalStateException("problem parsing stats: " + e);
} catch (IOException e) {
- Slog.w(TAG, "problem parsing stats: " + e);
+ throw new IllegalStateException("problem parsing stats: " + e);
} finally {
IoUtils.closeQuietly(reader);
}
@@ -1345,8 +1349,12 @@ public class NetworkManagementService extends INetworkManagementService.Stub
Slog.w(TAG, "problem parsing stats row '" + line + "': " + e);
}
}
+ } catch (NullPointerException e) {
+ throw new IllegalStateException("problem parsing stats: " + e);
+ } catch (NumberFormatException e) {
+ throw new IllegalStateException("problem parsing stats: " + e);
} catch (IOException e) {
- Slog.w(TAG, "problem parsing stats: " + e);
+ throw new IllegalStateException("problem parsing stats: " + e);
} finally {
IoUtils.closeQuietly(reader);
}