From f752202bee88e31ce765483ba2efa6999ae9c9ad Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Wed, 3 Oct 2012 20:03:18 -0700 Subject: Plumbing to allow keyguard to be shown with user switcher (issue 7175023) -> Also reduced calls to lockNow, and moved this call in ActivityManagerService Change-Id: I9ba34ca902f7c0f71fa4ec302104688ca8d11f55 --- .../src/com/android/layoutlib/bridge/android/BridgeWindowManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/layoutlib/bridge') diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java index b8d21f3..dbd52a0 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java @@ -22,6 +22,7 @@ import com.android.internal.view.IInputMethodClient; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.graphics.Bitmap; +import android.os.Bundle; import android.os.IBinder; import android.os.IRemoteCallback; import android.os.RemoteException; @@ -438,7 +439,7 @@ public class BridgeWindowManager implements IWindowManager { } @Override - public void lockNow() { + public void lockNow(Bundle options) { // TODO Auto-generated method stub } -- cgit v1.1