commit d7f6daa5d182f21b41782057e8a9b72f7a1eb54a
author Dianne Hackborn <hackbod@google.com> Mon Jun 22 17:06:35 2009 -0700
committer Dianne Hackborn <hackbod@google.com> Mon Jun 22 17:06:35 2009 -0700
tree e373d3d928df396f8362e64974f4268edb0d4839
parent ecfb9f91afa49df7b9b62526dcaca431b5ff1e01

Fix issue #1933587.  Perform dexopt of instrumentation .apks.

services/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 8cf1cc2..16bb29d 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -4869,9 +4869,11 @@
                 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,