commit ee1e5bee68e1bc731b379b62eb6660e488f506c9
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 22 22:15:31 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 22 22:15:31 2018 +0000
tree 2f547c455c09b84aedaca37caf189b03cc9e6688
parent bad64df1e6737d16771faeebfb825355bac9f038
parent 94f61fd0f610ef901cdb7cd0c3a3fd17007e90b4

Merge "Updating overriden method PackageManager#setSuspended" into pi-dev

bridge/src/android/view/IWindowManagerImpl.java

diff --git a/bridge/src/android/view/IWindowManagerImpl.java b/bridge/src/android/view/IWindowManagerImpl.java
index 72e78ac..f62aa6c 100644
--- a/bridge/src/android/view/IWindowManagerImpl.java
+++ b/bridge/src/android/view/IWindowManagerImpl.java
@@ -346,7 +346,7 @@
     }
 
     @Override
-    public void setScreenCaptureDisabled(int userId, boolean disabled) {
+    public void refreshScreenCaptureDisabled(int userId) {
         // TODO Auto-generated method stub
     }
 
@@ -387,6 +387,11 @@
     }
 
     @Override
+    public void setShelfHeight(boolean visible, int shelfHeight) {
+        // TODO Auto-generated method stub
+    }
+
+    @Override
     public void setNavBarVirtualKeyHapticFeedbackEnabled(boolean enabled) {
     }
 
@@ -561,4 +566,8 @@
     @Override
     public void requestUserActivityNotification() throws RemoteException {
     }
+
+    @Override
+    public void dontOverrideDisplayInfo(int displayId) throws RemoteException {
+    }
 }

bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java

diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java b/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
index 3a7dbb9..73a9a62 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/BridgePackageManager.java
@@ -434,6 +434,11 @@
     }
 
     @Override
+    public ResolveInfo resolveServiceAsUser(Intent intent, int flags, int userId) {
+        return null;
+    }
+
+    @Override
     public List<ResolveInfo> queryIntentServices(Intent intent, int flags) {
         return null;
     }

bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java

diff --git a/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
index 3c1dc8d..b87ca3b 100644
--- a/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
+++ b/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
@@ -166,4 +166,9 @@
     public int getLastShutdownReason() {
         return PowerManager.SHUTDOWN_REASON_UNKNOWN;
     }
+
+    @Override
+    public void setDozeAfterScreenOff(boolean mode) throws RemoteException {
+        // pass for now.
+    }
 }