diff options
| author | Adam Powell <adamp@google.com> | 2012-10-07 11:40:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-07 11:40:19 -0700 |
| commit | 02ff76c5d93b30e028edde473f3fb59994102b89 (patch) | |
| tree | d99ef80e1505ff4567b1c5b5f4051ffd2d392243 /core | |
| parent | 01b28579dbd9ddfab800075d85b09bebd58b2c25 (diff) | |
| parent | fee7ddedc99e377002aa6a88c3e287cb6e6c405d (diff) | |
| download | frameworks_base-02ff76c5d93b30e028edde473f3fb59994102b89.zip frameworks_base-02ff76c5d93b30e028edde473f3fb59994102b89.tar.gz frameworks_base-02ff76c5d93b30e028edde473f3fb59994102b89.tar.bz2 | |
am fee7dded: am f94da061: am 786d1092: Merge "Quick settings user display and switching" into jb-mr1-dev
* commit 'fee7ddedc99e377002aa6a88c3e287cb6e6c405d':
Quick settings user display and switching
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 59fa1e0..caabfbf 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -1702,8 +1702,8 @@ class ContextImpl extends Context { throws NameNotFoundException { if (packageName.equals("system") || packageName.equals("android")) { final ContextImpl context = new ContextImpl(mMainThread.getSystemContext()); - context.mBasePackageName = mBasePackageName; - context.mUser = user; + context.mRestricted = (flags & CONTEXT_RESTRICTED) == CONTEXT_RESTRICTED; + context.init(mPackageInfo, null, mMainThread, mResources, mBasePackageName, user); return context; } |