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

Commit f8113727 authored by Songchun Fan's avatar Songchun Fan Committed by Song Chun Fan
Browse files

[pm] dump per user dataDir 

dataDir is different for each user. It should be dumped in the per-user
section.

BUG: 295649191
Test: atest
android.content.pm.cts.PackageManagerTest#testUninstallWithKeepData

Change-Id: I79f6f89ca1e6b10398e1931d14e2224e50eb6d6f
parent 7c140b16

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

+4 −3
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static android.content.pm.PackageManager.UNINSTALL_REASON_USER_TYPE; 
import static android.os.Process.INVALID_UID;

import static android.os.Process.PACKAGE_INFO_GID;

import static android.os.Process.SYSTEM_UID;



import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;

import static com.android.server.pm.PackageManagerService.WRITE_USER_PACKAGE_RESTRICTIONS;

import static com.android.server.pm.SharedUidMigration.BEST_EFFORT;
@@ -4896,8 +4895,6 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
            pw.print("]");

        }

        pw.println();

        File dataDir = PackageInfoUtils.getDataDir(ps, UserHandle.myUserId());

        pw.print(prefix); pw.print("  dataDir="); pw.println(dataDir.getAbsolutePath());

        if (pkg != null) {

            pw.print(prefix); pw.print("  versionName="); pw.println(pkg.getVersionName());

            pw.print(prefix); pw.print("  usesNonSdkApi="); pw.println(pkg.isNonSdkApiRequested());
@@ -5198,6 +5195,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile 
            pw.print("      installReason=");

            pw.println(userState.getInstallReason());



            File dataDir = PackageInfoUtils.getDataDir(ps, user.id);

            pw.print("      dataDir=");

            pw.println(dataDir.getAbsolutePath());



            final PackageUserStateInternal pus = ps.readUserState(user.id);

            pw.print("      firstInstallTime=");

            date.setTime(pus.getFirstInstallTimeMillis());