Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes NPE from resolveRotation()" into tm-dev

Browse Source
This commit is contained in:
Yi Jiang
2022-02-24 06:40:15 +00:00
committed by Android (Google) Code Review
parent 8fbe5b0fdb 788a801020
commit 5551c13e7a
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/WindowOrientationListener.java
View File

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

11
services/tests/servicestests/src/com/android/server/wm/WindowOrientationListenerTest.java
View File

@@ -114,7 +114,7 @@ public class WindowOrientationListenerTest {
} }
@Test @Test
public void testSensorChanged_normalCase2() { public void testOnSensorChanged_normalCase2() {
mWindowOrientationListener.mOrientationJudge.onSensorChanged(mFakeSensorEvent); mWindowOrientationListener.mOrientationJudge.onSensorChanged(mFakeSensorEvent);
mFakeRotationResolverInternal.callbackWithFailureResult( mFakeRotationResolverInternal.callbackWithFailureResult(
@@ -123,6 +123,15 @@ public class WindowOrientationListenerTest {
assertThat(mFinalizedRotation).isEqualTo(DEFAULT_SENSOR_ROTATION); 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 { static final class TestableRotationResolver extends RotationResolverInternal {
@Surface.Rotation @Surface.Rotation
RotationResolverCallbackInternal mCallback; RotationResolverCallbackInternal mCallback;