joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Ensure TetheringService binder is alive after system_server crash" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-12-17 10:23:17 -08:00 • committed by Gerrit Code Review
commit 0c01b26eca
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Tethering/common/TetheringLib/src/android/net/TetheringManager.java
View file

@ -388,7 +388,9 @@ public class TetheringManager {
// up and be sent from a worker thread; later, they are always sent from the caller thread.
// Considering that it's just oneway binder calls, and ordering is preserved, this seems
// better than inconsistent behavior persisting after boot.
if (connector != null) {
// If system server restarted, mConnectorSupplier might temporarily return a stale (i.e.
// dead) version of TetheringService.
if (connector != null && connector.isBinderAlive()) {
mConnector = ITetheringConnector.Stub.asInterface(connector);
} else {
startPollingForConnector();
@ -423,9 +425,8 @@ public class TetheringManager {
} catch (InterruptedException e) {
// Not much to do here, the system needs to wait for the connector
}
final IBinder connector = mConnectorSupplier.get();
if (connector != null) {
if (connector != null && connector.isBinderAlive()) {
onTetheringConnected(ITetheringConnector.Stub.asInterface(connector));
return;
}