summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2014-05-29 18:32:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-29 18:32:41 +0000
commitc7b1b7aeec62677bad38d571e561653763392bf0 (patch)
treef2f830e257f221e25f963b0fbf614e691eab1fd1
parenteb61eb786af1db1f1cf6c988d78d1ddc3acb4a16 (diff)
parent8bd94d502d2dfe17a2147ca4fd7c8baa6bbc06d5 (diff)
downloadframeworks_base-c7b1b7aeec62677bad38d571e561653763392bf0.zip
frameworks_base-c7b1b7aeec62677bad38d571e561653763392bf0.tar.gz
frameworks_base-c7b1b7aeec62677bad38d571e561653763392bf0.tar.bz2
Merge "implement keyguardGoingAway() fixes build." into lmp-preview-dev
-rw-r--r--tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index e1a9719..3bf2b20 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -439,6 +439,10 @@ public class IWindowManagerImpl implements IWindowManager {
}
@Override
+ public void keyguardGoingAway() throws RemoteException {
+ }
+
+ @Override
public void lockNow(Bundle options) {
// TODO Auto-generated method stub
}