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

Merge "Resume GNSS measurement reporting when location setting is back on."

Browse Source
This commit is contained in:
Anil Admal
2019-03-11 21:24:55 +00:00
committed by Android (Google) Code Review
parent 835282ec29 032aa81d85
commit 81d86eeae1
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/location/GnssLocationProvider.java
View File

@@ -67,6 +67,7 @@ import android.text.TextUtils;
import android.util.Log;
import android.util.StatsLog;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.app.IBatteryStats;
import com.android.internal.location.GpsNetInitiatedHandler;
import com.android.internal.location.GpsNetInitiatedHandler.GpsNiNotification;
@@ -890,12 +891,14 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
return GPS_POSITION_MODE_STANDALONE;
}
private boolean handleEnable() {
if (DEBUG) Log.d(TAG, "handleEnable");
@GuardedBy("mLock")
private void handleEnableLocked() {
if (DEBUG) Log.d(TAG, "handleEnableLocked");
boolean inited = native_init();
if (inited) {
mEnabled = true;
mSupportsXtra = native_supports_xtra();
// TODO: remove the following native calls if we can make sure they are redundant.
@@ -912,15 +915,16 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
mGnssNavigationMessageProvider.onGpsEnabledChanged();
mGnssBatchingProvider.enable();
} else {
mEnabled = false;
Log.w(TAG, "Failed to enable location provider");
}
return inited;
}
private void handleDisable() {
if (DEBUG) Log.d(TAG, "handleDisable");
@GuardedBy("mLock")
private void handleDisableLocked() {
if (DEBUG) Log.d(TAG, "handleDisableLocked");
mEnabled = false;
updateClientUids(new WorkSource());
stopNavigating();
mAlarmManager.cancel(mWakeupIntent);
@@ -946,10 +950,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
}
if (enabled) {
mEnabled = handleEnable();
handleEnableLocked();
} else {
mEnabled = false;
handleDisable();
handleDisableLocked();
}
}
}