The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2008 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
Xia Wang | db60285 | 2011-09-27 16:00:20 -0700 | [diff] [blame] | 17 | package com.android.mediaframeworktest.functional.mediarecorder; |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 18 | |
| 19 | import com.android.mediaframeworktest.MediaFrameworkTest; |
| 20 | import com.android.mediaframeworktest.MediaNames; |
| 21 | |
| 22 | import java.io.*; |
| 23 | |
| 24 | import android.content.Context; |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 25 | import android.hardware.Camera; |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 26 | import android.media.MediaPlayer; |
| 27 | import android.media.MediaRecorder; |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 28 | import android.media.EncoderCapabilities; |
| 29 | import android.media.EncoderCapabilities.VideoEncoderCap; |
| 30 | import android.media.EncoderCapabilities.AudioEncoderCap; |
Yu Shan Emily Lau | 62f755a | 2011-02-25 20:07:24 -0800 | [diff] [blame] | 31 | import android.test.ActivityInstrumentationTestCase2; |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 32 | import android.util.Log; |
| 33 | import android.view.SurfaceHolder; |
| 34 | import android.view.SurfaceView; |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 35 | import com.android.mediaframeworktest.MediaProfileReader; |
Yu Shan Emily Lau | 99b4523 | 2011-11-23 19:02:01 -0800 | [diff] [blame] | 36 | import com.android.mediaframeworktest.MediaFrameworkTestRunner; |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 37 | |
| 38 | import android.test.suitebuilder.annotation.LargeTest; |
| 39 | import android.test.suitebuilder.annotation.Suppress; |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 40 | import java.util.List; |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 41 | |
| 42 | |
| 43 | /** |
| 44 | * Junit / Instrumentation test case for the media recorder api |
| 45 | */ |
Yu Shan Emily Lau | 62f755a | 2011-02-25 20:07:24 -0800 | [diff] [blame] | 46 | public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFrameworkTest> { |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 47 | private String TAG = "MediaRecorderTest"; |
| 48 | private int mOutputDuration =0; |
| 49 | private int mOutputVideoWidth = 0; |
| 50 | private int mOutputVideoHeight= 0 ; |
| 51 | |
| 52 | private SurfaceHolder mSurfaceHolder = null; |
| 53 | private MediaRecorder mRecorder; |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 54 | |
| 55 | private int MIN_VIDEO_FPS = 5; |
| 56 | |
Yu Shan Emily Lau | e35b3e0 | 2012-04-26 17:10:29 -0700 | [diff] [blame] | 57 | private static final int CAMERA_ID = 0; |
| 58 | |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 59 | Context mContext; |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 60 | Camera mCamera; |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 61 | |
| 62 | public MediaRecorderTest() { |
| 63 | super("com.android.mediaframeworktest", MediaFrameworkTest.class); |
| 64 | |
| 65 | } |
| 66 | |
| 67 | protected void setUp() throws Exception { |
Yu Shan Emily Lau | 62f755a | 2011-02-25 20:07:24 -0800 | [diff] [blame] | 68 | getActivity(); |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 69 | mRecorder = new MediaRecorder(); |
Yu Shan Emily Lau | 62f755a | 2011-02-25 20:07:24 -0800 | [diff] [blame] | 70 | super.setUp(); |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 71 | } |
| 72 | |
| 73 | private void recordVideo(int frameRate, int width, int height, |
| 74 | int videoFormat, int outFormat, String outFile, boolean videoOnly) { |
| 75 | Log.v(TAG,"startPreviewAndPrepareRecording"); |
| 76 | try { |
| 77 | if (!videoOnly) { |
| 78 | Log.v(TAG, "setAudioSource"); |
| 79 | mRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); |
| 80 | } |
| 81 | mRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); |
| 82 | mRecorder.setOutputFormat(outFormat); |
| 83 | Log.v(TAG, "output format " + outFormat); |
| 84 | mRecorder.setOutputFile(outFile); |
| 85 | mRecorder.setVideoFrameRate(frameRate); |
| 86 | mRecorder.setVideoSize(width, height); |
| 87 | Log.v(TAG, "setEncoder"); |
| 88 | mRecorder.setVideoEncoder(videoFormat); |
| 89 | if (!videoOnly) { |
| 90 | mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB); |
| 91 | } |
| 92 | mSurfaceHolder = MediaFrameworkTest.mSurfaceView.getHolder(); |
| 93 | Log.v(TAG, "setPreview"); |
| 94 | mRecorder.setPreviewDisplay(mSurfaceHolder.getSurface()); |
| 95 | Log.v(TAG, "prepare"); |
| 96 | mRecorder.prepare(); |
| 97 | Log.v(TAG, "start"); |
| 98 | mRecorder.start(); |
| 99 | Thread.sleep(MediaNames.RECORDED_TIME); |
| 100 | Log.v(TAG, "stop"); |
| 101 | mRecorder.stop(); |
| 102 | mRecorder.release(); |
| 103 | } catch (Exception e) { |
| 104 | Log.v("record video failed ", e.toString()); |
| 105 | mRecorder.release(); |
| 106 | } |
| 107 | } |
| 108 | |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 109 | private boolean recordVideoWithPara(VideoEncoderCap videoCap, AudioEncoderCap audioCap, boolean highQuality){ |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 110 | boolean recordSuccess = false; |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 111 | int videoEncoder = videoCap.mCodec; |
| 112 | int audioEncoder = audioCap.mCodec; |
| 113 | int videoWidth = highQuality? videoCap.mMaxFrameWidth: videoCap.mMinFrameWidth; |
| 114 | int videoHeight = highQuality? videoCap.mMaxFrameHeight: videoCap.mMinFrameHeight; |
| 115 | int videoFps = highQuality? videoCap.mMaxFrameRate: videoCap.mMinFrameRate; |
| 116 | int videoBitrate = highQuality? videoCap.mMaxBitRate: videoCap.mMinBitRate; |
| 117 | int audioBitrate = highQuality? audioCap.mMaxBitRate: audioCap.mMinBitRate; |
| 118 | int audioChannels = highQuality? audioCap.mMaxChannels: audioCap.mMinChannels ; |
| 119 | int audioSamplingRate = highQuality? audioCap.mMaxSampleRate: audioCap.mMinSampleRate; |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 120 | |
Yu Shan Emily Lau | 99b4523 | 2011-11-23 19:02:01 -0800 | [diff] [blame] | 121 | //Overide the fps if the min_camera_fps is set |
| 122 | if (MediaFrameworkTestRunner.mMinCameraFps != 0 && |
| 123 | MediaFrameworkTestRunner.mMinCameraFps > videoFps){ |
| 124 | videoFps = MediaFrameworkTestRunner.mMinCameraFps; |
| 125 | } |
| 126 | |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 127 | if (videoFps < MIN_VIDEO_FPS) { |
| 128 | videoFps = MIN_VIDEO_FPS; |
| 129 | } |
Yu Shan Emily Lau | 99b4523 | 2011-11-23 19:02:01 -0800 | [diff] [blame] | 130 | |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 131 | mSurfaceHolder = MediaFrameworkTest.mSurfaceView.getHolder(); |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 132 | String filename = ("/sdcard/" + videoEncoder + "_" + audioEncoder + "_" + highQuality + ".3gp"); |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 133 | try { |
James Dong | 620a4240 | 2010-07-07 14:37:48 -0700 | [diff] [blame] | 134 | Log.v(TAG, "video encoder : " + videoEncoder); |
| 135 | Log.v(TAG, "audio encoder : " + audioEncoder); |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 136 | Log.v(TAG, "quality : " + (highQuality?"high": "low")); |
| 137 | Log.v(TAG, "encoder : " + MediaProfileReader.getVideoCodecName(videoEncoder)); |
| 138 | Log.v(TAG, "audio : " + MediaProfileReader.getAudioCodecName(audioEncoder)); |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 139 | Log.v(TAG, "videoWidth : " + videoWidth); |
| 140 | Log.v(TAG, "videoHeight : " + videoHeight); |
| 141 | Log.v(TAG, "videoFPS : " + videoFps); |
| 142 | Log.v(TAG, "videobitrate : " + videoBitrate); |
| 143 | Log.v(TAG, "audioBitrate : " + audioBitrate); |
| 144 | Log.v(TAG, "audioChannel : " + audioChannels); |
| 145 | Log.v(TAG, "AudioSampleRate : " + audioSamplingRate); |
| 146 | |
| 147 | MediaRecorder mMediaRecorder = new MediaRecorder(); |
| 148 | mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); |
| 149 | mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); |
| 150 | mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP); |
| 151 | mMediaRecorder.setOutputFile(filename); |
| 152 | mMediaRecorder.setVideoFrameRate(videoFps); |
| 153 | mMediaRecorder.setVideoSize(videoWidth, videoHeight); |
James Dong | 0fc6bc4 | 2010-02-26 19:36:35 -0800 | [diff] [blame] | 154 | mMediaRecorder.setVideoEncodingBitRate(videoBitrate); |
| 155 | mMediaRecorder.setAudioEncodingBitRate(audioBitrate); |
| 156 | mMediaRecorder.setAudioChannels(audioChannels); |
| 157 | mMediaRecorder.setAudioSamplingRate(audioSamplingRate); |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 158 | mMediaRecorder.setVideoEncoder(videoEncoder); |
| 159 | mMediaRecorder.setAudioEncoder(audioEncoder); |
| 160 | mMediaRecorder.setPreviewDisplay(mSurfaceHolder.getSurface()); |
| 161 | mMediaRecorder.prepare(); |
| 162 | mMediaRecorder.start(); |
| 163 | Thread.sleep(MediaNames.RECORDED_TIME); |
| 164 | mMediaRecorder.stop(); |
| 165 | mMediaRecorder.release(); |
| 166 | recordSuccess = validateVideo(filename, videoWidth, videoHeight); |
| 167 | } catch (Exception e) { |
| 168 | Log.v(TAG, e.toString()); |
| 169 | return false; |
| 170 | } |
| 171 | return recordSuccess; |
| 172 | } |
| 173 | |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 174 | private boolean invalidRecordSetting(int frameRate, int width, int height, |
| 175 | int videoFormat, int outFormat, String outFile, boolean videoOnly) { |
| 176 | try { |
| 177 | if (!videoOnly) { |
| 178 | Log.v(TAG, "setAudioSource"); |
| 179 | mRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); |
| 180 | } |
| 181 | mRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); |
| 182 | mRecorder.setOutputFormat(outFormat); |
| 183 | Log.v(TAG, "output format " + outFormat); |
| 184 | mRecorder.setOutputFile(outFile); |
| 185 | mRecorder.setVideoFrameRate(frameRate); |
| 186 | mRecorder.setVideoSize(width, height); |
| 187 | Log.v(TAG, "setEncoder"); |
| 188 | mRecorder.setVideoEncoder(videoFormat); |
| 189 | if (!videoOnly) { |
| 190 | mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB); |
| 191 | } |
| 192 | mSurfaceHolder = MediaFrameworkTest.mSurfaceView.getHolder(); |
| 193 | Log.v(TAG, "setPreview"); |
| 194 | mRecorder.setPreviewDisplay(mSurfaceHolder.getSurface()); |
| 195 | Log.v(TAG, "prepare"); |
| 196 | mRecorder.prepare(); |
| 197 | Log.v(TAG, "start"); |
| 198 | mRecorder.start(); |
| 199 | Thread.sleep(MediaNames.RECORDED_TIME); |
| 200 | Log.v(TAG, "stop"); |
| 201 | mRecorder.stop(); |
| 202 | mRecorder.release(); |
| 203 | } catch (Exception e) { |
| 204 | Log.v("record video failed ", e.toString()); |
| 205 | mRecorder.release(); |
| 206 | Log.v(TAG, "reset and release"); |
| 207 | return true; |
| 208 | } |
| 209 | return false; |
| 210 | } |
| 211 | |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 212 | private void getOutputVideoProperty(String outputFilePath) { |
| 213 | MediaPlayer mediaPlayer = new MediaPlayer(); |
| 214 | try { |
| 215 | mediaPlayer.setDataSource(outputFilePath); |
| 216 | Log.v(TAG, "file Path = " + outputFilePath); |
| 217 | mediaPlayer.setDisplay(MediaFrameworkTest.mSurfaceView.getHolder()); |
| 218 | Log.v(TAG, "before player prepare"); |
| 219 | mediaPlayer.prepare(); |
| 220 | Log.v(TAG, "before getduration"); |
| 221 | mOutputDuration = mediaPlayer.getDuration(); |
| 222 | Log.v(TAG, "get video dimension"); |
Yu Shan Emily Lau | 17d7ea4 | 2009-09-18 16:23:09 -0700 | [diff] [blame] | 223 | Thread.sleep(1000); |
Yu Shan Emily Lau | bc95d66 | 2009-09-17 23:40:59 -0700 | [diff] [blame] | 224 | mOutputVideoHeight = mediaPlayer.getVideoHeight(); |
| 225 | mOutputVideoWidth = mediaPlayer.getVideoWidth(); |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 226 | mediaPlayer.release(); |
| 227 | } catch (Exception e) { |
| 228 | Log.v(TAG, e.toString()); |
| 229 | mediaPlayer.release(); |
| 230 | } |
| 231 | } |
| 232 | |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 233 | private boolean validateVideo(String filePath, int width, int height) { |
| 234 | boolean validVideo = false; |
| 235 | getOutputVideoProperty(filePath); |
| 236 | if (mOutputVideoWidth == width && mOutputVideoHeight == height && |
| 237 | mOutputDuration > MediaNames.VALID_VIDEO_DURATION ) { |
| 238 | validVideo = true; |
| 239 | } |
| 240 | Log.v(TAG, "width = " + mOutputVideoWidth + " height = " + mOutputVideoHeight + " Duration = " + mOutputDuration); |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 241 | return validVideo; |
| 242 | } |
Yu Shan Emily Lau | 62f755a | 2011-02-25 20:07:24 -0800 | [diff] [blame] | 243 | |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 244 | @LargeTest |
| 245 | /* |
| 246 | * This test case set the camera in portrait mode. |
| 247 | * Verification: validate the video dimension and the duration. |
| 248 | */ |
| 249 | public void testPortraitH263() throws Exception { |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 250 | boolean videoRecordedResult = false; |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 251 | try { |
Yu Shan Emily Lau | e35b3e0 | 2012-04-26 17:10:29 -0700 | [diff] [blame] | 252 | mCamera = Camera.open(CAMERA_ID); |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 253 | Camera.Parameters parameters = mCamera.getParameters(); |
| 254 | parameters.setPreviewSize(352, 288); |
| 255 | parameters.set("orientation", "portrait"); |
| 256 | mCamera.setParameters(parameters); |
| 257 | mCamera.unlock(); |
| 258 | mRecorder.setCamera(mCamera); |
| 259 | Thread.sleep(1000); |
James Dong | b05a600 | 2011-09-07 19:31:24 -0700 | [diff] [blame] | 260 | int codec = MediaRecorder.VideoEncoder.H263; |
| 261 | int frameRate = MediaProfileReader.getMaxFrameRateForCodec(codec); |
| 262 | recordVideo(frameRate, 352, 288, codec, |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 263 | MediaRecorder.OutputFormat.THREE_GPP, |
| 264 | MediaNames.RECORDED_PORTRAIT_H263, true); |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 265 | mCamera.lock(); |
| 266 | mCamera.release(); |
Yu Shan Emily Lau | bc95d66 | 2009-09-17 23:40:59 -0700 | [diff] [blame] | 267 | videoRecordedResult = |
| 268 | validateVideo(MediaNames.RECORDED_PORTRAIT_H263, 352, 288); |
Yu Shan Emily Lau | 2071043 | 2009-04-23 21:46:55 -0700 | [diff] [blame] | 269 | } catch (Exception e) { |
| 270 | Log.v(TAG, e.toString()); |
| 271 | } |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 272 | assertTrue("PortraitH263", videoRecordedResult); |
| 273 | } |
| 274 | |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 275 | @LargeTest |
| 276 | public void testInvalidVideoPath() throws Exception { |
| 277 | boolean isTestInvalidVideoPathSuccessful = false; |
| 278 | isTestInvalidVideoPathSuccessful = invalidRecordSetting(15, 176, 144, MediaRecorder.VideoEncoder.H263, |
| 279 | MediaRecorder.OutputFormat.THREE_GPP, MediaNames.INVALD_VIDEO_PATH, false); |
| 280 | assertTrue("Invalid outputFile Path", isTestInvalidVideoPathSuccessful); |
| 281 | } |
| 282 | |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 283 | @LargeTest |
Yu Shan Emily Lau | dc1af5b | 2009-09-21 21:13:36 -0700 | [diff] [blame] | 284 | //test cases for the new codec |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 285 | public void testDeviceSpecificCodec() throws Exception { |
Yu Shan Emily Lau | dc1af5b | 2009-09-21 21:13:36 -0700 | [diff] [blame] | 286 | int noOfFailure = 0; |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 287 | boolean recordSuccess = false; |
| 288 | String deviceType = MediaProfileReader.getDeviceType(); |
| 289 | Log.v(TAG, "deviceType = " + deviceType); |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 290 | List<VideoEncoderCap> videoEncoders = MediaProfileReader.getVideoEncoders(); |
| 291 | List<AudioEncoderCap> audioEncoders = MediaProfileReader.getAudioEncoders(); |
| 292 | for (int k = 0; k < 2; k++) { |
| 293 | for (VideoEncoderCap videoEncoder: videoEncoders) { |
| 294 | for (AudioEncoderCap audioEncoder: audioEncoders) { |
| 295 | if (k == 0) { |
| 296 | recordSuccess = recordVideoWithPara(videoEncoder, audioEncoder, true); |
| 297 | } else { |
| 298 | recordSuccess = recordVideoWithPara(videoEncoder, audioEncoder, false); |
| 299 | } |
| 300 | if (!recordSuccess) { |
| 301 | Log.v(TAG, "testDeviceSpecificCodec failed"); |
| 302 | Log.v(TAG, "Encoder = " + videoEncoder.mCodec + "Audio Encoder = " + audioEncoder.mCodec); |
| 303 | noOfFailure++; |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 304 | } |
| 305 | } |
| 306 | } |
James Dong | 1b7babd | 2010-02-16 14:38:23 -0800 | [diff] [blame] | 307 | } |
| 308 | if (noOfFailure != 0) { |
| 309 | assertTrue("testDeviceSpecificCodec", false); |
Yu Shan Emily Lau | dc1af5b | 2009-09-21 21:13:36 -0700 | [diff] [blame] | 310 | } |
Yu Shan Emily Lau | 1619367 | 2009-09-14 16:23:12 -0700 | [diff] [blame] | 311 | } |
The Android Open Source Project | 9066cfe | 2009-03-03 19:31:44 -0800 | [diff] [blame] | 312 | } |