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

Merge "Fix starting window memory leak"

Browse Source
This commit is contained in:
Dianne Hackborn
2013-02-27 19:57:08 +00:00
committed by Gerrit Code Review
parent de3c20bcb5 d1443e9944
commit 7b69e40176
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -1523,6 +1523,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
return null; return null;
} }
WindowManager wm = null;
View view = null;
try { try {
Context context = mContext; Context context = mContext;
if (DEBUG_STARTING_WINDOW) Slog.d(TAG, "addStartingWindow " + packageName if (DEBUG_STARTING_WINDOW) Slog.d(TAG, "addStartingWindow " + packageName
@@ -1582,8 +1585,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
params.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; params.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS;
params.setTitle("Starting " + packageName); params.setTitle("Starting " + packageName);
WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE); wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);
View view = win.getDecorView(); view = win.getDecorView();
if (win.isFloating()) { if (win.isFloating()) {
// Whoops, there is no way to display an animation/preview // Whoops, there is no way to display an animation/preview
@@ -1613,6 +1616,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// failure loading resources because we are loading from an app // failure loading resources because we are loading from an app
// on external storage that has been unmounted. // on external storage that has been unmounted.
Log.w(TAG, appToken + " failed creating starting window", e); Log.w(TAG, appToken + " failed creating starting window", e);
} finally {
if (view != null && view.getParent() == null) {
Log.w(TAG, "view not successfully added to wm, removing view");
wm.removeViewImmediate(view);
}
} }
return null; return null;