Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid NPE when no staged installs." into mnc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-07-21 21:23:56 +00:00
committed by Android (Google) Code Review
parent 1fddd3efa9 54d42be6eb
commit cf051d1846
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -91,7 +91,6 @@ import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.ImageUtils; import com.android.internal.util.ImageUtils;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.server.IoThread; import com.android.server.IoThread;
import com.google.android.collect.Sets;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
@@ -106,6 +105,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Random; import java.util.Random;
@@ -221,7 +221,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
reconcileStagesLocked(StorageManager.UUID_PRIVATE_INTERNAL); reconcileStagesLocked(StorageManager.UUID_PRIVATE_INTERNAL);
final ArraySet<File> unclaimedIcons = Sets.newArraySet( final ArraySet<File> unclaimedIcons = newArraySet(
mSessionsDir.listFiles()); mSessionsDir.listFiles());
// Ignore stages and icons claimed by active sessions // Ignore stages and icons claimed by active sessions
@@ -245,7 +245,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
private void reconcileStagesLocked(String volumeUuid) { private void reconcileStagesLocked(String volumeUuid) {
final File stagingDir = buildStagingDir(volumeUuid); final File stagingDir = buildStagingDir(volumeUuid);
final ArraySet<File> unclaimedStages = Sets.newArraySet( final ArraySet<File> unclaimedStages = newArraySet(
stagingDir.listFiles(sStageFilter)); stagingDir.listFiles(sStageFilter));
// Ignore stages claimed by active sessions // Ignore stages claimed by active sessions
@@ -1091,6 +1091,15 @@ public class PackageInstallerService extends IPackageInstaller.Stub {
.build(); .build();
} }
public static <E> ArraySet<E> newArraySet(E... elements) {
final ArraySet<E> set = new ArraySet<E>();
if (elements != null) {
set.ensureCapacity(elements.length);
Collections.addAll(set, elements);
}
return set;
}
private static class Callbacks extends Handler { private static class Callbacks extends Handler {
private static final int MSG_SESSION_CREATED = 1; private static final int MSG_SESSION_CREATED = 1;
private static final int MSG_SESSION_BADGING_CHANGED = 2; private static final int MSG_SESSION_BADGING_CHANGED = 2;