summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-05 19:02:52 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-05 19:02:52 -0700
commita2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9 (patch)
tree10f81105cb5840d1b9dbfe46805e238d9691495f
parent4e6baf2473e522e6d53afa01348c564148bfbad7 (diff)
parentb499bb106927283c7eccf6d935335c50492a23e4 (diff)
downloadframeworks_base-a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9.zip
frameworks_base-a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9.tar.gz
frameworks_base-a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9.tar.bz2
Merge "Fix NPE if there is no accelerometer." into gingerbread
-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 3e2e92b..2a76e33 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) {