commit 9deb753f2ee1777225ed3b2e6b339f1d8f6e9f69
author Scott Wiest <scottwiest@google.com> Mon Oct 03 17:36:55 2022 +0000
committer Scott Wiest <scottwiest@google.com> Mon Oct 03 19:08:21 2022 +0000
tree 0bd1155714c54fb480b6d2ec89544c23bdd0ad61
parent 56dcd86497f6f059333adf3485509f039b2c7b8c

Checking for null proxy object before operating on a method of the proxy
object

Test: Compiled code

Bug: 242767826

Change-Id: I47e705902220e690ea8b560b051fc446a6ec2955

core/java/android/hardware/camera2/CameraExtensionCharacteristics.java

diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
index 0f6010f..2a478517 100644
--- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
@@ -272,6 +272,9 @@
                     @Override
                     public void onServiceConnected(ComponentName component, IBinder binder) {
                         mProxy = ICameraExtensionsProxyService.Stub.asInterface(binder);
+                        if (mProxy == null) {
+                            throw new IllegalStateException("Camera Proxy service is null");
+                        }
                         try {
                             mSupportsAdvancedExtensions = mProxy.advancedExtensionsSupported();
                         } catch (RemoteException e) {