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

am a3909a93: Work around crash when display is removed.

Browse Source 
* commit 'a3909a93958676d341424d574752bc7b3280d421':
  Work around crash when display is removed.
This commit is contained in:
Jeff Brown
2012-09-09 01:16:34 -07:00
committed by Android Git Automerger
parent 5eeb313e7c a3909a9395
commit fbb2da7a4d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/ActivityThread.java
View File

@@ -1586,7 +1586,15 @@ public final class ActivityThread {
CompatibilityInfoHolder cih = new CompatibilityInfoHolder(); CompatibilityInfoHolder cih = new CompatibilityInfoHolder();
cih.set(ci); cih.set(ci);
Display d = displayManager.getCompatibleDisplay(displayId, cih); Display d = displayManager.getCompatibleDisplay(displayId, cih);
d.getMetrics(dm); if (d != null) {
d.getMetrics(dm);
} else {
// Display no longer exists
// FIXME: This would not be a problem if we kept the Display object around
// instead of using the raw display id everywhere. The Display object caches
// its information even after the display has been removed.
dm.setToDefaults();
}
//Slog.i("foo", "New metrics: w=" + metrics.widthPixels + " h=" //Slog.i("foo", "New metrics: w=" + metrics.widthPixels + " h="
// + metrics.heightPixels + " den=" + metrics.density // + metrics.heightPixels + " den=" + metrics.density
// + " xdpi=" + metrics.xdpi + " ydpi=" + metrics.ydpi); // + " xdpi=" + metrics.xdpi + " ydpi=" + metrics.ydpi);