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

DO NOT MERGE Don't crash if already unregistered

Browse Source 
Bug: 155284432
Test: manual
Change-Id: Id04ab9093b9cd4c837058442a8d0e04ff4dde051
This commit is contained in:
Soonil Nagarkar
2020-05-05 13:17:01 -07:00
parent ddb28a552f
commit 07c129cb1a
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
location/java/android/location/LocationManager.java
View File

@@ -2954,10 +2954,10 @@ public class LocationManager {
@Override @Override
protected void unregisterService() throws RemoteException { protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null); if (mListenerTransport != null) {
mService.unregisterGnssStatusCallback(mListenerTransport);
mService.unregisterGnssStatusCallback(mListenerTransport); mListenerTransport = null;
mListenerTransport = null; }
} }
private class GnssStatusListener extends IGnssStatusListener.Stub { private class GnssStatusListener extends IGnssStatusListener.Stub {
@@ -3020,10 +3020,10 @@ public class LocationManager {
@Override @Override
protected void unregisterService() throws RemoteException { protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null); if (mListenerTransport != null) {
mService.removeGnssMeasurementsListener(mListenerTransport);
mService.removeGnssMeasurementsListener(mListenerTransport); mListenerTransport = null;
mListenerTransport = null; }
} }
@Override @Override
@@ -3073,10 +3073,10 @@ public class LocationManager {
@Override @Override
protected void unregisterService() throws RemoteException { protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null); if (mListenerTransport != null) {
mService.removeGnssNavigationMessageListener(mListenerTransport);
mService.removeGnssNavigationMessageListener(mListenerTransport); mListenerTransport = null;
mListenerTransport = null; }
} }
private class GnssNavigationMessageListener extends IGnssNavigationMessageListener.Stub { private class GnssNavigationMessageListener extends IGnssNavigationMessageListener.Stub {
@@ -3114,10 +3114,10 @@ public class LocationManager {
@Override @Override
protected void unregisterService() throws RemoteException { protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null); if (mListenerTransport != null) {
mService.removeGnssAntennaInfoListener(mListenerTransport);
mService.removeGnssAntennaInfoListener(mListenerTransport); mListenerTransport = null;
mListenerTransport = null; }
} }
private class GnssAntennaInfoListener extends IGnssAntennaInfoListener.Stub { private class GnssAntennaInfoListener extends IGnssAntennaInfoListener.Stub {
@@ -3151,10 +3151,10 @@ public class LocationManager {
@Override @Override
protected void unregisterService() throws RemoteException { protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null); if (mListenerTransport != null) {
mService.removeGnssBatchingCallback();
mService.removeGnssBatchingCallback(); mListenerTransport = null;
mListenerTransport = null; }
} }
private class BatchedLocationCallback extends IBatchedLocationCallback.Stub { private class BatchedLocationCallback extends IBatchedLocationCallback.Stub {