summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-04-22 17:30:41 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-22 17:30:41 -0700
commit49b0246bc46c2a3cdfadec5d3f56a8212678ac6e (patch)
tree7a0d2fbb729214d0e4071b8237a35493c1451910
parente93cccb634b3f395ea99ada52dd6cd532b3e7723 (diff)
parent816e4f758302aaf3b115b5914d48732ed78af946 (diff)
downloadframeworks_base-49b0246bc46c2a3cdfadec5d3f56a8212678ac6e.zip
frameworks_base-49b0246bc46c2a3cdfadec5d3f56a8212678ac6e.tar.gz
frameworks_base-49b0246bc46c2a3cdfadec5d3f56a8212678ac6e.tar.bz2
Merge "System context should inherit base package name."
-rw-r--r--core/java/android/app/ContextImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index 8942135..64a05a8 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -1480,7 +1480,9 @@ class ContextImpl extends Context {
public Context createPackageContext(String packageName, int flags)
throws PackageManager.NameNotFoundException {
if (packageName.equals("system") || packageName.equals("android")) {
- return new ContextImpl(mMainThread.getSystemContext());
+ final ContextImpl context = new ContextImpl(mMainThread.getSystemContext());
+ context.mBasePackageName = mBasePackageName;
+ return context;
}
LoadedApk pi =