Merge "Merge "Lower error if diskstats cache file not found" into rvc-dev am:... (0dbe4e59) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2187,7 +2187,7 @@ public class StatsPullAtomService extends SystemService {
		pulledData.add(e);
		}
		} catch (IOException \| JSONException e) {
		Slog.e(TAG, "exception reading diskstats cache file", e);
		Slog.w(TAG, "Unable to read diskstats cache file within pullAppSize");
		return StatsManager.PULL_SKIP;
		}
		return StatsManager.PULL_SUCCESS;
		@@ -2291,7 +2291,7 @@ public class StatsPullAtomService extends SystemService {
		.build();
		pulledData.add(e);
		} catch (IOException \| JSONException e) {
		Slog.e(TAG, "exception reading diskstats cache file", e);
		Slog.w(TAG, "Unable to read diskstats cache file within pullCategorySize");
		return StatsManager.PULL_SKIP;
		}
		return StatsManager.PULL_SUCCESS;