Merge remote-tracking branch 'goog/master-lockscreen-dev'

Bug: 13635952
Change-Id: Iae69d798155e3aa7e8d94de45977115e16ec66de

1 files changed, 10 insertions, 2 deletions

diff --git a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
index 4dd1446..757cdd2 100644
--- a/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
+++ b/tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java
@@ -29,6 +29,8 @@ import android.os.IRemoteCallback;
 import android.os.RemoteException;
 import android.util.DisplayMetrics;
 
+import java.lang.Override;
+
 /**
  * Basic implementation of {@link IWindowManager} so that {@link Display} (and
  * {@link Display_Delegate}) can return a valid instance.
@@ -453,13 +455,19 @@ public class IWindowManagerImpl implements IWindowManager {
     }
 
     @Override
-    public boolean clearWindowContentFrameStats(IBinder token) {
+    public void enableScreenIfNeeded() throws RemoteException {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
+    public boolean clearWindowContentFrameStats(IBinder token) throws RemoteException {
         // TODO Auto-generated method stub
         return false;
     }
 
     @Override
-    public WindowContentFrameStats getWindowContentFrameStats(IBinder token) {
+    public WindowContentFrameStats getWindowContentFrameStats(IBinder token)
+            throws RemoteException {
         // TODO Auto-generated method stub
         return null;
     }