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

Commit cb25e886 authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Automerger Merge Worker
Browse files

Merge "Lower error if diskstats cache file not found" into rvc-dev am: 494b541a am: 2d9361b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11750085

Change-Id: I4b7116a492e794206e1f8872f407bb8029ac24f0
parents 4bc673b1 2d9361b0

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;