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

Merge change 5014 into donut

Browse Source 
* 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
parent 5277103db9 d7f6daa5d1
commit 722baf5ec4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/am/ActivityManagerService.java
View File

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