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

Commit 98bb2ee4 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "AppDataHelper:fix ArrayIndexOutOfBoundsException happen in... 

Merge "AppDataHelper:fix ArrayIndexOutOfBoundsException happen in fixAppsDataOnBoot method due to forget add lock." into main am: 91ed5874

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



Change-Id: Ibe3458b9ba07c293d35605b6b0f7ca7832efab76
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b72a4128 91ed5874

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

+6 −3
Original line number Diff line number Diff line
@@ -534,9 +534,12 @@ public class AppDataHelper { 
        } else {

            storageFlags = StorageManager.FLAG_STORAGE_DE | StorageManager.FLAG_STORAGE_CE;

        }

        List<String> deferPackages = reconcileAppsDataLI(StorageManager.UUID_PRIVATE_INTERNAL,

        final List<String> deferPackages;

        synchronized (mPm.mInstallLock) {

           deferPackages = reconcileAppsDataLI(StorageManager.UUID_PRIVATE_INTERNAL,

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

                    true /* onlyCoreApps */);

        }

        Future<?> prepareAppDataFuture = SystemServerInitThreadPool.submit(() -> {

            TimingsTraceLog traceLog = new TimingsTraceLog("SystemServerTimingAsync",

                    Trace.TRACE_TAG_PACKAGE_MANAGER);