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

Merge "Don't hold install lock while hashing dynamic code files."

Browse Source
This commit is contained in:
Alan Stokes
2019-01-16 10:09:49 +00:00
committed by Android (Google) Code Review
parent 3d375dbd97 60876386a5
commit 2ee2bcfd4a
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/pm/dex/DexLogger.java
View File

@@ -28,7 +28,6 @@ import android.util.PackageUtils;
import android.util.Slog;
import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.pm.Installer;
import com.android.server.pm.Installer.InstallerException;
@@ -53,21 +52,18 @@ public class DexLogger {
private final IPackageManager mPackageManager;
private final PackageDynamicCodeLoading mPackageDynamicCodeLoading;
private final Object mInstallLock;
@GuardedBy("mInstallLock")
private final Installer mInstaller;
public DexLogger(IPackageManager pms, Installer installer, Object installLock) {
this(pms, installer, installLock, new PackageDynamicCodeLoading());
public DexLogger(IPackageManager pms, Installer installer) {
this(pms, installer, new PackageDynamicCodeLoading());
}
@VisibleForTesting
DexLogger(IPackageManager pms, Installer installer, Object installLock,
DexLogger(IPackageManager pms, Installer installer,
PackageDynamicCodeLoading packageDynamicCodeLoading) {
mPackageManager = pms;
mPackageDynamicCodeLoading = packageDynamicCodeLoading;
mInstaller = installer;
mInstallLock = installLock;
}
public Set<String> getAllPackagesWithDynamicCodeLoading() {
@@ -131,14 +127,16 @@ public class DexLogger {
}
byte[] hash = null;
synchronized (mInstallLock) {
try {
hash = mInstaller.hashSecondaryDexFile(filePath, packageName, appInfo.uid,
appInfo.volumeUuid, storageFlags);
} catch (InstallerException e) {
Slog.e(TAG, "Got InstallerException when hashing file " + filePath
+ ": " + e.getMessage());
}
try {
// Note that we do not take the install lock here. Hashing should never interfere
// with app update/compilation/removal. We may get anomalous results if a file
// changes while we hash it, but that can happen anyway and is harmless for our
// purposes.
hash = mInstaller.hashSecondaryDexFile(filePath, packageName, appInfo.uid,
appInfo.volumeUuid, storageFlags);
} catch (InstallerException e) {
Slog.e(TAG, "Got InstallerException when hashing file " + filePath
+ ": " + e.getMessage());
}
String fileName = new File(filePath).getName();

2
services/core/java/com/android/server/pm/dex/DexManager.java
View File

@@ -129,7 +129,7 @@ public class DexManager {
mPackageDexOptimizer = pdo;
mInstaller = installer;
mInstallLock = installLock;
mDexLogger = new DexLogger(pms, installer, installLock);
mDexLogger = new DexLogger(pms, installer);
}
public DexLogger getDexLogger() {

3
services/tests/servicestests/src/com/android/server/pm/dex/DexLoggerTests.java
View File

@@ -77,7 +77,6 @@ public class DexLoggerTests {
@Mock IPackageManager mPM;
@Mock Installer mInstaller;
private final Object mInstallLock = new Object();
private PackageDynamicCodeLoading mPackageDynamicCodeLoading;
private DexLogger mDexLogger;
@@ -103,7 +102,7 @@ public class DexLoggerTests {
};
// For test purposes capture log messages as well as sending to the event log.
mDexLogger = new DexLogger(mPM, mInstaller, mInstallLock, mPackageDynamicCodeLoading) {
mDexLogger = new DexLogger(mPM, mInstaller, mPackageDynamicCodeLoading) {
@Override
void writeDclEvent(int uid, String message) {
super.writeDclEvent(uid, message);