summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2013-11-18 12:56:25 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-18 12:56:25 -0800
commit32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485 (patch)
treedff1423df7eb4a8912f7a9079d72d8e9e4e8e38c /services/java
parent1dc93acf3a4a7cf9ede43e5d2d03fc5c7ff8071e (diff)
parentc65dfef3f5ee07883446be0e6907f15fe457da9d (diff)
downloadframeworks_base-32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485.zip
frameworks_base-32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485.tar.gz
frameworks_base-32962b3e2c1968fbd83ebbf4cc94ab3dd8de3485.tar.bz2
am c65dfef3: am afc76f28: Merge "Use scaled display size in wallpaper constraint." into klp-dev
* commit 'c65dfef3f5ee07883446be0e6907f15fe457da9d': 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;
}