Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 722baf5e authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 5014 into donut 

* changes:
  Fix issue #1933587.  Perform dexopt of instrumentation .apks.
parents 5277103d d7f6daa5

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

+5 −3
Original line number Diff line number Diff line
@@ -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,