merge in jb-release history after reset to jb-dev
diff --git a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
index 7e86ce7..3a28fe8 100644
--- a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
@@ -137,7 +137,7 @@
for(int j = 0; j < 9; j++){
assertTrue(fractions[j] >= 0.0);
assertTrue(fractions[j] <= 1.0);
- assertTrue(errorMessage(fractions), fractions[j + 1] != fractions[j]);
+ assertTrue(errorMessage(fractions), fractions[j + 1] >= fractions[j]);
}
}
@@ -148,7 +148,7 @@
float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue()", 200l, null);
for(int j = 0; j < 9; j++){
- assertTrue(errorMessage(animatedValues), animatedValues[j + 1] != animatedValues[j]);
+ assertTrue(errorMessage(animatedValues), animatedValues[j + 1] >= animatedValues[j]);
}
}
public void testGetAnimatedValue_PropertyName() throws Throwable {
@@ -160,7 +160,7 @@
float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue(property)", 200l,
property);
for(int j = 0; j < 9; j++){
- assertTrue(errorMessage(animatedValues), animatedValues[j + 1] != animatedValues[j]);
+ assertTrue(errorMessage(animatedValues), animatedValues[j + 1] >= animatedValues[j]);
}
}
@@ -228,7 +228,7 @@
private float[] getValue(ValueAnimator animator, int n, String methodName,
long sleepTime, String property) throws InterruptedException {
float[] values = new float[n];
- for(int i = 0; i < (n-1); i++){
+ for(int i = 0; i < n; i++){
Thread.sleep(sleepTime);
float value = 0.0f;
if(methodName.equals("getAnimatedFraction()")) {
diff --git a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
index 39c460c..59fae2f 100644
--- a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
@@ -150,9 +150,11 @@
final LowPriorityBroadcastReceiver lowPriorityReceiver =
new LowPriorityBroadcastReceiver();
- final IntentFilter filter = new IntentFilter(ResultReceiver.MOCK_ACTION);
- registerBroadcastReceiver(highPriorityReceiver, filter);
- registerBroadcastReceiver(lowPriorityReceiver, filter);
+ final IntentFilter filterHighPriority = new IntentFilter(ResultReceiver.MOCK_ACTION);
+ filterHighPriority.setPriority(1);
+ final IntentFilter filterLowPriority = new IntentFilter(ResultReceiver.MOCK_ACTION);
+ registerBroadcastReceiver(highPriorityReceiver, filterHighPriority);
+ registerBroadcastReceiver(lowPriorityReceiver, filterLowPriority);
final Intent broadcastIntent = new Intent(ResultReceiver.MOCK_ACTION);
mContextWrapper.sendOrderedBroadcast(broadcastIntent, null);
diff --git a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
index 3b5a409..b158603 100644
--- a/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaRecorderTest.java
@@ -55,6 +55,7 @@
private File mOutFile;
private File mOutFile2;
private Camera mCamera;
+ private MediaStubActivity mActivity = null;
/*
* InstrumentationTestRunner.onStart() calls Looper.prepare(), which creates a looper
@@ -75,6 +76,7 @@
@Override
protected void setUp() throws Exception {
+ mActivity = getActivity();
mOutFile = new File(OUTPUT_PATH);
mOutFile2 = new File(OUTPUT_PATH2);
mMediaRecorder.reset();
@@ -105,6 +107,7 @@
mCamera.release();
mCamera = null;
}
+ mActivity = null;
super.tearDown();
}
@@ -117,7 +120,7 @@
mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
mMediaRecorder.setVideoEncodingBitRate(VIDEO_BIT_RATE_IN_BPS);
- mMediaRecorder.setPreviewDisplay(getActivity().getSurfaceHolder().getSurface());
+ mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
mMediaRecorder.prepare();
mMediaRecorder.start();
Thread.sleep(1000);
@@ -163,7 +166,7 @@
mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
mMediaRecorder.setVideoFrameRate(frameRate);
mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
- mMediaRecorder.setPreviewDisplay(getActivity().getSurfaceHolder().getSurface());
+ mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
mMediaRecorder.setOutputFile(fileName);
mMediaRecorder.setLocation(LATITUDE, LONGITUDE);
final double captureRate = VIDEO_TIMELAPSE_CAPTURE_RATE_FPS;
@@ -243,7 +246,7 @@
mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.DEFAULT);
mMediaRecorder.setOutputFile(OUTPUT_PATH2);
mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
- mMediaRecorder.setPreviewDisplay(getActivity().getSurfaceHolder().getSurface());
+ mMediaRecorder.setPreviewDisplay(mActivity.getSurfaceHolder().getSurface());
mMediaRecorder.setVideoSize(VIDEO_WIDTH, VIDEO_HEIGHT);
FileOutputStream fos = new FileOutputStream(OUTPUT_PATH2);
@@ -382,11 +385,11 @@
}
private boolean hasCamera() {
- return getActivity().getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
+ return mActivity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
}
private boolean hasMicrophone() {
- return getActivity().getPackageManager().hasSystemFeature(
+ return mActivity.getPackageManager().hasSystemFeature(
PackageManager.FEATURE_MICROPHONE);
}
}
diff --git a/tests/tests/media/src/android/media/cts/MediaStubActivity.java b/tests/tests/media/src/android/media/cts/MediaStubActivity.java
index 6d111af..df6d736 100644
--- a/tests/tests/media/src/android/media/cts/MediaStubActivity.java
+++ b/tests/tests/media/src/android/media/cts/MediaStubActivity.java
@@ -19,11 +19,12 @@
import android.app.Activity;
import android.os.Bundle;
+import android.util.Log;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
public class MediaStubActivity extends Activity {
-
+ private static final String TAG = "MediaStubActivity";
private SurfaceHolder mHolder;
private SurfaceHolder mHolder2;
@@ -39,6 +40,17 @@
mHolder2 = surfaceV2.getHolder();
}
+ @Override
+ protected void onResume() {
+ Log.i(TAG, "onResume");
+ super.onResume();
+ }
+
+ @Override
+ protected void onPause() {
+ Log.i(TAG, "onPause");
+ super.onPause();
+ }
public SurfaceHolder getSurfaceHolder() {
return mHolder;
}
