diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/StatsManager.java | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/core/java/android/app/StatsManager.java b/core/java/android/app/StatsManager.java index b9893aaa66a4..83d1de60cac7 100644 --- a/core/java/android/app/StatsManager.java +++ b/core/java/android/app/StatsManager.java @@ -255,18 +255,17 @@ public final class StatsManager { throws StatsUnavailableException { synchronized (sLock) { try { - IStatsd service = getIStatsdLocked(); + IStatsManagerService service = getIStatsManagerServiceLocked(); if (pendingIntent != null) { - // Extracts IIntentSender from the PendingIntent and turns it into an IBinder. - IBinder intentSender = pendingIntent.getTarget().asBinder(); - service.setBroadcastSubscriber(configKey, subscriberId, intentSender, + service.setBroadcastSubscriber(configKey, subscriberId, pendingIntent, mContext.getOpPackageName()); } else { service.unsetBroadcastSubscriber(configKey, subscriberId, mContext.getOpPackageName()); } } catch (RemoteException e) { - Slog.e(TAG, "Failed to connect to statsd when adding broadcast subscriber", e); + Slog.e(TAG, "Failed to connect to statsmanager when adding broadcast subscriber", + e); throw new StatsUnavailableException("could not connect", e); } catch (SecurityException e) { throw new StatsUnavailableException(e.getMessage(), e); @@ -309,18 +308,16 @@ public final class StatsManager { throws StatsUnavailableException { synchronized (sLock) { try { - IStatsd service = getIStatsdLocked(); + IStatsManagerService service = getIStatsManagerServiceLocked(); if (pendingIntent == null) { service.removeDataFetchOperation(configKey, mContext.getOpPackageName()); } else { - // Extracts IIntentSender from the PendingIntent and turns it into an IBinder. - IBinder intentSender = pendingIntent.getTarget().asBinder(); - service.setDataFetchOperation(configKey, intentSender, + service.setDataFetchOperation(configKey, pendingIntent, mContext.getOpPackageName()); } } catch (RemoteException e) { - Slog.e(TAG, "Failed to connect to statsd when registering data listener."); + Slog.e(TAG, "Failed to connect to statsmanager when registering data listener."); throw new StatsUnavailableException("could not connect", e); } catch (SecurityException e) { throw new StatsUnavailableException(e.getMessage(), e); @@ -347,20 +344,18 @@ public final class StatsManager { throws StatsUnavailableException { synchronized (sLock) { try { - IStatsd service = getIStatsdLocked(); + IStatsManagerService service = getIStatsManagerServiceLocked(); if (pendingIntent == null) { service.removeActiveConfigsChangedOperation(mContext.getOpPackageName()); return new long[0]; } else { - // Extracts IIntentSender from the PendingIntent and turns it into an IBinder. - IBinder intentSender = pendingIntent.getTarget().asBinder(); - return service.setActiveConfigsChangedOperation(intentSender, + return service.setActiveConfigsChangedOperation(pendingIntent, mContext.getOpPackageName()); } } catch (RemoteException e) { - Slog.e(TAG, - "Failed to connect to statsd when registering active configs listener."); + Slog.e(TAG, "Failed to connect to statsmanager " + + "when registering active configs listener."); throw new StatsUnavailableException("could not connect", e); } catch (SecurityException e) { throw new StatsUnavailableException(e.getMessage(), e); |