Display and control your Android device
Ignore unknown methods in IDisplayWindowListener
Romain Vimonte11399aff056
diff --git a/server/src/main/aidl/android/view/IDisplayWindowListener.aidl b/server/src/main/aidl/android/view/IDisplayWindowListener.aidlindex 3e664e81..0d1f1979 100644--- a/server/src/main/aidl/android/view/IDisplayWindowListener.aidl+++ b/server/src/main/aidl/android/view/IDisplayWindowListener.aidl@@ -48,27 +48,4 @@ oneway interface IDisplayWindowListener {* Called when a display is removed from the hierarchy.*/void onDisplayRemoved(int displayId);-- /**- * Called when fixed rotation is started on a display.- */- void onFixedRotationStarted(int displayId, int newRotation);-- /**- * Called when the previous fixed rotation on a display is finished.- */- void onFixedRotationFinished(int displayId);-- /**- * Called when the keep clear ares on a display have changed.- */- void onKeepClearAreasChanged(int displayId, in List<Rect> restricted, in List<Rect> unrestricted);-- /**- * Called when the eligibility of the desktop mode for a display have changed.- */- void onDesktopModeEligibleChanged(int displayId);-- void onDisplayAddSystemDecorations(int displayId);- void onDisplayRemoveSystemDecorations(int displayId);}diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayWindowListener.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayWindowListener.javaindex b8b00e44..1573d817 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayWindowListener.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/DisplayWindowListener.java@@ -1,11 +1,12 @@package com.genymobile.scrcpy.wrappers;+import com.genymobile.scrcpy.util.Ln;+import android.content.res.Configuration;-import android.graphics.Rect;+import android.os.Parcel;+import android.os.RemoteException;import android.view.IDisplayWindowListener;-import java.util.List;-public class DisplayWindowListener extends IDisplayWindowListener.Stub {@Overridepublic void onDisplayAdded(int displayId) {@@ -23,32 +24,14 @@ public class DisplayWindowListener extends IDisplayWindowListener.Stub {}@Override- public void onFixedRotationStarted(int displayId, int newRotation) {- // empty default implementation- }-- @Override- public void onFixedRotationFinished(int displayId) {- // empty default implementation- }-- @Override- public void onKeepClearAreasChanged(int displayId, List<Rect> restricted, List<Rect> unrestricted) {- // empty default implementation- }-- @Override- public void onDesktopModeEligibleChanged(int displayId) {- // empty default implementation- }-- @Override- public void onDisplayAddSystemDecorations(int displayId) {- // empty default implementation- }-- @Override- public void onDisplayRemoveSystemDecorations(int displayId) {- // empty default implementation+ public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {+ try {+ return super.onTransact(code, data, reply, flags);+ } catch (AbstractMethodError e) {+ Ln.v("Ignoring AbstractMethodError: " + e.getMessage());+ // Ignore unknown methods, write default response to reply parcel+ reply.writeNoException();+ return true;+ }}}