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

Commit 731a7256 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "UsageStatsService: ignore removed users in... 

Merge "UsageStatsService: ignore removed users in persistPendingEventsLocked()" am: f523bbcd am: 27938f3b am: a7f6aedc

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



Change-Id: Ie344e429cb3840997fdac81632874f0793dc562e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1149669 a7f6aedc

services/usage/java/com/android/server/usage/UsageStatsService.java

+10 −5
Original line number Diff line number Diff line
@@ -882,11 +882,16 @@ public class UsageStatsService extends SystemService implements 
            return;

        }



        final File usageStatsDeDir = new File(Environment.getDataSystemDeDirectory(userId),

                "usagestats");

        if (!usageStatsDeDir.mkdirs() && !usageStatsDeDir.exists()) {

            throw new IllegalStateException("Usage stats DE directory does not exist: "

                    + usageStatsDeDir.getAbsolutePath());

        final File deDir = Environment.getDataSystemDeDirectory(userId);

        final File usageStatsDeDir = new File(deDir, "usagestats");

        if (!usageStatsDeDir.mkdir() && !usageStatsDeDir.exists()) {

            if (deDir.exists()) {

                Slog.e(TAG, "Failed to create " + usageStatsDeDir);

            } else {

                Slog.w(TAG, "User " + userId + " was already removed! Discarding pending events");

                pendingEvents.clear();

            }

            return;

        }

        final File pendingEventsFile = new File(usageStatsDeDir,

                "pendingevents_" + System.currentTimeMillis());