summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-18 12:52:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-18 12:52:58 -0800
commitc65dfef3f5ee07883446be0e6907f15fe457da9d (patch)
tree7398238df1056a140b03d777f00e3ec070ed0495 /services/java
parent4dee4e1cb394b077174ee29656bde962502555de (diff)
parentafc76f28b93f931069bb58c4f9b524d5a99b1604 (diff)
downloadframeworks_base-c65dfef3f5ee07883446be0e6907f15fe457da9d.zip
frameworks_base-c65dfef3f5ee07883446be0e6907f15fe457da9d.tar.gz
frameworks_base-c65dfef3f5ee07883446be0e6907f15fe457da9d.tar.bz2
am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
* commit 'afc76f28b93f931069bb58c4f9b524d5a99b1604': Use scaled display size in wallpaper constraint.
Diffstat (limited to 'services/java')
-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;
}