drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ddd75cb1: Merge "Fix NPE when showing Toast from system process." into jb-mr1.1-dev

Browse Source 
* commit 'ddd75cb1ac225f8ffe8c78a5be8ceb589e0cda27':
  Fix NPE when showing Toast from system process.
This commit is contained in:
Craig Mautner
2012-12-05 12:27:58 -08:00
committed by Android Git Automerger
parent 780a53dfb5 ddd75cb1ac
commit e771f3a67c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/widget/Toast.java
View File

@ -374,8 +374,11 @@ public class Toast {
// remove the old view if necessary
handleHide();
mView = mNextView;
mWM = (WindowManager)mView.getContext().getApplicationContext()
.getSystemService(Context.WINDOW_SERVICE);
Context context = mView.getContext().getApplicationContext();
if (context == null) {
context = mView.getContext();
}
mWM = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
// We can resolve the Gravity here by using the Locale for getting
// the layout direction
final Configuration config = mView.getContext().getResources().getConfiguration();