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 am: 07c129cb1a

Browse Source 
Change-Id: I715a2735b23ff94e5df7b9e4d5a68d0c3227c146
This commit is contained in:
Soonil Nagarkar
2020-05-05 22:52:22 +00:00
committed by Automerger Merge Worker
parent 225cf37d30 07c129cb1a
commit b39151b9f4
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
protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null);
mService.unregisterGnssStatusCallback(mListenerTransport);
mListenerTransport = null;
if (mListenerTransport != null) {
mService.unregisterGnssStatusCallback(mListenerTransport);
mListenerTransport = null;
}
}
private class GnssStatusListener extends IGnssStatusListener.Stub {
@@ -3020,10 +3020,10 @@ public class LocationManager {
@Override
protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null);
mService.removeGnssMeasurementsListener(mListenerTransport);
mListenerTransport = null;
if (mListenerTransport != null) {
mService.removeGnssMeasurementsListener(mListenerTransport);
mListenerTransport = null;
}
}
@Override
@@ -3073,10 +3073,10 @@ public class LocationManager {
@Override
protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null);
mService.removeGnssNavigationMessageListener(mListenerTransport);
mListenerTransport = null;
if (mListenerTransport != null) {
mService.removeGnssNavigationMessageListener(mListenerTransport);
mListenerTransport = null;
}
}
private class GnssNavigationMessageListener extends IGnssNavigationMessageListener.Stub {
@@ -3114,10 +3114,10 @@ public class LocationManager {
@Override
protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null);
mService.removeGnssAntennaInfoListener(mListenerTransport);
mListenerTransport = null;
if (mListenerTransport != null) {
mService.removeGnssAntennaInfoListener(mListenerTransport);
mListenerTransport = null;
}
}
private class GnssAntennaInfoListener extends IGnssAntennaInfoListener.Stub {
@@ -3151,10 +3151,10 @@ public class LocationManager {
@Override
protected void unregisterService() throws RemoteException {
Preconditions.checkState(mListenerTransport != null);
mService.removeGnssBatchingCallback();
mListenerTransport = null;
if (mListenerTransport != null) {
mService.removeGnssBatchingCallback();
mListenerTransport = null;
}
}
private class BatchedLocationCallback extends IBatchedLocationCallback.Stub {