diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-10-03 20:03:18 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-10-04 17:53:01 -0700 |
| commit | f752202bee88e31ce765483ba2efa6999ae9c9ad (patch) | |
| tree | bdab562d4383a67f3806617d2ca3aa3e53862d67 /tools | |
| parent | 17f36d154f1a8ebe72fc35af332f5c0069503364 (diff) | |
| download | frameworks_base-f752202bee88e31ce765483ba2efa6999ae9c9ad.zip frameworks_base-f752202bee88e31ce765483ba2efa6999ae9c9ad.tar.gz frameworks_base-f752202bee88e31ce765483ba2efa6999ae9c9ad.tar.bz2 | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 } |