Merge "HDMI-CEC: Adding null exception catch related to mHdmiConnection" into main (2ad54e41) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiCecController.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1001,7 +1001,7 @@ final class HdmiCecController {
		try {
		// Create an AIDL callback that can callback onHotplugEvent
		mHdmiConnection.setCallback(new HdmiConnectionCallbackAidl(callback));
		} catch (RemoteException e) {
		} catch (RemoteException \| NullPointerException e) {
		HdmiLogger.error("Couldn't initialise tv.hdmi callback : ", e);
		}
		}
		@@ -1134,7 +1134,7 @@ final class HdmiCecController {
		i++;
		}
		return hdmiPortInfo;
		} catch (RemoteException e) {
		} catch (RemoteException \| NullPointerException e) {
		HdmiLogger.error("Failed to get port information : ", e);
		return null;
		}
		@@ -1144,7 +1144,7 @@ final class HdmiCecController {
		public boolean nativeIsConnected(int port) {
		try {
		return mHdmiConnection.isConnected(port);
		} catch (RemoteException e) {
		} catch (RemoteException \| NullPointerException e) {
		HdmiLogger.error("Failed to get connection info : ", e);
		return false;
		}
		@@ -1158,7 +1158,7 @@ final class HdmiCecController {
		HdmiLogger.error(
		"Could not set HPD signal type for portId " + portId + " to " + signal
		+ ". Error: ", sse.errorCode);
		} catch (RemoteException e) {
		} catch (RemoteException \| NullPointerException e) {
		HdmiLogger.error(
		"Could not set HPD signal type for portId " + portId + " to " + signal
		+ ". Exception: ", e);
		@@ -1169,7 +1169,7 @@ final class HdmiCecController {
		public int nativeGetHpdSignalType(int portId) {
		try {
		return mHdmiConnection.getHpdSignal(portId);
		} catch (RemoteException e) {
		} catch (RemoteException \| NullPointerException e) {
		HdmiLogger.error(
		"Could not get HPD signal type for portId " + portId + ". Exception: ", e);
		return Constants.HDMI_HPD_TYPE_PHYSICAL;