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

Commit f0282647 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Toast: fix force close if called from system service" into cm-10.1

parents bf3f2a7d 2dfb68ac
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -374,8 +374,13 @@ 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();
                if (context.getApplicationContext() != null) {
                    // Use application context, except when called from system
                    // service where there is no application context.
                    context = context.getApplicationContext();
                }
                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();