Merge "Sets the first boot in installd to create data directories with project id" am: 88e0d21b31 am: b26bce1d11

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

Change-Id: I9f662a9fd7918f17a9bba5c29e7c64d0c2a336b1

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

@@ -255,6 +255,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

@@ -7554,6 +7554,16 @@ public class PackageManagerService extends IPackageManager.Stub
                     /* 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();