Skip to content

Commit 6e4cb6a

Browse files
author
Nick Pelly
committed
Log PID of apps requesting location updates.
BUG=6444765 Change-Id: Ib948b8fddb99f95f63486fbc096a26609c1a6c21
1 parent e06747c commit 6e4cb6a

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

services/java/com/android/server/LocationManagerService.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ private void _loadProvidersLocked() {
489489
mNetworkLocationProvider =
490490
new LocationProviderProxy(mContext, LocationManager.NETWORK_PROVIDER,
491491
mNetworkLocationProviderPackageName, mLocationHandler);
492+
492493
addProvider(mNetworkLocationProvider);
493494
}
494495

@@ -1156,11 +1157,11 @@ private void requestLocationUpdatesLocked(String provider, long minTime, float m
11561157
if (p == null) {
11571158
throw new IllegalArgumentException("provider=" + provider);
11581159
}
1159-
11601160
receiver.requiredPermissions = checkPermissionsSafe(provider,
11611161
receiver.requiredPermissions);
11621162

11631163
// so wakelock calls will succeed
1164+
final int callingPid = Binder.getCallingPid();
11641165
final int callingUid = Binder.getCallingUid();
11651166
boolean newUid = !providerHasListener(provider, callingUid, null);
11661167
long identity = Binder.clearCallingIdentity();
@@ -1179,6 +1180,8 @@ private void requestLocationUpdatesLocked(String provider, long minTime, float m
11791180
boolean isProviderEnabled = isAllowedBySettingsLocked(provider);
11801181
if (isProviderEnabled) {
11811182
long minTimeForProvider = getMinTimeLocked(provider);
1183+
Slog.i(TAG, "request " + provider + " (pid " + callingPid + ") " + minTime +
1184+
" " + minTimeForProvider + (singleShot ? " (singleshot)" : ""));
11821185
p.setMinTime(minTimeForProvider, mTmpWorkSource);
11831186
// try requesting single shot if singleShot is true, and fall back to
11841187
// regular location tracking if requestSingleShotFix() is not supported
@@ -1231,6 +1234,7 @@ private void removeUpdatesLocked(Receiver receiver) {
12311234
}
12321235

12331236
// so wakelock calls will succeed
1237+
final int callingPid = Binder.getCallingPid();
12341238
final int callingUid = Binder.getCallingUid();
12351239
long identity = Binder.clearCallingIdentity();
12361240
try {
@@ -1280,8 +1284,13 @@ private void removeUpdatesLocked(Receiver receiver) {
12801284
LocationProviderInterface p = mProvidersByName.get(provider);
12811285
if (p != null) {
12821286
if (hasOtherListener) {
1283-
p.setMinTime(getMinTimeLocked(provider), mTmpWorkSource);
1287+
long minTime = getMinTimeLocked(provider);
1288+
Slog.i(TAG, "remove " + provider + " (pid " + callingPid +
1289+
"), next minTime = " + minTime);
1290+
p.setMinTime(minTime, mTmpWorkSource);
12841291
} else {
1292+
Slog.i(TAG, "remove " + provider + " (pid " + callingPid +
1293+
"), disabled");
12851294
p.enableLocationTracking(false);
12861295
}
12871296
}

0 commit comments

Comments
 (0)