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

Merge "Remove the flag gating logging and fix a bug." into sc-dev

Browse Source
This commit is contained in:
Siddika Parlak Polatkan
2021-04-25 19:29:35 +00:00
committed by Android (Google) Code Review
parent 15565a139c 861c8d4a15
commit 5261468910
6 changed files with 15 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,7 +254,7 @@ public class DisplayRotation {
if (isDefaultDisplay) {
final Handler uiHandler = UiThread.getHandler();
mOrientationListener = new OrientationListener(mContext, uiHandler, mService);
mOrientationListener = new OrientationListener(mContext, uiHandler);
mOrientationListener.setCurrentRotation(mRotation);
mSettingsObserver = new SettingsObserver(uiHandler);
mSettingsObserver.observe();
@@ -1514,8 +1514,8 @@ public class DisplayRotation {
final SparseArray<Runnable> mRunnableCache = new SparseArray<>(5);
boolean mEnabled;
OrientationListener(Context context, Handler handler, WindowManagerService service) {
super(context, handler, service);
OrientationListener(Context context, Handler handler) {
super(context, handler);
}
private class UpdateRunnable implements Runnable {

17
services/core/java/com/android/server/wm/WindowManagerConstants.java
View File

@@ -49,10 +49,6 @@ final class WindowManagerConstants {
static final String KEY_SYSTEM_GESTURE_EXCLUSION_LOG_DEBOUNCE_MILLIS =
"system_gesture_exclusion_log_debounce_millis";
// Enable logging from the sensor which publishes accel and gyro data generating a rotation
// event
private static final String KEY_RAW_SENSOR_LOGGING_ENABLED = "raw_sensor_logging_enabled";
private static final int MIN_GESTURE_EXCLUSION_LIMIT_DP = 200;
/** @see #KEY_SYSTEM_GESTURE_EXCLUSION_LOG_DEBOUNCE_MILLIS */
@@ -62,8 +58,6 @@ final class WindowManagerConstants {
/** @see AndroidDeviceConfig#KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE */
boolean mSystemGestureExcludedByPreQStickyImmersive;
boolean mRawSensorLoggingEnabled;
private final WindowManagerGlobalLock mGlobalLock;
private final Runnable mUpdateSystemGestureExclusionCallback;
private final DeviceConfigInterface mDeviceConfig;
@@ -139,9 +133,6 @@ final class WindowManagerConstants {
case KEY_SYSTEM_GESTURE_EXCLUSION_LOG_DEBOUNCE_MILLIS:
updateSystemGestureExclusionLogDebounceMillis();
break;
case KEY_RAW_SENSOR_LOGGING_ENABLED:
updateRawSensorDataLoggingEnabled();
break;
default:
break;
}
@@ -167,12 +158,6 @@ final class WindowManagerConstants {
KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE, false);
}
private void updateRawSensorDataLoggingEnabled() {
mRawSensorLoggingEnabled = DeviceConfig.getBoolean(
DeviceConfig.NAMESPACE_WINDOW_MANAGER,
KEY_RAW_SENSOR_LOGGING_ENABLED, false);
}
void dump(PrintWriter pw) {
pw.println("WINDOW MANAGER CONSTANTS (dumpsys window constants):");
@@ -182,8 +167,6 @@ final class WindowManagerConstants {
pw.print("="); pw.println(mSystemGestureExclusionLimitDp);
pw.print(" "); pw.print(KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE);
pw.print("="); pw.println(mSystemGestureExcludedByPreQStickyImmersive);
pw.print(" "); pw.print(KEY_RAW_SENSOR_LOGGING_ENABLED);
pw.print("="); pw.println(mRawSensorLoggingEnabled);
pw.println();
}
}

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -451,8 +451,7 @@ public class WindowManagerService extends IWindowManager.Stub
private static final int ANIMATION_COMPLETED_TIMEOUT_MS = 5000;
@VisibleForTesting
WindowManagerConstants mConstants;
final WindowManagerConstants mConstants;
final WindowTracing mWindowTracing;

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

@@ -85,7 +85,6 @@ public abstract class WindowOrientationListener {
private int mCurrentRotation = -1;
private final Context mContext;
private final WindowManagerConstants mConstants;
private final Object mLock = new Object();
@@ -94,11 +93,9 @@ public abstract class WindowOrientationListener {
*
* @param context for the WindowOrientationListener.
* @param handler Provides the Looper for receiving sensor updates.
* @param wmService WindowManagerService to read the device config from.
*/
public WindowOrientationListener(
Context context, Handler handler, WindowManagerService wmService) {
this(context, handler, wmService, SensorManager.SENSOR_DELAY_UI);
public WindowOrientationListener(Context context, Handler handler) {
this(context, handler, SensorManager.SENSOR_DELAY_UI);
}
/**
@@ -115,10 +112,9 @@ public abstract class WindowOrientationListener {
* This constructor is private since no one uses it.
*/
private WindowOrientationListener(
Context context, Handler handler, WindowManagerService wmService, int rate) {
Context context, Handler handler, int rate) {
mContext = context;
mHandler = handler;
mConstants = wmService.mConstants;
mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
mRate = rate;
List<Sensor> l = mSensorManager.getSensorList(Sensor.TYPE_DEVICE_ORIENTATION);
@@ -1134,16 +1130,11 @@ public abstract class WindowOrientationListener {
return;
}
// Log raw sensor rotation.
if (evaluateRotationChangeLocked() >= 0) {
if (mConstants.mRawSensorLoggingEnabled) {
FrameworkStatsLog.write(
FrameworkStatsLog.DEVICE_ROTATED,
event.timestamp,
rotationToLogEnum(reportedRotation),
FrameworkStatsLog.DEVICE_ROTATED__ROTATION_EVENT_TYPE__ACTUAL_EVENT);
}
}
FrameworkStatsLog.write(
FrameworkStatsLog.DEVICE_ROTATED,
event.timestamp,
rotationToLogEnum(reportedRotation),
FrameworkStatsLog.DEVICE_ROTATED__ROTATION_EVENT_TYPE__ACTUAL_EVENT);
if (isRotationResolverEnabled()) {
if (mRotationResolverService == null) {

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

@@ -51,8 +51,6 @@ public class WindowOrientationListenerTest {
private InputSensorInfo mMockInputSensorInfo;
@Mock
private SensorManager mMockSensorManager;
@Mock
private WindowManagerService mMockWindowManagerService;
private TestableRotationResolver mFakeRotationResolverInternal;
private com.android.server.wm.WindowOrientationListener mWindowOrientationListener;
@@ -69,7 +67,7 @@ public class WindowOrientationListenerTest {
mFakeRotationResolverInternal = new TestableRotationResolver();
doReturn(mMockSensorManager).when(mMockContext).getSystemService(Context.SENSOR_SERVICE);
mWindowOrientationListener = new TestableWindowOrientationListener(mMockContext,
mMockHandler, mMockWindowManagerService);
mMockHandler);
mWindowOrientationListener.mRotationResolverService = mFakeRotationResolverInternal;
mFakeSensor = new Sensor(mMockInputSensorInfo);
@@ -115,9 +113,8 @@ public class WindowOrientationListenerTest {
final class TestableWindowOrientationListener extends WindowOrientationListener {
TestableWindowOrientationListener(Context context, Handler handler,
WindowManagerService service) {
super(context, handler, service);
TestableWindowOrientationListener(Context context, Handler handler) {
super(context, handler);
this.mOrientationJudge = new OrientationSensorJudge();
}

2
services/tests/wmtests/src/com/android/server/wm/DisplayRotationTests.java
View File

@@ -121,8 +121,6 @@ public class DisplayRotationTests {
sMockWm = mock(WindowManagerService.class);
sMockWm.mPowerManagerInternal = mock(PowerManagerInternal.class);
sMockWm.mPolicy = mock(WindowManagerPolicy.class);
sMockWm.mConstants = mock(WindowManagerConstants.class);
sMockWm.mConstants.mRawSensorLoggingEnabled = true;
}
@AfterClass