commit 680215f502d03d165c922eaccde7b21f7f608425
author Fyodor Kupolov <fkupolov@google.com> Fri Dec 04 00:12:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 04 00:12:00 2015 +0000
tree 897617bb0074d228c141db95e7b8244c6226ceea
parent e920098f31860824ca714f10b2e72dbff5442184
parent af38b8ea3e76f57febf3288e757ee23fef49cf99

Merge "Fix instrumentation context initialization"

core/java/android/app/ActivityThread.java

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 74f0c0e..c264368 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -4841,7 +4841,7 @@
         if (ii != null) {
             final ApplicationInfo instrApp = new ApplicationInfo();
             ii.copyTo(instrApp);
-
+            instrApp.initForUser(UserHandle.myUserId());
             final LoadedApk pi = getPackageInfo(instrApp, data.compatInfo,
                     appContext.getClassLoader(), false, true, false);
             final ContextImpl instrContext = ContextImpl.createAppContext(this, pi);