Merge change 5014 into donut

* changes:
  Fix issue #1933587.  Perform dexopt of instrumentation .apks.
This commit is contained in:
Android (Google) Code Review
2009-06-22 18:30:05 -07:00

View File

@@ -4869,9 +4869,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
isRestrictedBackupMode = (mBackupTarget.backupMode == BackupRecord.RESTORE)
|| (mBackupTarget.backupMode == BackupRecord.BACKUP_FULL);
}
ensurePackageDexOpt(app.info.packageName);
if (app.instrumentationInfo != null) {
ensurePackageDexOpt(app.instrumentationInfo.packageName);
ensurePackageDexOpt(app.instrumentationInfo != null
? app.instrumentationInfo.packageName
: app.info.packageName);
if (app.instrumentationClass != null) {
ensurePackageDexOpt(app.instrumentationClass.getPackageName());
}
thread.bindApplication(processName, app.instrumentationInfo != null
? app.instrumentationInfo : app.info, providers,