Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug where GameService#onDisconnected isn't called" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-18 16:08:46 +00:00
committed by Android (Google) Code Review
parent 3d31e0b93b 569d88737b
commit 7940baa703
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/app/GameServiceProviderInstanceImpl.java
View File

@@ -85,15 +85,6 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan
Slog.w(TAG, "Failed to send connected event", ex); Slog.w(TAG, "Failed to send connected event", ex);
} }
} }
@Override
public void onDisconnected(@NonNull IGameService service) {
try {
service.disconnected();
} catch (RemoteException ex) {
Slog.w(TAG, "Failed to send disconnected event", ex);
}
}
}; };
private final ServiceLifecycleCallbacks<IGameSessionService> private final ServiceLifecycleCallbacks<IGameSessionService>
@@ -181,7 +172,8 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan
} }
@Override @Override
public void onForegroundServicesChanged(int pid, int uid, int serviceTypes) {} public void onForegroundServicesChanged(int pid, int uid, int serviceTypes) {
}
}; };
private final IGameServiceController mGameServiceController = private final IGameServiceController mGameServiceController =
@@ -338,7 +330,9 @@ final class GameServiceProviderInstanceImpl implements GameServiceProviderInstan
destroyAndClearAllGameSessionsLocked(); destroyAndClearAllGameSessionsLocked();
mGameServiceConnector.unbind(); mGameServiceConnector.post(IGameService::disconnected).whenComplete((result, t) -> {
mGameServiceConnector.unbind();
});
mGameSessionServiceConnector.unbind(); mGameSessionServiceConnector.unbind();
mGameServiceConnector.setServiceLifecycleCallbacks(null); mGameServiceConnector.setServiceLifecycleCallbacks(null);