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

Commit 749bbe97 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 55fd212f: am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget... 

am 55fd212f: am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev

* commit '55fd212f':
  Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
parents 34064021 55fd212f

core/java/android/view/ViewRootImpl.java

+3 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.os.UserHandle;

import android.util.AndroidRuntimeException;

import android.util.DisplayMetrics;

import android.util.Log;
@@ -1498,7 +1499,8 @@ public final class ViewRootImpl implements ViewParent, 
                            } catch (Surface.OutOfResourcesException e) {

                                Log.e(TAG, "OutOfResourcesException initializing HW surface", e);

                                try {

                                    if (!mWindowSession.outOfMemory(mWindow)) {

                                    if (!mWindowSession.outOfMemory(mWindow) &&

                                            Process.myUid() != Process.SYSTEM_UID) {

                                        Slog.w(TAG, "No processes killed for memory; killing self");

                                        Process.killProcess(Process.myPid());

                                    }