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

Commit eb8cb7fe authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Add analytics for feature combination query" into main

parents 811ddd14 721ded44

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

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ public class CameraDeviceSetupImpl extends CameraDevice.CameraDeviceSetup { 


            try {

                return cameraService.isSessionConfigurationWithParametersSupported(mCameraId,

                        mTargetSdkVersion, config, mContext.getDeviceId(),

                        mTargetSdkVersion, config,

                        mContext.getDeviceId(),

                        mCameraManager.getDevicePolicyFromContext(mContext));

            } catch (ServiceSpecificException e) {

                throw ExceptionUtils.throwAsPublicException(e);

services/core/java/com/android/server/camera/CameraServiceProxy.java

+314 −183

File changed.

Preview size limit exceeded, changes collapsed.

services/core/java/com/android/server/camera/CameraStatsJobService.java

+3 −4
Original line number Diff line number Diff line
@@ -21,14 +21,13 @@ import android.app.job.JobParameters; 
import android.app.job.JobScheduler;

import android.app.job.JobService;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.util.Slog;



import java.util.concurrent.TimeUnit;



import com.android.server.LocalServices;



import java.util.concurrent.TimeUnit;



/**

 * A JobService to periodically collect camera usage stats.

 */
@@ -50,7 +49,7 @@ public class CameraStatsJobService extends JobService { 
            return false;

        }



        serviceProxy.dumpUsageEvents();

        serviceProxy.dumpCameraEvents();

        return false;

    }