From 9deb753f2ee1777225ed3b2e6b339f1d8f6e9f69 Mon Sep 17 00:00:00 2001
From: Scott Wiest <scottwiest@google.com>
Date: Mon, 3 Oct 2022 17:36:55 +0000
Subject: [PATCH] Checking for null proxy object before operating on a method
 of the proxy object

Test: Compiled code

Bug: 242767826

Change-Id: I47e705902220e690ea8b560b051fc446a6ec2955
---
 .../hardware/camera2/CameraExtensionCharacteristics.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
index 0f6010fffcb64..2a47851764da2 100644
--- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
@@ -272,6 +272,9 @@ public final class CameraExtensionCharacteristics {
                     @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) {