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

Commit 630a0e8b authored by Shikha Malhotra's avatar Shikha Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Sets the first boot in installd to create data directories with project... 

Merge "Sets the first boot in installd to create data directories with project id" am: 88e0d21b am: b26bce1d am: 404a542c am: f51ddd71

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

Change-Id: I445905d2cdf94530d18ad4ba7c4a526c6780dd56
parents cf3504bf f51ddd71

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

+11 −0
Original line number Diff line number Diff line
@@ -283,6 +283,17 @@ public class Installer extends SystemService { 
        }

    }



    /**

     * Sets in Installd that it is first boot after data wipe

     */

    public void setFirstBoot() throws InstallerException {

        try {

            mInstalld.setFirstBoot();

        } catch (RemoteException e) {

            throw InstallerException.from(e);

        }

    }



    /**

     * Class that collects multiple {@code installd} operations together in an

     * attempt to more efficiently execute them in bulk.

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

+10 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,16 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
                    /* excludePreCreated= */ false));

            t.traceEnd();



            if (mFirstBoot) {

                t.traceBegin("setFirstBoot: ");

                try {

                    mInstaller.setFirstBoot();

                } catch (InstallerException e) {

                    Slog.w(TAG, "Could not set First Boot: ", e);

                }

                t.traceEnd();

            }



            mPermissionManager.readLegacyPermissionsTEMP(mSettings.mPermissions);

            mPermissionManager.readLegacyPermissionStateTEMP();