diff options
| author | Adrian Roos <roosa@google.com> | 2015-03-31 19:02:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-31 19:02:09 +0000 |
| commit | 1e3e6e99c6b45fe2da4777831248592a633b03dc (patch) | |
| tree | b3d21d57bec516a03365f9f0bd43bebf73122fc5 | |
| parent | edd33c8bdf0ac9e108a34d8af5941df5c3e2b537 (diff) | |
| parent | 12741963740350c80c7b7744a1ccf6fc089fc1b8 (diff) | |
| download | frameworks_base-1e3e6e99c6b45fe2da4777831248592a633b03dc.zip frameworks_base-1e3e6e99c6b45fe2da4777831248592a633b03dc.tar.gz frameworks_base-1e3e6e99c6b45fe2da4777831248592a633b03dc.tar.bz2 | |
Merge "Fix WindowOrientationListener crash if no sensor present"
| -rw-r--r-- | services/core/java/com/android/server/policy/WindowOrientationListener.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/policy/WindowOrientationListener.java b/services/core/java/com/android/server/policy/WindowOrientationListener.java index a33ee4c..c8fd82e 100644 --- a/services/core/java/com/android/server/policy/WindowOrientationListener.java +++ b/services/core/java/com/android/server/policy/WindowOrientationListener.java @@ -136,7 +136,9 @@ public abstract class WindowOrientationListener { public void onTouchStart() { synchronized (mLock) { - mSensorEventListener.onTouchStartLocked(); + if (mSensorEventListener != null) { + mSensorEventListener.onTouchStartLocked(); + } } } @@ -144,7 +146,9 @@ public abstract class WindowOrientationListener { long whenElapsedNanos = SystemClock.elapsedRealtimeNanos(); synchronized (mLock) { - mSensorEventListener.onTouchEndLocked(whenElapsedNanos); + if (mSensorEventListener != null) { + mSensorEventListener.onTouchEndLocked(whenElapsedNanos); + } } } |