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

Commit 5bb9b85f authored by Amith Yamasani's avatar Amith Yamasani Committed by Automerger Merge Worker
Browse files

Merge "Only create app data for installed apps for new user" into sc-dev am: da4a48d0 

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

Change-Id: I194cfd06ae6f2b8ab637df2f1d4117fe49bb8da0
parents b43af757 da4a48d0

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

+10 −7
Original line number Diff line number Diff line
@@ -3997,15 +3997,18 @@ public final class Settings implements Watchable, Snappable { 
                final int uninstallReason = (shouldMaybeInstall && !shouldReallyInstall) ?

                        UNINSTALL_REASON_USER_TYPE : UNINSTALL_REASON_UNKNOWN;

                ps.setUninstallReason(uninstallReason, userHandle);

                if (!shouldReallyInstall) {

                    writeKernelMappingLPr(ps);

                }

                // Need to create a data directory for all apps under this user. Accumulate all

                // required args and call the installer after mPackages lock has been released

                if (shouldReallyInstall) {

                    // Need to create a data directory for all apps installed for this user.

                    // Accumulate all required args and call the installer after mPackages lock

                    // has been released

                    final String seInfo = AndroidPackageUtils.getSeInfo(ps.pkg, ps);

                    batch.createAppData(ps.volumeUuid, ps.name, userHandle,

                        StorageManager.FLAG_STORAGE_CE | StorageManager.FLAG_STORAGE_DE, ps.appId,

                        seInfo, ps.pkg.getTargetSdkVersion());

                            StorageManager.FLAG_STORAGE_CE | StorageManager.FLAG_STORAGE_DE,

                            ps.appId, seInfo, ps.pkg.getTargetSdkVersion());

                } else {

                    // Make sure the app is excluded from storage mapping for this user

                    writeKernelMappingLPr(ps);

                }

            }

        }

        t.traceBegin("createAppData");