commit 60df6ce6b8e1f9519aafb5f87c21e07259b463d0
author Jeff Brown <jeffbrown@google.com> Wed Aug 29 06:07:33 2012 -0700
committer Jeff Brown <jeffbrown@google.com> Wed Aug 29 06:15:17 2012 -0700
tree f941cfc2ca5bb1281f41f0456b08196f6090138c
parent d4f07cf5f30ea5eae0cfe25a13c9375f33a0eb12

Use new display manager API.

Change-Id: Ia7a19413d201532d8cf22bee6bcedd4af1657831

cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java

diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java
index ff3a686..9abfe26 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java
@@ -15,7 +15,7 @@
  */
 package com.android.commands.monkey;
 
-import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManagerGlobal;
 import android.os.Build;
 import android.os.SystemClock;
 import android.view.Display;
@@ -82,7 +82,7 @@
         VAR_MAP.put("build.version.codename", new StaticVarGetter(Build.VERSION.CODENAME));
 
         // Display
-        Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);
+        Display display = DisplayManagerGlobal.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())));
 

cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java

diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
index e0ebd03..a7f538d 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
@@ -18,7 +18,7 @@
 
 import android.content.ComponentName;
 import android.graphics.PointF;
-import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManagerGlobal;
 import android.os.SystemClock;
 import android.view.Display;
 import android.view.KeyCharacterMap;
@@ -259,7 +259,7 @@
      *
      */
     private void generatePointerEvent(Random random, int gesture) {
-        Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);
+        Display display = DisplayManagerGlobal.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);
 
         PointF p1 = randomPoint(random, display);
         PointF v1 = randomVector(random);