Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '37e792d53d4b38d1283960d62edcd63ef0a30e5e':
  Fix issue #3515088: Don't be so aggressive trying to reclaim memory
This commit is contained in:
Dianne Hackborn
2011-03-07 18:21:55 -08:00
committed by Android Git Automerger
parent 79bd55ccb5 37e792d53d
commit 78b9035b51
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewRoot.java
View File

@@ -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;
}