Small fixes as found in staging.

appengine/third_party/python-adb/adb/adb_protocol.py

 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 296 matching lines @@
   def _HasClosed(self):
     """Must be called with the manager lock held."""
     if self._yielder:
       self._yielder._Close()
       self._yielder = None
       self._manager._UnregisterLocked(self._local_id)
 
   def _OnRead(self, message):
     """Calls from within ReadAndDispatch(), so the manager lock is held."""
     # Can be CLSE, OKAY or WRTE. It's generally basically an ACK.
-    if message.header.arg0 != self.remote_id:
+    cmd_name = message.header.command_name
+    if message.header.arg0 != self.remote_id and cmd_name != 'CLSE':
       # We can't assert that for now. TODO(maruel): Investigate the one-off
       # cases.
       logging.warning(
           'Unexpected remote ID: expected %d: %s', self.remote_id, message)
     if message.header.arg1 != self._local_id:
       raise InvalidResponseError(
           'Unexpected local ID: expected %d' % self._local_id, message)
-    cmd_name = message.header.command_name
     if cmd_name == 'CLSE':
       self._HasClosed()
       return
     if cmd_name == 'OKAY':
       return
     if cmd_name == 'WRTE':
       try:
         self._Write('OKAY', '')
       except usb_exceptions.WriteFailedError as e:
         _LOG.info('%s._OnRead(): Failed to reply OKAY: %s', self.port_path, e)
@@ skipping 245 matching lines @@
     msg.Write(self._usb)
     return _AdbMessage.Read(self._usb, auth_timeout_ms)
 
   def _Unregister(self, conn_id):
     with self._lock:
       self._UnregisterLocked(conn_id)
 
   def _UnregisterLocked(self, conn_id):
     # self._lock must be held.
     self._connections.pop(conn_id, None)