OSDN Git Service

[CS] Unregister callback as part of onUnavailable dispatch
authorEtan Cohen <etancohen@google.com>
Tue, 16 Apr 2019 22:07:55 +0000 (15:07 -0700)
committerEtan Cohen <etancohen@google.com>
Thu, 9 May 2019 02:41:40 +0000 (02:41 +0000)
commit9b09a169302f3d49d77623726d5bc31c961da1c8
treefcc4bdf2f1ad1729d2674ac77940296f5dbb1e06
parentd22ba181d0b6d6e80dbdce815439f255c2db2e9c
[CS] Unregister callback as part of onUnavailable dispatch

The onUnavailable semantics promise that it is equivalent to calling
the unregister callback method. But - it doesn't unregister the callback
allowing it to be reused. Fixed.

Additionally, modified the unregisterNetworkCallback method to not fail
on duplicate unregistration (since a callback could now self
unregister). Instead simply print a log.

Bug: 130651445
Test: atest ConnectivityServiceTest
Change-Id: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3
core/java/android/net/ConnectivityManager.java
tests/net/java/com/android/server/ConnectivityServiceTest.java