diff options
| author | Romain Guy <romainguy@google.com> | 2011-06-22 21:02:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-22 21:02:31 -0700 |
| commit | 8b4512ef203ee0bc3bca33224f1e03f2c1e59546 (patch) | |
| tree | 210ed6f7d5c996de1256444a8692ce7858398f63 /tests | |
| parent | c2e0a1f1cdd249694bf707a7bc066e7808c340d0 (diff) | |
| parent | 1ec3a58bcdd0d5fa82cf878d974d062811933ae2 (diff) | |
| download | frameworks_base-8b4512ef203ee0bc3bca33224f1e03f2c1e59546.zip frameworks_base-8b4512ef203ee0bc3bca33224f1e03f2c1e59546.tar.gz frameworks_base-8b4512ef203ee0bc3bca33224f1e03f2c1e59546.tar.bz2 | |
Merge "Prevent possible NPE in TextureView"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java index e82d9e9..9bc1fe0 100644 --- a/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java +++ b/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java @@ -54,7 +54,7 @@ public class TextureViewActivity extends Activity implements TextureView.Surface @Override public void onClick(View v) { if (mAdded) { - mAnimatorSet.cancel(); + if (mAnimatorSet != null) mAnimatorSet.cancel(); mContent.removeView(mTextureView); } else { mContent.addView(mTextureView); @@ -84,10 +84,10 @@ public class TextureViewActivity extends Activity implements TextureView.Surface mTextureView.setCameraDistance(5000); - ObjectAnimator rotationY = ObjectAnimator.ofFloat(mTextureView, "rotationY", 0.0f, 360.0f); - rotationY.setRepeatMode(ObjectAnimator.REVERSE); - rotationY.setRepeatCount(ObjectAnimator.INFINITE); - rotationY.setDuration(4000); +// ObjectAnimator rotationY = ObjectAnimator.ofFloat(mTextureView, "rotationY", 0.0f, 360.0f); +// rotationY.setRepeatMode(ObjectAnimator.REVERSE); +// rotationY.setRepeatCount(ObjectAnimator.INFINITE); +// rotationY.setDuration(4000); // ObjectAnimator alpha = ObjectAnimator.ofFloat(mTextureView, "alpha", 1.0f, 0.0f); // alpha.setRepeatMode(ObjectAnimator.REVERSE); |