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

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

Browse Source
This commit is contained in:
Dianne Hackborn
2012-09-23 13:31:32 -07:00
committed by Android (Google) Code Review
parent 5a370882f8 3b84206bba
commit c0e1f26845
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/ViewRootImpl.java
View File

@ -52,6 +52,7 @@ import android.os.RemoteException;
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.os.Trace; import android.os.Trace;
import android.os.UserHandle;
import android.util.AndroidRuntimeException; import android.util.AndroidRuntimeException;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
@ -1493,7 +1494,8 @@ public final class ViewRootImpl implements ViewParent,
} catch (Surface.OutOfResourcesException e) { } catch (Surface.OutOfResourcesException e) {
Log.e(TAG, "OutOfResourcesException initializing HW surface", e); Log.e(TAG, "OutOfResourcesException initializing HW surface", e);
try { try {
if (!mWindowSession.outOfMemory(mWindow)) { if (!mWindowSession.outOfMemory(mWindow) &&
Process.myUid() != Process.SYSTEM_UID) {
Slog.w(TAG, "No processes killed for memory; killing self"); Slog.w(TAG, "No processes killed for memory; killing self");
Process.killProcess(Process.myPid()); Process.killProcess(Process.myPid());
} }