Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev

2012-09-18 07:58:36 -07:00
parent 68d789782b c7fb118d90
commit 4dff2ab52b
1 changed files with 3 additions and 1 deletions
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java
@@ -98,7 +98,9 @@ public class MediaFrameworkTest extends Activity implements SurfaceHolder.Callba
        mWakeLock.acquire();
    }

-    public void onStop(Bundle icicle) {
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
        mWakeLock.release();
    }