diff options
| author | Craig Mautner <cmautner@google.com> | 2013-06-24 18:31:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-24 18:31:54 +0000 |
| commit | 07f36c738e65b8cc2484107b4f8e3386d45d065d (patch) | |
| tree | f274fd939522c44f5311c7a6511c702e074793c4 /services/java | |
| parent | 066bdcfe83e49ad4bfb97670521c1b7e7297ba53 (diff) | |
| parent | 48d0d1886731ff19ed3fb47a5997be5df0d1bba8 (diff) | |
| download | frameworks_base-07f36c738e65b8cc2484107b4f8e3386d45d065d.zip frameworks_base-07f36c738e65b8cc2484107b4f8e3386d45d065d.tar.gz frameworks_base-07f36c738e65b8cc2484107b4f8e3386d45d065d.tar.bz2 | |
Merge "Add activity token to display system."
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index fd06535..ab0590e 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -97,6 +97,7 @@ import android.util.SparseIntArray; import android.util.TypedValue; import android.view.Choreographer; import android.view.Display; +import android.view.DisplayAdjustments; import android.view.DisplayInfo; import android.view.Gravity; import android.view.IApplicationToken; @@ -6609,8 +6610,9 @@ public class WindowManagerService extends IWindowManager.Stub displayInfo.logicalDensityDpi = displayContent.mBaseDisplayDensity; displayInfo.appWidth = appWidth; displayInfo.appHeight = appHeight; - displayInfo.getLogicalMetrics(mRealDisplayMetrics, null); - displayInfo.getAppMetrics(mDisplayMetrics, null); + displayInfo.getLogicalMetrics(mRealDisplayMetrics, + CompatibilityInfo.DEFAULT_COMPATIBILITY_INFO, null); + displayInfo.getAppMetrics(mDisplayMetrics); mDisplayManagerService.setDisplayInfoOverrideFromWindowManager( displayContent.getDisplayId(), displayInfo); } |