From db773c557226e8008a1fff7596321a69289c80ba Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Fri, 4 Mar 2011 16:43:41 -0800 Subject: Fix issue #3515088: Don't be so aggressive trying to reclaim memory Change-Id: I8184306fa8c27a41b8bcfcad8d96985be8f0c9aa --- core/java/android/view/ViewRoot.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 546823047b24..11908bb8bcef 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -1606,13 +1606,9 @@ public final class ViewRoot extends Handler implements ViewParent, return; } catch (IllegalArgumentException e) { Log.e(TAG, "IllegalArgumentException locking surface", e); - try { - if (!sWindowSession.outOfMemory(mWindow)) { - Slog.w(TAG, "No processes killed for memory; killing self"); - Process.killProcess(Process.myPid()); - } - } catch (RemoteException ex) { - } + // Don't assume this is due to out of memory, it could be + // something else, and if it is something else then we could + // kill stuff (or ourself) for no reason. mLayoutRequested = true; // ask wm for a new surface next time. return; } -- cgit v1.2.3-59-g8ed1b