Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 258c1b88 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Pass an executor during the extension characteristics service... 

Merge "Camera: Pass an executor during the extension characteristics service bind call" into sc-dev am: 4ed9ab51 am: bc740c00

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14986715

Change-Id: I17eaf88477bc0090a6712acd1130e9c17158b1f8
parents 7a45c911 bc740c00

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

+3 −3
Original line number Diff line number Diff line
@@ -270,9 +270,9 @@ public final class CameraExtensionCharacteristics { 
                        }

                    }

                };

                ctx.bindService(intent, mConnection, Context.BIND_AUTO_CREATE |

                        Context.BIND_IMPORTANT | Context.BIND_ABOVE_CLIENT |

                        Context.BIND_NOT_VISIBLE);

                ctx.bindService(intent, Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT |

                        Context.BIND_ABOVE_CLIENT | Context.BIND_NOT_VISIBLE,

                        android.os.AsyncTask.THREAD_POOL_EXECUTOR, mConnection);



                try {

                    mInitFuture.get(PROXY_SERVICE_DELAY_MS, TimeUnit.MILLISECONDS);