diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/Settings.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index d2adfddb4be3..f04f3387246d 100644 --- a/services/core/java/com/android/server/pm/Settings.java +++ b/services/core/java/com/android/server/pm/Settings.java @@ -2916,11 +2916,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile StringBuilder sb = new StringBuilder(); for (final PackageSetting ps : mPackages.values()) { - // TODO(b/135203078): This doesn't handle multiple users - final String dataPath = PackageInfoUtils.getDataDir(ps, UserHandle.USER_SYSTEM) - .getAbsolutePath(); - - if (ps.getPkg() == null || dataPath == null) { + if (ps.getPkg() == null) { if (!"android".equals(ps.getPackageName())) { Slog.w(TAG, "Skipping " + ps + " due to missing metadata"); } @@ -2932,6 +2928,10 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile continue; } + // TODO(b/135203078): This doesn't handle multiple users + final File dataDir = PackageInfoUtils.getDataDir(ps, UserHandle.USER_SYSTEM); + final String dataPath = dataDir == null ? "null" : dataDir.getAbsolutePath(); + final boolean isDebug = ps.getPkg().isDebuggable(); final IntArray gids = new IntArray(); for (final int userId : userIds) { @@ -2973,7 +2973,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile sb.append(ps.getSeInfo()); sb.append(" "); final int gidsSize = gids.size(); - if (gids != null && gids.size() > 0) { + if (gids.size() > 0) { sb.append(gids.get(0)); for (int i = 1; i < gidsSize; i++) { sb.append(","); |