Merge "Fix issue #3515088: Don't be so aggressive trying to reclaim memory" into honeycomb-mr1 (37e792d5) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRoot.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}