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

Merge "Revert "Defer triggering notifyLidSwitchChanged() until the system is ready."" into sc-dev

Browse Source
This commit is contained in:
Darryl Johnson
2021-02-09 02:16:46 +00:00
committed by Android (Google) Code Review
parent 084f3be4b1 921a411bba
commit 871f21e70c
1 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -234,12 +234,7 @@ public class InputManagerService extends IInputManager.Stub
private final SparseBooleanArray mIsVibrating = new SparseBooleanArray(); private final SparseBooleanArray mIsVibrating = new SparseBooleanArray();
// State for lid switch // State for lid switch
// Lock for the lid switch state. Held when triggering callbacks to guarantee lid switch events
// are delivered in order. For ex, when a new lid switch callback is registered the lock is held
// while the callback is processing the initial lid switch event which guarantees that any
// events that occur at the same time are delivered after the callback has returned.
private final Object mLidSwitchLock = new Object(); private final Object mLidSwitchLock = new Object();
@GuardedBy("mLidSwitchLock")
private List<LidSwitchCallback> mLidSwitchCallbacks = new ArrayList<>(); private List<LidSwitchCallback> mLidSwitchCallbacks = new ArrayList<>();
// State for the currently installed input filter. // State for the currently installed input filter.
@@ -387,6 +382,9 @@ public class InputManagerService extends IInputManager.Stub
public static final int SW_CAMERA_LENS_COVER_BIT = 1 << SW_CAMERA_LENS_COVER; public static final int SW_CAMERA_LENS_COVER_BIT = 1 << SW_CAMERA_LENS_COVER;
public static final int SW_MUTE_DEVICE_BIT = 1 << SW_MUTE_DEVICE; public static final int SW_MUTE_DEVICE_BIT = 1 << SW_MUTE_DEVICE;
/** Indicates an open state for the lid switch. */
public static final int SW_STATE_LID_OPEN = 0;
/** Whether to use the dev/input/event or uevent subsystem for the audio jack. */ /** Whether to use the dev/input/event or uevent subsystem for the audio jack. */
final boolean mUseDevInputEventForAudioJack; final boolean mUseDevInputEventForAudioJack;
@@ -422,18 +420,13 @@ public class InputManagerService extends IInputManager.Stub
} }
void registerLidSwitchCallbackInternal(@NonNull LidSwitchCallback callback) { void registerLidSwitchCallbackInternal(@NonNull LidSwitchCallback callback) {
boolean lidOpen;
synchronized (mLidSwitchLock) { synchronized (mLidSwitchLock) {
mLidSwitchCallbacks.add(callback); mLidSwitchCallbacks.add(callback);
lidOpen = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, SW_LID)
// Skip triggering the initial callback if the system is not yet ready as the switch == SW_STATE_LID_OPEN;
// state will be reported as KEY_STATE_UNKNOWN. The callback will be triggered in
// systemRunning().
if (mSystemReady) {
boolean lidOpen = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, SW_LID)
== KEY_STATE_UP;
callback.notifyLidSwitchChanged(0 /* whenNanos */, lidOpen);
}
} }
callback.notifyLidSwitchChanged(0 /* whenNanos */, lidOpen);
} }
void unregisterLidSwitchCallbackInternal(@NonNull LidSwitchCallback callback) { void unregisterLidSwitchCallbackInternal(@NonNull LidSwitchCallback callback) {
@@ -481,18 +474,7 @@ public class InputManagerService extends IInputManager.Stub
} }
mNotificationManager = (NotificationManager)mContext.getSystemService( mNotificationManager = (NotificationManager)mContext.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
mSystemReady = true;
synchronized (mLidSwitchLock) {
mSystemReady = true;
// Send the initial lid switch state to any callback registered before the system was
// ready.
int switchState = getSwitchState(-1 /* deviceId */, InputDevice.SOURCE_ANY, SW_LID);
for (int i = 0; i < mLidSwitchCallbacks.size(); i++) {
LidSwitchCallback callback = mLidSwitchCallbacks.get(i);
callback.notifyLidSwitchChanged(0 /* whenNanos */, switchState == KEY_STATE_UP);
}
}
IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED); IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
filter.addAction(Intent.ACTION_PACKAGE_REMOVED); filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
@@ -2349,13 +2331,14 @@ public class InputManagerService extends IInputManager.Stub
if ((switchMask & SW_LID_BIT) != 0) { if ((switchMask & SW_LID_BIT) != 0) {
final boolean lidOpen = ((switchValues & SW_LID_BIT) == 0); final boolean lidOpen = ((switchValues & SW_LID_BIT) == 0);
ArrayList<LidSwitchCallback> callbacksCopy;
synchronized (mLidSwitchLock) { synchronized (mLidSwitchLock) {
if (mSystemReady) { callbacksCopy = new ArrayList<>(mLidSwitchCallbacks);
for (int i = 0; i < mLidSwitchCallbacks.size(); i++) { }
LidSwitchCallback callbacks = mLidSwitchCallbacks.get(i); for (int i = 0; i < callbacksCopy.size(); i++) {
callbacks.notifyLidSwitchChanged(whenNanos, lidOpen); LidSwitchCallback callbacks = callbacksCopy.get(i);
} callbacks.notifyLidSwitchChanged(whenNanos, lidOpen);
}
} }
} }