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

Commit 1423ea3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Report app data fixup and prepare timings" into oc-dev

parents 0964a2d9 a1ff0015

services/core/java/com/android/server/pm/PackageManagerService.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -220,6 +220,7 @@ import android.text.format.DateUtils; 
import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Base64;

import android.util.Base64;

import android.util.BootTimingsTraceLog;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;

import android.util.EventLog;

import android.util.EventLog;

import android.util.ExceptionUtils;

import android.util.ExceptionUtils;
@@ -2722,15 +2723,18 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    UserHandle.USER_SYSTEM, storageFlags, true /* migrateAppData */,

                    UserHandle.USER_SYSTEM, storageFlags, true /* migrateAppData */,

                    true /* onlyCoreApps */);

                    true /* onlyCoreApps */);

            mPrepareAppDataFuture = SystemServerInitThreadPool.get().submit(() -> {

            mPrepareAppDataFuture = SystemServerInitThreadPool.get().submit(() -> {

                Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "fixup");

                BootTimingsTraceLog traceLog = new BootTimingsTraceLog("SystemServerTimingAsync",

                        Trace.TRACE_TAG_PACKAGE_MANAGER);

                traceLog.traceBegin("AppDataFixup");

                try {

                try {

                    mInstaller.fixupAppData(StorageManager.UUID_PRIVATE_INTERNAL,

                    mInstaller.fixupAppData(StorageManager.UUID_PRIVATE_INTERNAL,

                            StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);

                            StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE);

                } catch (InstallerException e) {

                } catch (InstallerException e) {

                    Slog.w(TAG, "Trouble fixing GIDs", e);

                    Slog.w(TAG, "Trouble fixing GIDs", e);

                }

                }

                Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);

                traceLog.traceEnd();




















                traceLog.traceBegin("AppDataPrepare");











                if (deferPackages == null || deferPackages.isEmpty()) {







                if (deferPackages == null || deferPackages.isEmpty()) {











                    return;







                    return;











                }







                }









@@ -2751,6 +2755,7 @@ public class PackageManagerService extends IPackageManager.Stub {









                        count++;







                        count++;











                    }







                    }











                }







                }














                traceLog.traceEnd();











                Slog.i(TAG, "Deferred reconcileAppsData finished " + count + " packages");







                Slog.i(TAG, "Deferred reconcileAppsData finished " + count + " packages");











            }, "prepareAppData");







            }, "prepareAppData");