diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-08-29 15:43:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-29 15:43:55 -0700 |
| commit | d5ea3b464795d4e6adbdd174d1bd2f78b628e280 (patch) | |
| tree | 0660fe4a3b1da16acabfee6874051887ba056a16 /core/java/android/app/ActivityThread.java | |
| parent | 0552cbcf29f266f608e8326bc467b6afb13b7f3a (diff) | |
| parent | bd6e1500aedc5461e832f69e76341bff0e55fa2b (diff) | |
Merge "Add initial multi-display support." into jb-mr1-dev
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index b8e16c5a7cc9..4a1bf7523dd7 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -43,6 +43,7 @@ import android.database.sqlite.SQLiteDebug.DbStats; import android.graphics.Bitmap; import android.graphics.Canvas; import android.hardware.display.DisplayManager; +import android.hardware.display.DisplayManagerGlobal; import android.net.IConnectivityManager; import android.net.Proxy; import android.net.ProxyProperties; @@ -1557,7 +1558,7 @@ public final class ActivityThread { return dm; } - DisplayManager displayManager = DisplayManager.getInstance(); + DisplayManagerGlobal displayManager = DisplayManagerGlobal.getInstance(); if (displayManager == null) { // may be null early in system startup dm = new DisplayMetrics(); |