diff options
Diffstat (limited to 'media/tests')
2 files changed, 29 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java index ac85ab7f6a6e..88c1c434cc0d 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java @@ -257,6 +257,16 @@ public class CameraBinderTest extends AndroidTestCase { public void onRepeatingRequestError(long lastFrameNumber, int repeatingRequestId) { // TODO Auto-generated method stub } + + /* + * (non-Javadoc) + * @see android.hardware.camera2.ICameraDeviceCallbacks#onClientSharedAccessPriorityChanged + */ + @Override + public void onClientSharedAccessPriorityChanged(boolean primaryClient) { + // TODO Auto-generated method stub + } + } @SmallTest @@ -276,7 +286,7 @@ public class CameraBinderTest extends AndroidTestCase { 0 /*oomScoreOffset*/, getContext().getApplicationInfo().targetSdkVersion, ICameraService.ROTATION_OVERRIDE_NONE, clientAttribution, - DEVICE_POLICY_DEFAULT); + DEVICE_POLICY_DEFAULT, false/*sharedMode*/); assertNotNull(String.format("Camera %s was null", cameraId), cameraUser); Log.v(TAG, String.format("Camera %s connected", cameraId)); @@ -320,6 +330,13 @@ public class CameraBinderTest extends AndroidTestCase { Log.v(TAG, String.format("Camera " + cameraId + " torch strength level changed to " + torchStrength )); } + @Override + public void onCameraOpenedInSharedMode(String cameraId, String clientPackageName, + int deviceId, boolean primaryClient) { + Log.v(TAG, "Camera " + cameraId + " is opened in shared mode by " + + "client package " + clientPackageName + " as primary client=" + + primaryClient); + } } /** diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java index 35ad924cee74..3758c515c1a5 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -175,6 +175,15 @@ public class CameraDeviceBinderTest extends AndroidTestCase { public void onRepeatingRequestError(long lastFrameNumber, int repeatingRequestId) { // TODO Auto-generated method stub } + + /** + * (non-Javadoc) + * @see android.hardware.camera2.ICameraDeviceCallbacks#onClientSharedAccessPriorityChanged + */ + @Override + public void onClientSharedAccessPriorityChanged(boolean primaryClient) { + // TODO Auto-generated method stub + } } class IsMetadataNotEmpty implements ArgumentMatcher<CameraMetadataNative> { @@ -250,7 +259,8 @@ public class CameraDeviceBinderTest extends AndroidTestCase { mCameraUser = mUtils.getCameraService().connectDevice(mMockCb, mCameraId, /*oomScoreOffset*/0, getContext().getApplicationInfo().targetSdkVersion, - ICameraService.ROTATION_OVERRIDE_NONE, clientAttribution, DEVICE_POLICY_DEFAULT); + ICameraService.ROTATION_OVERRIDE_NONE, clientAttribution, DEVICE_POLICY_DEFAULT, + /*sharedMode*/false); assertNotNull(String.format("Camera %s was null", mCameraId), mCameraUser); mHandlerThread = new HandlerThread(TAG); mHandlerThread.start(); |