Merge changes I3f0904ef,Ib15d4d9e

* changes:
  Add logging code for ContextHubBooted atom
  Add support for CHRE metrics in core framework
This commit is contained in:
Arthur Ishiguro
2021-10-28 15:35:51 +00:00
committed by Android (Google) Code Review
2 changed files with 14 additions and 0 deletions

View File

@@ -88,12 +88,21 @@ genrule {
out: ["com/android/internal/art/ArtStatsLog.java"],
}
genrule {
name: "statslog-contexthub-java-gen",
tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module contexthub" +
" --javaPackage com.android.server.location.contexthub --javaClass ContextHubStatsLog",
out: ["com/android/server/location/contexthub/ContextHubStatsLog.java"],
}
java_library_static {
name: "services.core.unboosted",
defaults: ["platform_service_defaults"],
srcs: [
":android.hardware.biometrics.face-V1-java-source",
":statslog-art-java-gen",
":statslog-contexthub-java-gen",
":services.core-sources",
":services.core.protologsrc",
":dumpstate_aidl",

View File

@@ -49,6 +49,7 @@ import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.ShellCallback;
import android.os.SystemClock;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log;
@@ -184,6 +185,7 @@ public class ContextHubService extends IContextHubService.Stub {
}
public ContextHubService(Context context) {
long startTimeNs = SystemClock.elapsedRealtimeNanos();
mContext = context;
mContextHubWrapper = getContextHubWrapper();
@@ -205,6 +207,9 @@ public class ContextHubService extends IContextHubService.Stub {
Log.e(TAG, "RemoteException while getting Context Hub info", e);
hubInfo = new Pair(Collections.emptyList(), Collections.emptyList());
}
long bootTimeNs = SystemClock.elapsedRealtimeNanos() - startTimeNs;
int numContextHubs = hubInfo.first.size();
ContextHubStatsLog.write(ContextHubStatsLog.CONTEXT_HUB_BOOTED, bootTimeNs, numContextHubs);
mContextHubIdToInfoMap = Collections.unmodifiableMap(
ContextHubServiceUtil.createContextHubInfoMap(hubInfo.first));