summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2010-10-05 19:06:04 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-05 19:06:04 -0700
commit92d29c66f5cb69627172d21057e672eaba2eb03f (patch)
treeb63fdccd8fad4d1990770c8242f186dd8488fda2
parentefa4f7f87d5009d7f69c8429b29938be1cf21584 (diff)
parenta2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9 (diff)
am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
Merge commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9' into gingerbread-plus-aosp * commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9': Fix NPE if there is no accelerometer.
-rwxr-xr-xcore/java/android/view/WindowOrientationListener.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/WindowOrientationListener.java b/core/java/android/view/WindowOrientationListener.java
index 3e2e92b50961..2a76e33f94fe 100755
--- a/core/java/android/view/WindowOrientationListener.java
+++ b/core/java/android/view/WindowOrientationListener.java
@@ -109,7 +109,9 @@ public abstract class WindowOrientationListener {
}
public void setAllow180Rotation(boolean allowed) {
- mSensorEventListener.setAllow180Rotation(allowed);
+ if (mSensorEventListener != null) {
+ mSensorEventListener.setAllow180Rotation(allowed);
+ }
}
public int getCurrentRotation(int lastRotation) {