am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread

Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp

* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
  Verify that onPause() calls its superclass.

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index f7ccc12bd5d1..ed5af91ca7d0 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -3898,7 +3898,14 @@ public class Activity extends ContextThemeWrapper
     }
 
     final void performPause() {
+        mCalled = false;
         onPause();
+        if (!mCalled && getApplicationInfo().targetSdkVersion
+                >= android.os.Build.VERSION_CODES.GINGERBREAD) {
+            throw new SuperNotCalledException(
+                    "Activity " + mComponent.toShortString() +
+                    " did not call through to super.onPause()");
+        }
     }
     
     final void performUserLeaving() {