Merge "Fixes NPE from resolveRotation()" (07d083ea) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowOrientationListener.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1167,6 +1167,10 @@ public abstract class WindowOrientationListener {
		if (mRotationResolverService == null) {
		mRotationResolverService = LocalServices.getService(
		RotationResolverInternal.class);
		if (mRotationResolverService == null) {
		finalizeRotation(reportedRotation);
		return;
		}
		}

		String packageName = null;

+10 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public class WindowOrientationListenerTest {
		}

		@Test
		public void testSensorChanged_normalCase2() {
		public void testOnSensorChanged_normalCase2() {
		mWindowOrientationListener.mOrientationJudge.onSensorChanged(mFakeSensorEvent);

		mFakeRotationResolverInternal.callbackWithFailureResult(
		@@ -123,6 +123,15 @@ public class WindowOrientationListenerTest {
		assertThat(mFinalizedRotation).isEqualTo(DEFAULT_SENSOR_ROTATION);
		}

		@Test
		public void testOnSensorChanged_rotationResolverServiceIsNull_useSensorResult() {
		mWindowOrientationListener.mRotationResolverService = null;

		mWindowOrientationListener.mOrientationJudge.onSensorChanged(mFakeSensorEvent);

		assertThat(mFinalizedRotation).isEqualTo(DEFAULT_SENSOR_ROTATION);
		}

		static final class TestableRotationResolver extends RotationResolverInternal {
		@Surface.Rotation
		RotationResolverCallbackInternal mCallback;