summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-18 20:49:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-18 20:49:16 +0000
commitafc76f28b93f931069bb58c4f9b524d5a99b1604 (patch)
treef16ff343a0e8ecebc19b13fed1cb0d9708a8147d /services/java/com
parent35fb6cdf14549dac07585ae791b27e2c069bf176 (diff)
parentd6e836c4a0ebf3af571c46986d324c1bd599ba95 (diff)
downloadframeworks_base-afc76f28b93f931069bb58c4f9b524d5a99b1604.zip
frameworks_base-afc76f28b93f931069bb58c4f9b524d5a99b1604.tar.gz
frameworks_base-afc76f28b93f931069bb58c4f9b524d5a99b1604.tar.bz2
Merge "Use scaled display size in wallpaper constraint." into klp-dev
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/WallpaperManagerService.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java
index e25470c..e6b6b93 100644
--- a/services/java/com/android/server/WallpaperManagerService.java
+++ b/services/java/com/android/server/WallpaperManagerService.java
@@ -640,11 +640,9 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
private Point getDefaultDisplaySize() {
Point p = new Point();
- try {
- mIWindowManager.getInitialDisplaySize(Display.DEFAULT_DISPLAY, p);
- } catch (RemoteException e) {
- // not remote
- }
+ WindowManager wm = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
+ Display d = wm.getDefaultDisplay();
+ d.getRealSize(p);
return p;
}