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

Commit 86b0cb3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Camera: Set device executor thread name" into main

parents 7f8eef19 42e3ba78

core/java/android/hardware/camera2/impl/CameraDeviceImpl.java

+17 −1
Original line number Original line Diff line number Diff line
@@ -80,6 +80,7 @@ import java.util.Set; 
import java.util.concurrent.Executor;

import java.util.concurrent.Executor;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.concurrent.Executors;

import java.util.concurrent.ThreadFactory;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicBoolean;





/**

/**
@@ -90,6 +91,17 @@ public class CameraDeviceImpl extends CameraDevice 
    private final String TAG;

    private final String TAG;

    private final boolean DEBUG = false;

    private final boolean DEBUG = false;





    private static final ThreadFactory sThreadFactory = new ThreadFactory() {

        private static final ThreadFactory mFactory = Executors.defaultThreadFactory();



        @Override

        public Thread newThread(Runnable r) {

            Thread thread = mFactory.newThread(r);

            thread.setName("CameraDeviceExecutor");

            return thread;

        }

    };



    private static final int REQUEST_ID_NONE = -1;

    private static final int REQUEST_ID_NONE = -1;





    /**

    /**
@@ -354,7 +366,11 @@ public class CameraDeviceImpl extends CameraDevice 
        mCameraId = cameraId;

        mCameraId = cameraId;

        if (Flags.singleThreadExecutor()) {

        if (Flags.singleThreadExecutor()) {

            mDeviceCallback = new ClientStateCallback(executor, callback);

            mDeviceCallback = new ClientStateCallback(executor, callback);

            if (Flags.singleThreadExecutorNaming()) {

                mDeviceExecutor = Executors.newSingleThreadExecutor(sThreadFactory);

            } else {

                mDeviceExecutor = Executors.newSingleThreadExecutor();

                mDeviceExecutor = Executors.newSingleThreadExecutor();

            }

        } else {

        } else {

            mDeviceCallback = callback;

            mDeviceCallback = callback;

            mDeviceExecutor = executor;

            mDeviceExecutor = executor;