summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-09-21 18:34:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-09-21 18:34:59 +0000
commit2f68a663a9635ef3c0598832c9a50974fe37f87d (patch)
tree54aecd40b7dfb0cfdbc2f4dca83b75d3dd4fd1b7 /core/java/android
parent2d4f9f812028ce661f30f1a29f7b207bd606a4be (diff)
parent0cde32dbf23b6e93c99edd012d1b78eec552cc2b (diff)
Merge "Wait for camera extensions service during initialization" into sc-qpr1-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/camera2/CameraExtensionCharacteristics.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
index 5cfba3d945cd..395c655ddf7c 100644
--- a/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
+++ b/core/java/android/hardware/camera2/CameraExtensionCharacteristics.java
@@ -263,12 +263,12 @@ public final class CameraExtensionCharacteristics {
@Override
public void onServiceConnected(ComponentName component, IBinder binder) {
mProxy = ICameraExtensionsProxyService.Stub.asInterface(binder);
- mInitFuture.setStatus(true);
try {
mSupportsAdvancedExtensions = mProxy.advancedExtensionsSupported();
} catch (RemoteException e) {
Log.e(TAG, "Remote IPC failed!");
}
+ mInitFuture.setStatus(true);
}
};
ctx.bindService(intent, Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT |