Merge "Clean up binding list on error" into oc-mr1-dev

am: 563e4982a9

Change-Id: Id599274866a7686fa49f377c2911b6fba64201f5
This commit is contained in:
Julia Reynolds
2017-08-18 18:05:46 +00:00
committed by android-build-merger

View File

@@ -877,6 +877,7 @@ abstract public class ManagedServices {
@Override @Override
public void onServiceDisconnected(ComponentName name) { public void onServiceDisconnected(ComponentName name) {
mServicesBinding.remove(servicesBindingTag);
Slog.v(TAG, getCaption() + " connection lost: " + name); Slog.v(TAG, getCaption() + " connection lost: " + name);
} }
}; };
@@ -889,6 +890,7 @@ abstract public class ManagedServices {
return; return;
} }
} catch (SecurityException ex) { } catch (SecurityException ex) {
mServicesBinding.remove(servicesBindingTag);
Slog.e(TAG, "Unable to bind " + getCaption() + " service: " + intent, ex); Slog.e(TAG, "Unable to bind " + getCaption() + " service: " + intent, ex);
} }
} }