diff options
| -rw-r--r-- | media/java/android/media/MediaRouter2.java | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java index c664d3d68b62..ffd6e161d928 100644 --- a/media/java/android/media/MediaRouter2.java +++ b/media/java/android/media/MediaRouter2.java @@ -545,16 +545,17 @@ public final class MediaRouter2 { ? SCANNING_STATE_SCANNING_FULL : SCANNING_STATE_WHILE_INTERACTIVE); - if (scanRequest.isScreenOffScan()) { - mScreenOffScanRequestCount++; - } else { - mScreenOnScanRequestCount++; - } } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } } + if (scanRequest.isScreenOffScan()) { + mScreenOffScanRequestCount++; + } else { + mScreenOnScanRequestCount++; + } + mScanRequestsMap.put(token.mId, scanRequest); return token; } @@ -580,27 +581,29 @@ public final class MediaRouter2 { } boolean shouldUpdate = - mScreenOffScanRequestCount == 1 - && (request.isScreenOffScan() || mScreenOnScanRequestCount == 1); + request.isScreenOffScan() + ? mScreenOffScanRequestCount == 1 + : mScreenOnScanRequestCount == 1 && mScreenOffScanRequestCount == 0; if (shouldUpdate) { try { - if (request.isScreenOffScan() && mScreenOnScanRequestCount == 0) { + if (!request.isScreenOffScan() || mScreenOnScanRequestCount == 0) { mImpl.updateScanningState(SCANNING_STATE_NOT_SCANNING); } else { mImpl.updateScanningState(SCANNING_STATE_WHILE_INTERACTIVE); } - if (request.isScreenOffScan()) { - mScreenOffScanRequestCount--; - } else { - mScreenOnScanRequestCount--; - } } catch (RemoteException ex) { ex.rethrowFromSystemServer(); } } + if (request.isScreenOffScan()) { + mScreenOffScanRequestCount--; + } else { + mScreenOnScanRequestCount--; + } + mScanRequestsMap.remove(token.mId); } } |