diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-04-15 17:56:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 17:56:39 +0000 |
| commit | e9e5a162c0740a311f53a53732254c64dc197d92 (patch) | |
| tree | 5f9dc8789df4bfa33d459b7353edf2e05b450427 /media/tests | |
| parent | ad83f87bcfc4f3ee4bcc972bad4ddcaaf4e57426 (diff) | |
| parent | ad916f7fd3fbb202f2993fea04b0bdad3dcd6de6 (diff) | |
| download | frameworks_base-e9e5a162c0740a311f53a53732254c64dc197d92.zip frameworks_base-e9e5a162c0740a311f53a53732254c64dc197d92.tar.gz frameworks_base-e9e5a162c0740a311f53a53732254c64dc197d92.tar.bz2 | |
Merge "Camera2: Add prepare method for output buffer pre-allocation"
Diffstat (limited to 'media/tests')
2 files changed, 20 insertions, 0 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 3bb5f01..14c2619 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraBinderTest.java @@ -261,6 +261,16 @@ public class CameraBinderTest extends AndroidTestCase { // TODO Auto-generated method stub } + + /* + * (non-Javadoc) + * @see android.hardware.camera2.ICameraDeviceCallbacks#onPrepared() + */ + @Override + public void onPrepared(int streamId) throws RemoteException { + // TODO Auto-generated method stub + + } } @SmallTest 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 0466540..6f33672 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/integration/CameraDeviceBinderTest.java @@ -132,6 +132,16 @@ public class CameraDeviceBinderTest extends AndroidTestCase { // TODO Auto-generated method stub } + + /* + * (non-Javadoc) + * @see android.hardware.camera2.ICameraDeviceCallbacks#onPrepared() + */ + @Override + public void onPrepared(int streamId) throws RemoteException { + // TODO Auto-generated method stub + + } } class IsMetadataNotEmpty extends ArgumentMatcher<CameraMetadataNative> { |