Use new display manager API.

Also deleted some dead code.

Change-Id: I4d070b6642caf2c143eeacceeb678c102e5da19c

2 files changed, 5 insertions, 9 deletions

diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java
index eea00c75c..ff3a6866e 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java
@@ -15,10 +15,10 @@
  */
 package com.android.commands.monkey;
 
+import android.hardware.display.DisplayManager;
 import android.os.Build;
 import android.os.SystemClock;
 import android.view.Display;
-import android.view.WindowManagerImpl;
 import android.util.DisplayMetrics;
 
 import com.android.commands.monkey.MonkeySourceNetwork.CommandQueue;
@@ -82,7 +82,7 @@ public class MonkeySourceNetworkVars {
         VAR_MAP.put("build.version.codename", new StaticVarGetter(Build.VERSION.CODENAME));
 
         // Display
-        Display display = WindowManagerImpl.getDefault().getDefaultDisplay();
+        Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);
         VAR_MAP.put("display.width", new StaticVarGetter(Integer.toString(display.getWidth())));
         VAR_MAP.put("display.height", new StaticVarGetter(Integer.toString(display.getHeight())));
 
diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
index 3d940a88e..e0ebd0352 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
@@ -18,13 +18,13 @@ package com.android.commands.monkey;
 
 import android.content.ComponentName;
 import android.graphics.PointF;
+import android.hardware.display.DisplayManager;
 import android.os.SystemClock;
 import android.view.Display;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.Surface;
-import android.view.WindowManagerImpl;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -258,8 +258,8 @@ public class MonkeySourceRandom implements MonkeyEventSource {
      * @param gesture The gesture to perform.
      *
      */
-    private void generatePointerEvent(Random random, int gesture){
-        Display display = WindowManagerImpl.getDefault().getDefaultDisplay();
+    private void generatePointerEvent(Random random, int gesture) {
+        Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);
 
         PointF p1 = randomPoint(random, display);
         PointF v1 = randomVector(random);
@@ -350,10 +350,6 @@ public class MonkeySourceRandom implements MonkeyEventSource {
      *
      */
     private void generateTrackballEvent(Random random) {
-        Display display = WindowManagerImpl.getDefault().getDefaultDisplay();
-
-        boolean drop = false;
-        int count = random.nextInt(10);
         for (int i = 0; i < 10; ++i) {
             // generate a small random step
             int dX = random.nextInt(10) - 5;