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

Merge "Fix statsd NPE on setPullAtomCallback" into rvc-dev

Browse Source
This commit is contained in:
Tej Singh
2020-05-06 22:11:02 +00:00
committed by Android (Google) Code Review
parent 76994e73a7 baed5257ad
commit 6dfbdb3e2f
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/statsd/framework/java/android/app/StatsManager.java
View File

@@ -28,7 +28,6 @@ import android.os.Binder;
import android.os.IPullAtomCallback; import android.os.IPullAtomCallback;
import android.os.IPullAtomResultReceiver; import android.os.IPullAtomResultReceiver;
import android.os.IStatsManagerService; import android.os.IStatsManagerService;
import android.os.IStatsd;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.StatsFrameworkInitializer; import android.os.StatsFrameworkInitializer;
import android.util.AndroidException; import android.util.AndroidException;
@@ -56,9 +55,6 @@ public final class StatsManager {
private static final Object sLock = new Object(); private static final Object sLock = new Object();
private final Context mContext; private final Context mContext;
@GuardedBy("sLock")
private IStatsd mService;
@GuardedBy("sLock") @GuardedBy("sLock")
private IStatsManagerService mStatsManagerService; private IStatsManagerService mStatsManagerService;

4
apex/statsd/service/java/com/android/server/stats/StatsManagerService.java
View File

@@ -172,6 +172,10 @@ public class StatsManagerService extends IStatsManagerService.Stub {
public void registerPullAtomCallback(int atomTag, long coolDownMillis, long timeoutMillis, public void registerPullAtomCallback(int atomTag, long coolDownMillis, long timeoutMillis,
int[] additiveFields, IPullAtomCallback pullerCallback) { int[] additiveFields, IPullAtomCallback pullerCallback) {
enforceRegisterStatsPullAtomPermission(); enforceRegisterStatsPullAtomPermission();
if (pullerCallback == null) {
Log.w(TAG, "Puller callback is null for atom " + atomTag);
return;
}
int callingUid = Binder.getCallingUid(); int callingUid = Binder.getCallingUid();
PullerKey key = new PullerKey(callingUid, atomTag); PullerKey key = new PullerKey(callingUid, atomTag);
PullerValue val = PullerValue val =

5
cmds/statsd/src/external/StatsPullerManager.cpp vendored
View File

@@ -354,6 +354,11 @@ void StatsPullerManager::RegisterPullAtomCallback(const int uid, const int32_t a
std::lock_guard<std::mutex> _l(mLock); std::lock_guard<std::mutex> _l(mLock);
VLOG("RegisterPullerCallback: adding puller for tag %d", atomTag); VLOG("RegisterPullerCallback: adding puller for tag %d", atomTag);
if (callback == nullptr) {
ALOGW("SetPullAtomCallback called with null callback for atom %d.", atomTag);
return;
}
StatsdStats::getInstance().notePullerCallbackRegistrationChanged(atomTag, /*registered=*/true); StatsdStats::getInstance().notePullerCallbackRegistrationChanged(atomTag, /*registered=*/true);
int64_t actualCoolDownNs = coolDownNs < kMinCoolDownNs ? kMinCoolDownNs : coolDownNs; int64_t actualCoolDownNs = coolDownNs < kMinCoolDownNs ? kMinCoolDownNs : coolDownNs;
int64_t actualTimeoutNs = timeoutNs > kMaxTimeoutNs ? kMaxTimeoutNs : timeoutNs; int64_t actualTimeoutNs = timeoutNs > kMaxTimeoutNs ? kMaxTimeoutNs : timeoutNs;