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

Merge "Remove redundant variable"

Browse Source
This commit is contained in:
Ricky Niu
2021-03-30 08:21:07 +00:00
committed by Android (Google) Code Review
parent ed8fea431c f6602fe2a9
commit 65c23abeab
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -239,8 +239,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
mHandler.updateState(state);
} else if ("GETPROTOCOL".equals(accessory)) {
if (DEBUG) Slog.d(TAG, "got accessory get protocol");
long elapsedRealtime = SystemClock.elapsedRealtime();
mHandler.setAccessoryUEventTime(elapsedRealtime);
mHandler.setAccessoryUEventTime(SystemClock.elapsedRealtime());
resetAccessoryHandshakeTimeoutHandler();
} else if ("SENDSTRING".equals(accessory)) {
if (DEBUG) Slog.d(TAG, "got accessory send string");
@@ -760,9 +759,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
}
private void broadcastUsbAccessoryHandshake() {
long elapsedRealtime = SystemClock.elapsedRealtime();
long accessoryHandShakeEnd = elapsedRealtime;
// send a sticky broadcast containing USB accessory handshake information
Intent intent = new Intent(UsbManager.ACTION_USB_ACCESSORY_HANDSHAKE)
.putExtra(UsbManager.EXTRA_ACCESSORY_UEVENT_TIME,
@@ -772,7 +768,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
.putExtra(UsbManager.EXTRA_ACCESSORY_START,
mStartAccessory)
.putExtra(UsbManager.EXTRA_ACCESSORY_HANDSHAKE_END,
accessoryHandShakeEnd);
SystemClock.elapsedRealtime());
if (DEBUG) {
Slog.d(TAG, "broadcasting " + intent + " extras: " + intent.getExtras());
@@ -780,7 +776,6 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
sendStickyBroadcast(intent);
resetUsbAccessoryHandshakeDebuggingInfo();
accessoryHandShakeEnd = 0L;
}
protected void updateUsbStateBroadcastIfNeeded(long functions) {