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

Merge "Syncs camera sensor with gesture sensor." into sc-dev

Browse Source
This commit is contained in:
Yi Jiang
2021-03-30 01:27:29 +00:00
committed by Android (Google) Code Review
parent bc4504e5fd 14188a3dcb
commit 7610f6976c
3 changed files with 1 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/DisplayRotation.java
View File

@@ -1539,20 +1539,6 @@ public class DisplayRotation {
}
}
@Override
public boolean canUseRotationResolver() {
if (mUserRotationMode == WindowManagerPolicy.USER_ROTATION_LOCKED) return false;
switch (mCurrentAppOrientation) {
case ActivityInfo.SCREEN_ORIENTATION_FULL_USER:
case ActivityInfo.SCREEN_ORIENTATION_USER:
case ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED:
case ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE:
case ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT:
return true;
}
return false;
}
@Override
public void onProposedRotationChanged(int rotation) {

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

@@ -275,19 +275,6 @@ public abstract class WindowOrientationListener {
}
}
/**
* Returns true if the current status of the phone is suitable for using rotation resolver
* service.
*
* To reduce the power consumption of rotation resolver service, rotation query should run less
* frequently than other low power orientation sensors. This method is used to check whether
* the current status of the phone is necessary to request a suggested screen rotation from the
* rotation resolver service. Note that it always returns {@code false} in the base class. It
* should be overridden in the derived classes.
*/
public boolean canUseRotationResolver() {
return false;
}
/**
* Returns true if the rotation resolver feature is enabled by setting. It means {@link
@@ -1155,7 +1142,7 @@ public abstract class WindowOrientationListener {
}
}
if (isRotationResolverEnabled() && canUseRotationResolver()) {
if (isRotationResolverEnabled()) {
if (mRotationResolverService == null) {
mRotationResolverService = LocalServices.getService(
RotationResolverInternal.class);

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

@@ -58,7 +58,6 @@ public class WindowOrientationListenerTest {
private com.android.server.wm.WindowOrientationListener mWindowOrientationListener;
private int mFinalizedRotation;
private boolean mRotationResolverEnabled;
private boolean mCanUseRotationResolver;
private SensorEvent mFakeSensorEvent;
private Sensor mFakeSensor;
@@ -66,7 +65,6 @@ public class WindowOrientationListenerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mRotationResolverEnabled = true;
mCanUseRotationResolver = true;
mFakeRotationResolverInternal = new TestableRotationResolver();
doReturn(mMockSensorManager).when(mMockContext).getSystemService(Context.SENSOR_SERVICE);
@@ -88,16 +86,6 @@ public class WindowOrientationListenerTest {
assertThat(mFinalizedRotation).isEqualTo(Surface.ROTATION_90);
}
@Test
public void testOnSensorChanged_cannotUseRotationResolver_useSensorResult() {
mCanUseRotationResolver = false;
mWindowOrientationListener.mOrientationJudge.onSensorChanged(mFakeSensorEvent);
assertThat(mFinalizedRotation).isEqualTo(Surface.ROTATION_90);
}
@Test
public void testOnSensorChanged_normalCase() {
mFakeRotationResolverInternal.mResult = Surface.ROTATION_180;
@@ -138,11 +126,6 @@ public class WindowOrientationListenerTest {
mFinalizedRotation = rotation;
}
@Override
public boolean canUseRotationResolver() {
return mCanUseRotationResolver;
}
@Override
public boolean isRotationResolverEnabled() {
return mRotationResolverEnabled;