am 78b9035b: am 37e792d5: Merge "Fix issue #3515088: Don\'t be so aggressive trying to reclaim memory" into honeycomb-mr1

* commit '78b9035b51cd5e59500fa242952cb30ee50cddc9':
  Fix issue #3515088: Don't be so aggressive trying to reclaim memory

1 files changed, 3 insertions, 7 deletions

diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index 5468230..11908bb 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;
             }