Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait.

Browse Source 
Apps commonly do not handle landscape orientation cameras correctly. In
order to prevent stretching and rotation issues in these apps, this
patch adds a flag to override the behavior of these landscape cameras
to produce a portrait image instead by changing the SENSOR_ORIENTATION
reported by CameraCharacteristics and applying a 90 degree rotate and
crop. It also adds a CompatChanges entry which will track which apps
require this treatment.

Test: Ran on foldable device with several camera apps to verify behavior.
Bug: 250678880
Change-Id: I92b6f227916b97828ab6a7f856eea5a1e427644d
This commit is contained in:
Austin Borger
2022-11-17 17:02:09 -08:00
parent 28bd55410a
commit ddc70c75f3
6 changed files with 116 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -1139,6 +1139,7 @@ package android.hardware.camera2 {
public final class CameraManager { public final class CameraManager {
method public String[] getCameraIdListNoLazy() throws android.hardware.camera2.CameraAccessException; method public String[] getCameraIdListNoLazy() throws android.hardware.camera2.CameraAccessException;
method @RequiresPermission(allOf={android.Manifest.permission.SYSTEM_CAMERA, android.Manifest.permission.CAMERA}) public void openCamera(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException; method @RequiresPermission(allOf={android.Manifest.permission.SYSTEM_CAMERA, android.Manifest.permission.CAMERA}) public void openCamera(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;
field public static final long OVERRIDE_FRONT_CAMERA_APP_COMPAT = 250678880L; // 0xef10e60L
} }
public abstract static class CameraManager.AvailabilityCallback { public abstract static class CameraManager.AvailabilityCallback {

24
core/java/android/hardware/Camera.java
View File

@@ -29,12 +29,14 @@ import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SdkConstant.SdkConstantType;
import android.app.ActivityThread; import android.app.ActivityThread;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.compat.CompatChanges;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
import android.graphics.ImageFormat; import android.graphics.ImageFormat;
import android.graphics.Point; import android.graphics.Point;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.hardware.camera2.CameraManager;
import android.media.AudioAttributes; import android.media.AudioAttributes;
import android.media.IAudioService; import android.media.IAudioService;
import android.os.Build; import android.os.Build;
@@ -45,6 +47,7 @@ import android.os.Message;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties;
import android.renderscript.Allocation; import android.renderscript.Allocation;
import android.renderscript.Element; import android.renderscript.Element;
import android.renderscript.RSIllegalArgumentException; import android.renderscript.RSIllegalArgumentException;
@@ -281,6 +284,14 @@ public class Camera {
*/ */
public native static int getNumberOfCameras(); public native static int getNumberOfCameras();
private static final boolean sLandscapeToPortrait =
SystemProperties.getBoolean(CameraManager.LANDSCAPE_TO_PORTRAIT_PROP, false);
private static boolean shouldOverrideToPortrait() {
return CompatChanges.isChangeEnabled(CameraManager.OVERRIDE_FRONT_CAMERA_APP_COMPAT)
&& sLandscapeToPortrait;
}
/** /**
* Returns the information about a particular camera. * Returns the information about a particular camera.
* If {@link #getNumberOfCameras()} returns N, the valid id is 0 to N-1. * If {@link #getNumberOfCameras()} returns N, the valid id is 0 to N-1.
@@ -290,7 +301,9 @@ public class Camera {
* low-level failure). * low-level failure).
*/ */
public static void getCameraInfo(int cameraId, CameraInfo cameraInfo) { public static void getCameraInfo(int cameraId, CameraInfo cameraInfo) {
_getCameraInfo(cameraId, cameraInfo); boolean overrideToPortrait = shouldOverrideToPortrait();
_getCameraInfo(cameraId, overrideToPortrait, cameraInfo);
IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE); IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);
IAudioService audioService = IAudioService.Stub.asInterface(b); IAudioService audioService = IAudioService.Stub.asInterface(b);
try { try {
@@ -303,7 +316,8 @@ public class Camera {
Log.e(TAG, "Audio service is unavailable for queries"); Log.e(TAG, "Audio service is unavailable for queries");
} }
} }
private native static void _getCameraInfo(int cameraId, CameraInfo cameraInfo); private native static void _getCameraInfo(int cameraId, boolean overrideToPortrait,
CameraInfo cameraInfo);
/** /**
* Information about a camera * Information about a camera
@@ -484,8 +498,9 @@ public class Camera {
mEventHandler = null; mEventHandler = null;
} }
boolean overrideToPortrait = shouldOverrideToPortrait();
return native_setup(new WeakReference<Camera>(this), cameraId, return native_setup(new WeakReference<Camera>(this), cameraId,
ActivityThread.currentOpPackageName()); ActivityThread.currentOpPackageName(), overrideToPortrait);
} }
/** used by Camera#open, Camera#open(int) */ /** used by Camera#open, Camera#open(int) */
@@ -555,7 +570,8 @@ public class Camera {
} }
@UnsupportedAppUsage @UnsupportedAppUsage
private native int native_setup(Object cameraThis, int cameraId, String packageName); private native int native_setup(Object cameraThis, int cameraId, String packageName,
boolean overrideToPortrait);
private native final void native_release(); private native final void native_release();

41
core/java/android/hardware/camera2/CameraManager.java
View File

@@ -23,6 +23,10 @@ import android.annotation.RequiresPermission;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.SystemService; import android.annotation.SystemService;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.app.compat.CompatChanges;
import android.compat.annotation.ChangeId;
import android.compat.annotation.Disabled;
import android.compat.annotation.Overridable;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.Point; import android.graphics.Point;
@@ -103,6 +107,24 @@ public final class CameraManager {
"android.permission.CAMERA_OPEN_CLOSE_LISTENER"; "android.permission.CAMERA_OPEN_CLOSE_LISTENER";
private final boolean mHasOpenCloseListenerPermission; private final boolean mHasOpenCloseListenerPermission;
/**
* Force camera output to be rotated to portrait orientation on landscape cameras.
* Many apps do not handle this situation and display stretched images otherwise.
* @hide
*/
@ChangeId
@Overridable
@Disabled
@TestApi
public static final long OVERRIDE_FRONT_CAMERA_APP_COMPAT = 250678880L;
/**
* System property for allowing the above
* @hide
*/
public static final String LANDSCAPE_TO_PORTRAIT_PROP =
"camera.enable_landscape_to_portrait";
/** /**
* @hide * @hide
*/ */
@@ -520,7 +542,8 @@ public final class CameraManager {
for (String physicalCameraId : physicalCameraIds) { for (String physicalCameraId : physicalCameraIds) {
CameraMetadataNative physicalCameraInfo = CameraMetadataNative physicalCameraInfo =
cameraService.getCameraCharacteristics(physicalCameraId, cameraService.getCameraCharacteristics(physicalCameraId,
mContext.getApplicationInfo().targetSdkVersion); mContext.getApplicationInfo().targetSdkVersion,
/*overrideToPortrait*/false);
StreamConfiguration[] configs = physicalCameraInfo.get( StreamConfiguration[] configs = physicalCameraInfo.get(
CameraCharacteristics. CameraCharacteristics.
SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS); SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS);
@@ -579,8 +602,9 @@ public final class CameraManager {
try { try {
Size displaySize = getDisplaySize(); Size displaySize = getDisplaySize();
boolean overrideToPortrait = shouldOverrideToPortrait();
CameraMetadataNative info = cameraService.getCameraCharacteristics(cameraId, CameraMetadataNative info = cameraService.getCameraCharacteristics(cameraId,
mContext.getApplicationInfo().targetSdkVersion); mContext.getApplicationInfo().targetSdkVersion, overrideToPortrait);
try { try {
info.setCameraId(Integer.parseInt(cameraId)); info.setCameraId(Integer.parseInt(cameraId));
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
@@ -697,9 +721,12 @@ public final class CameraManager {
ICameraService.ERROR_DISCONNECTED, ICameraService.ERROR_DISCONNECTED,
"Camera service is currently unavailable"); "Camera service is currently unavailable");
} }
boolean overrideToPortrait = shouldOverrideToPortrait();
cameraUser = cameraService.connectDevice(callbacks, cameraId, cameraUser = cameraService.connectDevice(callbacks, cameraId,
mContext.getOpPackageName(), mContext.getAttributionTag(), uid, mContext.getOpPackageName(), mContext.getAttributionTag(), uid,
oomScoreOffset, mContext.getApplicationInfo().targetSdkVersion); oomScoreOffset, mContext.getApplicationInfo().targetSdkVersion,
overrideToPortrait);
} catch (ServiceSpecificException e) { } catch (ServiceSpecificException e) {
if (e.errorCode == ICameraService.ERROR_DEPRECATED_HAL) { if (e.errorCode == ICameraService.ERROR_DEPRECATED_HAL) {
throw new AssertionError("Should've gone down the shim path"); throw new AssertionError("Should've gone down the shim path");
@@ -1127,6 +1154,11 @@ public final class CameraManager {
return CameraManagerGlobal.get().getTorchStrengthLevel(cameraId); return CameraManagerGlobal.get().getTorchStrengthLevel(cameraId);
} }
private static boolean shouldOverrideToPortrait() {
return CompatChanges.isChangeEnabled(OVERRIDE_FRONT_CAMERA_APP_COMPAT)
&& CameraManagerGlobal.sLandscapeToPortrait;
}
/** /**
* A callback for camera devices becoming available or unavailable to open. * A callback for camera devices becoming available or unavailable to open.
* *
@@ -1573,6 +1605,9 @@ public final class CameraManager {
public static final boolean sCameraServiceDisabled = public static final boolean sCameraServiceDisabled =
SystemProperties.getBoolean("config.disable_cameraservice", false); SystemProperties.getBoolean("config.disable_cameraservice", false);
public static final boolean sLandscapeToPortrait =
SystemProperties.getBoolean(LANDSCAPE_TO_PORTRAIT_PROP, false);
public static CameraManagerGlobal get() { public static CameraManagerGlobal get() {
return gCameraManager; return gCameraManager;
} }

142
core/jni/android_hardware_Camera.cpp
View File

@@ -529,9 +529,8 @@ static jint android_hardware_Camera_getNumberOfCameras(JNIEnv *env, jobject thiz
return Camera::getNumberOfCameras(); return Camera::getNumberOfCameras();
} }
static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz, static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz, jint cameraId,
jint cameraId, jobject info_obj) jboolean overrideToPortrait, jobject info_obj) {
{
CameraInfo cameraInfo; CameraInfo cameraInfo;
if (cameraId >= Camera::getNumberOfCameras() || cameraId < 0) { if (cameraId >= Camera::getNumberOfCameras() || cameraId < 0) {
ALOGE("%s: Unknown camera ID %d", __FUNCTION__, cameraId); ALOGE("%s: Unknown camera ID %d", __FUNCTION__, cameraId);
@@ -539,7 +538,7 @@ static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz,
return; return;
} }
status_t rc = Camera::getCameraInfo(cameraId, &cameraInfo); status_t rc = Camera::getCameraInfo(cameraId, overrideToPortrait, &cameraInfo);
if (rc != NO_ERROR) { if (rc != NO_ERROR) {
jniThrowRuntimeException(env, "Fail to get camera info"); jniThrowRuntimeException(env, "Fail to get camera info");
return; return;
@@ -555,9 +554,9 @@ static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz,
} }
// connect to camera service // connect to camera service
static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobject weak_this,
jobject weak_this, jint cameraId, jstring clientPackageName) jint cameraId, jstring clientPackageName,
{ jboolean overrideToPortrait) {
// Convert jstring to String16 // Convert jstring to String16
const char16_t *rawClientName = reinterpret_cast<const char16_t*>( const char16_t *rawClientName = reinterpret_cast<const char16_t*>(
env->GetStringChars(clientPackageName, NULL)); env->GetStringChars(clientPackageName, NULL));
@@ -567,8 +566,9 @@ static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz,
reinterpret_cast<const jchar*>(rawClientName)); reinterpret_cast<const jchar*>(rawClientName));
int targetSdkVersion = android_get_application_target_sdk_version(); int targetSdkVersion = android_get_application_target_sdk_version();
sp<Camera> camera = Camera::connect(cameraId, clientName, Camera::USE_CALLING_UID, sp<Camera> camera =
Camera::USE_CALLING_PID, targetSdkVersion); Camera::connect(cameraId, clientName, Camera::USE_CALLING_UID, Camera::USE_CALLING_PID,
targetSdkVersion, overrideToPortrait);
if (camera == NULL) { if (camera == NULL) {
return -EACCES; return -EACCES;
} }
@@ -596,7 +596,7 @@ static jint android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz,
// Update default display orientation in case the sensor is reverse-landscape // Update default display orientation in case the sensor is reverse-landscape
CameraInfo cameraInfo; CameraInfo cameraInfo;
status_t rc = Camera::getCameraInfo(cameraId, &cameraInfo); status_t rc = Camera::getCameraInfo(cameraId, overrideToPortrait, &cameraInfo);
if (rc != NO_ERROR) { if (rc != NO_ERROR) {
ALOGE("%s: getCameraInfo error: %d", __FUNCTION__, rc); ALOGE("%s: getCameraInfo error: %d", __FUNCTION__, rc);
return rc; return rc;
@@ -1051,93 +1051,43 @@ static int32_t android_hardware_Camera_getAudioRestriction(
//------------------------------------------------- //-------------------------------------------------
static const JNINativeMethod camMethods[] = { static const JNINativeMethod camMethods[] = {
{ "getNumberOfCameras", {"getNumberOfCameras", "()I", (void *)android_hardware_Camera_getNumberOfCameras},
"()I", {"_getCameraInfo", "(IZLandroid/hardware/Camera$CameraInfo;)V",
(void *)android_hardware_Camera_getNumberOfCameras }, (void *)android_hardware_Camera_getCameraInfo},
{ "_getCameraInfo", {"native_setup", "(Ljava/lang/Object;ILjava/lang/String;Z)I",
"(ILandroid/hardware/Camera$CameraInfo;)V", (void *)android_hardware_Camera_native_setup},
(void*)android_hardware_Camera_getCameraInfo }, {"native_release", "()V", (void *)android_hardware_Camera_release},
{ "native_setup", {"setPreviewSurface", "(Landroid/view/Surface;)V",
"(Ljava/lang/Object;ILjava/lang/String;)I", (void *)android_hardware_Camera_setPreviewSurface},
(void*)android_hardware_Camera_native_setup }, {"setPreviewTexture", "(Landroid/graphics/SurfaceTexture;)V",
{ "native_release", (void *)android_hardware_Camera_setPreviewTexture},
"()V", {"setPreviewCallbackSurface", "(Landroid/view/Surface;)V",
(void*)android_hardware_Camera_release }, (void *)android_hardware_Camera_setPreviewCallbackSurface},
{ "setPreviewSurface", {"startPreview", "()V", (void *)android_hardware_Camera_startPreview},
"(Landroid/view/Surface;)V", {"_stopPreview", "()V", (void *)android_hardware_Camera_stopPreview},
(void *)android_hardware_Camera_setPreviewSurface }, {"previewEnabled", "()Z", (void *)android_hardware_Camera_previewEnabled},
{ "setPreviewTexture", {"setHasPreviewCallback", "(ZZ)V", (void *)android_hardware_Camera_setHasPreviewCallback},
"(Landroid/graphics/SurfaceTexture;)V", {"_addCallbackBuffer", "([BI)V", (void *)android_hardware_Camera_addCallbackBuffer},
(void *)android_hardware_Camera_setPreviewTexture }, {"native_autoFocus", "()V", (void *)android_hardware_Camera_autoFocus},
{ "setPreviewCallbackSurface", {"native_cancelAutoFocus", "()V", (void *)android_hardware_Camera_cancelAutoFocus},
"(Landroid/view/Surface;)V", {"native_takePicture", "(I)V", (void *)android_hardware_Camera_takePicture},
(void *)android_hardware_Camera_setPreviewCallbackSurface }, {"native_setParameters", "(Ljava/lang/String;)V",
{ "startPreview", (void *)android_hardware_Camera_setParameters},
"()V", {"native_getParameters", "()Ljava/lang/String;",
(void *)android_hardware_Camera_startPreview }, (void *)android_hardware_Camera_getParameters},
{ "_stopPreview", {"reconnect", "()V", (void *)android_hardware_Camera_reconnect},
"()V", {"lock", "()V", (void *)android_hardware_Camera_lock},
(void *)android_hardware_Camera_stopPreview }, {"unlock", "()V", (void *)android_hardware_Camera_unlock},
{ "previewEnabled", {"startSmoothZoom", "(I)V", (void *)android_hardware_Camera_startSmoothZoom},
"()Z", {"stopSmoothZoom", "()V", (void *)android_hardware_Camera_stopSmoothZoom},
(void *)android_hardware_Camera_previewEnabled }, {"setDisplayOrientation", "(I)V", (void *)android_hardware_Camera_setDisplayOrientation},
{ "setHasPreviewCallback", {"_enableShutterSound", "(Z)Z", (void *)android_hardware_Camera_enableShutterSound},
"(ZZ)V", {"_startFaceDetection", "(I)V", (void *)android_hardware_Camera_startFaceDetection},
(void *)android_hardware_Camera_setHasPreviewCallback }, {"_stopFaceDetection", "()V", (void *)android_hardware_Camera_stopFaceDetection},
{ "_addCallbackBuffer", {"enableFocusMoveCallback", "(I)V",
"([BI)V",
(void *)android_hardware_Camera_addCallbackBuffer },
{ "native_autoFocus",
"()V",
(void *)android_hardware_Camera_autoFocus },
{ "native_cancelAutoFocus",
"()V",
(void *)android_hardware_Camera_cancelAutoFocus },
{ "native_takePicture",
"(I)V",
(void *)android_hardware_Camera_takePicture },
{ "native_setParameters",
"(Ljava/lang/String;)V",
(void *)android_hardware_Camera_setParameters },
{ "native_getParameters",
"()Ljava/lang/String;",
(void *)android_hardware_Camera_getParameters },
{ "reconnect",
"()V",
(void*)android_hardware_Camera_reconnect },
{ "lock",
"()V",
(void*)android_hardware_Camera_lock },
{ "unlock",
"()V",
(void*)android_hardware_Camera_unlock },
{ "startSmoothZoom",
"(I)V",
(void *)android_hardware_Camera_startSmoothZoom },
{ "stopSmoothZoom",
"()V",
(void *)android_hardware_Camera_stopSmoothZoom },
{ "setDisplayOrientation",
"(I)V",
(void *)android_hardware_Camera_setDisplayOrientation },
{ "_enableShutterSound",
"(Z)Z",
(void *)android_hardware_Camera_enableShutterSound },
{ "_startFaceDetection",
"(I)V",
(void *)android_hardware_Camera_startFaceDetection },
{ "_stopFaceDetection",
"()V",
(void *)android_hardware_Camera_stopFaceDetection},
{ "enableFocusMoveCallback",
"(I)V",
(void *)android_hardware_Camera_enableFocusMoveCallback}, (void *)android_hardware_Camera_enableFocusMoveCallback},
{ "setAudioRestriction", {"setAudioRestriction", "(I)V", (void *)android_hardware_Camera_setAudioRestriction},
"(I)V", {"getAudioRestriction", "()I", (void *)android_hardware_Camera_getAudioRestriction},
(void *)android_hardware_Camera_setAudioRestriction},
{ "getAudioRestriction",
"()I",
(void *)android_hardware_Camera_getAudioRestriction},
}; };
struct field { struct field {

9
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java
View File

@@ -85,7 +85,8 @@ public class CameraBinderTest extends AndroidTestCase {
public void testCameraInfo() throws Exception { public void testCameraInfo() throws Exception {
for (int cameraId = 0; cameraId < mUtils.getGuessedNumCameras(); ++cameraId) { for (int cameraId = 0; cameraId < mUtils.getGuessedNumCameras(); ++cameraId) {
CameraInfo info = mUtils.getCameraService().getCameraInfo(cameraId); CameraInfo info = mUtils.getCameraService().getCameraInfo(cameraId,
/*overrideToPortrait*/false);
assertTrue("Facing was not set for camera " + cameraId, info.info.facing != -1); assertTrue("Facing was not set for camera " + cameraId, info.info.facing != -1);
assertTrue("Orientation was not set for camera " + cameraId, assertTrue("Orientation was not set for camera " + cameraId,
info.info.orientation != -1); info.info.orientation != -1);
@@ -159,7 +160,8 @@ public class CameraBinderTest extends AndroidTestCase {
.connect(dummyCallbacks, cameraId, clientPackageName, .connect(dummyCallbacks, cameraId, clientPackageName,
ICameraService.USE_CALLING_UID, ICameraService.USE_CALLING_UID,
ICameraService.USE_CALLING_PID, ICameraService.USE_CALLING_PID,
getContext().getApplicationInfo().targetSdkVersion); getContext().getApplicationInfo().targetSdkVersion,
/*overrideToPortrait*/false);
assertNotNull(String.format("Camera %s was null", cameraId), cameraUser); assertNotNull(String.format("Camera %s was null", cameraId), cameraUser);
Log.v(TAG, String.format("Camera %s connected", cameraId)); Log.v(TAG, String.format("Camera %s connected", cameraId));
@@ -264,7 +266,8 @@ public class CameraBinderTest extends AndroidTestCase {
dummyCallbacks, String.valueOf(cameraId), dummyCallbacks, String.valueOf(cameraId),
clientPackageName, clientAttributionTag, clientPackageName, clientAttributionTag,
ICameraService.USE_CALLING_UID, 0 /*oomScoreOffset*/, ICameraService.USE_CALLING_UID, 0 /*oomScoreOffset*/,
getContext().getApplicationInfo().targetSdkVersion); getContext().getApplicationInfo().targetSdkVersion,
/*overrideToPortrait*/false);
assertNotNull(String.format("Camera %s was null", cameraId), cameraUser); assertNotNull(String.format("Camera %s was null", cameraId), cameraUser);
Log.v(TAG, String.format("Camera %s connected", cameraId)); Log.v(TAG, String.format("Camera %s connected", cameraId));

5
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java
View File

@@ -244,7 +244,8 @@ public class CameraDeviceBinderTest extends AndroidTestCase {
mCameraUser = mUtils.getCameraService().connectDevice(mMockCb, mCameraId, mCameraUser = mUtils.getCameraService().connectDevice(mMockCb, mCameraId,
clientPackageName, clientAttributionTag, ICameraService.USE_CALLING_UID, clientPackageName, clientAttributionTag, ICameraService.USE_CALLING_UID,
/*oomScoreOffset*/0, getContext().getApplicationInfo().targetSdkVersion); /*oomScoreOffset*/0, getContext().getApplicationInfo().targetSdkVersion,
/*overrideToPortrait*/false);
assertNotNull(String.format("Camera %s was null", mCameraId), mCameraUser); assertNotNull(String.format("Camera %s was null", mCameraId), mCameraUser);
mHandlerThread = new HandlerThread(TAG); mHandlerThread = new HandlerThread(TAG);
mHandlerThread.start(); mHandlerThread.start();
@@ -417,7 +418,7 @@ public class CameraDeviceBinderTest extends AndroidTestCase {
@SmallTest @SmallTest
public void testCameraCharacteristics() throws RemoteException { public void testCameraCharacteristics() throws RemoteException {
CameraMetadataNative info = mUtils.getCameraService().getCameraCharacteristics(mCameraId, CameraMetadataNative info = mUtils.getCameraService().getCameraCharacteristics(mCameraId,
getContext().getApplicationInfo().targetSdkVersion); getContext().getApplicationInfo().targetSdkVersion, /*overrideToPortrait*/false);
assertFalse(info.isEmpty()); assertFalse(info.isEmpty());
assertNotNull(info.get(CameraCharacteristics.SCALER_AVAILABLE_FORMATS)); assertNotNull(info.get(CameraCharacteristics.SCALER_AVAILABLE_FORMATS));