Snap for 8618784 from 32d062041464a312518fb05d18a8cd99a87d7294 to mainline-extservices-release

Change-Id: Iacc8f73b8590404ab38d8267b5339cdca632b9d9

10 files changed, 13 insertions, 548 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 7f55daa..8d499c2 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,8 +1,8 @@
 drops {
   android_build_drop {
-    build_id: "T1003987"
+    build_id: "T1004024"
     target: "train_build"
-    source_file: "mainline-sdks/for-latest-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
+    source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.os.statsd/sdk/statsd-module-sdk-current.zip"
   }
   dest_file: "current/current.zip"
   version: ""
diff --git a/current/Android.bp b/current/Android.bp
index 20611b3..1f21cbb 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -212,7 +212,6 @@ cc_prebuilt_library_shared {
     sdk_member_name: "libstatssocket",
     visibility: ["//visibility:public"],
     apex_available: [
-        "com.android.bluetooth",
         "com.android.os.statsd",
         "test_com.android.os.statsd",
     ],
@@ -254,7 +253,6 @@ module_cc_prebuilt_library_shared {
     },
     visibility: ["//visibility:public"],
     apex_available: [
-        "com.android.bluetooth",
         "com.android.os.statsd",
         "test_com.android.os.statsd",
     ],
diff --git a/current/arm/lib/libstatssocket.so b/current/arm/lib/libstatssocket.so
index 9eedb1a..7e6c53f 100755
--- a/current/arm/lib/libstatssocket.so
+++ b/current/arm/lib/libstatssocket.so
diff --git a/current/arm64/lib/libstatssocket.so b/current/arm64/lib/libstatssocket.so
index cf011b5..dc60700 100755
--- a/current/arm64/lib/libstatssocket.so
+++ b/current/arm64/lib/libstatssocket.so
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 83c5625..6ace135 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -119,6 +119,10 @@ Landroid/os/StatsDimensionsValueParcel$1;->newArray(I)[Ljava/lang/Object;,public
 Landroid/os/StatsDimensionsValueParcel;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/os/StatsDimensionsValueParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/os/StatsFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/util/PropertyParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/util/PropertyParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/util/PropertyParcel;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/util/PropertyParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/util/StatsEvent$Builder;->addBooleanAnnotation(BZ)Landroid/util/StatsEvent$Builder;,sdk,system-api,test-api
 Landroid/util/StatsEvent$Builder;->addIntAnnotation(BI)Landroid/util/StatsEvent$Builder;,sdk,system-api,test-api
 Landroid/util/StatsEvent$Builder;->build()Landroid/util/StatsEvent;,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index 89c8796..cfb963d 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -1,42 +1,16 @@
-Landroid/app/StatsManager$PullAtomCallbackInternal$$ExternalSyntheticLambda0;-><init>(Landroid/app/StatsManager$PullAtomCallbackInternal;ILandroid/os/IPullAtomResultReceiver;)V
-Landroid/app/StatsManager$PullAtomCallbackInternal$$ExternalSyntheticLambda0;->f$0:Landroid/app/StatsManager$PullAtomCallbackInternal;
-Landroid/app/StatsManager$PullAtomCallbackInternal$$ExternalSyntheticLambda0;->f$1:I
-Landroid/app/StatsManager$PullAtomCallbackInternal$$ExternalSyntheticLambda0;->f$2:Landroid/os/IPullAtomResultReceiver;
 Landroid/app/StatsManager$PullAtomCallbackInternal$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/app/StatsManager$PullAtomCallbackInternal;-><init>(ILandroid/app/StatsManager$StatsPullAtomCallback;Ljava/util/concurrent/Executor;)V
-Landroid/app/StatsManager$PullAtomCallbackInternal;->lambda$onPullAtom$0$android-app-StatsManager$PullAtomCallbackInternal(ILandroid/os/IPullAtomResultReceiver;)V
-Landroid/app/StatsManager$PullAtomCallbackInternal;->mAtomId:I
-Landroid/app/StatsManager$PullAtomCallbackInternal;->mCallback:Landroid/app/StatsManager$StatsPullAtomCallback;
-Landroid/app/StatsManager$PullAtomCallbackInternal;->mExecutor:Ljava/util/concurrent/Executor;
-Landroid/app/StatsManager$PullAtomCallbackInternal;->onPullAtom(ILandroid/os/IPullAtomResultReceiver;)V
 Landroid/app/StatsManager$PullAtomMetadata$Builder;-><init>()V,system-api,test-api
 Landroid/app/StatsManager$PullAtomMetadata$Builder;->build()Landroid/app/StatsManager$PullAtomMetadata;,system-api,test-api
-Landroid/app/StatsManager$PullAtomMetadata$Builder;->mAdditiveFields:[I
-Landroid/app/StatsManager$PullAtomMetadata$Builder;->mCoolDownMillis:J
-Landroid/app/StatsManager$PullAtomMetadata$Builder;->mTimeoutMillis:J
 Landroid/app/StatsManager$PullAtomMetadata$Builder;->setAdditiveFields([I)Landroid/app/StatsManager$PullAtomMetadata$Builder;,system-api,test-api
 Landroid/app/StatsManager$PullAtomMetadata$Builder;->setCoolDownMillis(J)Landroid/app/StatsManager$PullAtomMetadata$Builder;,system-api,test-api
 Landroid/app/StatsManager$PullAtomMetadata$Builder;->setTimeoutMillis(J)Landroid/app/StatsManager$PullAtomMetadata$Builder;,system-api,test-api
-Landroid/app/StatsManager$PullAtomMetadata;->-$$Nest$fgetmAdditiveFields(Landroid/app/StatsManager$PullAtomMetadata;)[I
-Landroid/app/StatsManager$PullAtomMetadata;->-$$Nest$fgetmCoolDownMillis(Landroid/app/StatsManager$PullAtomMetadata;)J
-Landroid/app/StatsManager$PullAtomMetadata;->-$$Nest$fgetmTimeoutMillis(Landroid/app/StatsManager$PullAtomMetadata;)J
-Landroid/app/StatsManager$PullAtomMetadata;-><init>(JJ[I)V
-Landroid/app/StatsManager$PullAtomMetadata;-><init>(JJ[ILandroid/app/StatsManager$PullAtomMetadata-IA;)V
 Landroid/app/StatsManager$PullAtomMetadata;->getAdditiveFields()[I,system-api,test-api
 Landroid/app/StatsManager$PullAtomMetadata;->getCoolDownMillis()J,system-api,test-api
 Landroid/app/StatsManager$PullAtomMetadata;->getTimeoutMillis()J,system-api,test-api
-Landroid/app/StatsManager$PullAtomMetadata;->mAdditiveFields:[I
-Landroid/app/StatsManager$PullAtomMetadata;->mCoolDownMillis:J
-Landroid/app/StatsManager$PullAtomMetadata;->mTimeoutMillis:J
 Landroid/app/StatsManager$StatsPullAtomCallback;->onPullAtom(ILjava/util/List;)I,system-api,test-api
 Landroid/app/StatsManager$StatsUnavailableException;-><init>(Ljava/lang/String;)V,system-api,test-api
 Landroid/app/StatsManager$StatsUnavailableException;-><init>(Ljava/lang/String;Ljava/lang/Throwable;)V,system-api,test-api
-Landroid/app/StatsManager;-><clinit>()V
-Landroid/app/StatsManager;-><init>(Landroid/content/Context;)V
 Landroid/app/StatsManager;->ACTION_STATSD_STARTED:Ljava/lang/String;,system-api,test-api
-Landroid/app/StatsManager;->DEBUG:Z
-Landroid/app/StatsManager;->DEFAULT_COOL_DOWN_MILLIS:J
-Landroid/app/StatsManager;->DEFAULT_TIMEOUT_MILLIS:J
 Landroid/app/StatsManager;->EXTRA_STATS_ACTIVE_CONFIG_KEYS:Ljava/lang/String;,system-api,test-api
 Landroid/app/StatsManager;->EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES:Ljava/lang/String;,system-api,test-api
 Landroid/app/StatsManager;->EXTRA_STATS_CONFIG_KEY:Ljava/lang/String;,system-api,test-api
@@ -46,319 +20,54 @@ Landroid/app/StatsManager;->EXTRA_STATS_SUBSCRIPTION_ID:Ljava/lang/String;,syste
 Landroid/app/StatsManager;->EXTRA_STATS_SUBSCRIPTION_RULE_ID:Ljava/lang/String;,system-api,test-api
 Landroid/app/StatsManager;->PULL_SKIP:I,system-api,test-api
 Landroid/app/StatsManager;->PULL_SUCCESS:I,system-api,test-api
-Landroid/app/StatsManager;->TAG:Ljava/lang/String;
 Landroid/app/StatsManager;->addConfig(J[B)V,system-api,test-api
 Landroid/app/StatsManager;->addConfiguration(J[B)Z,system-api,test-api
 Landroid/app/StatsManager;->clearPullAtomCallback(I)V,system-api,test-api
 Landroid/app/StatsManager;->getData(J)[B,system-api,test-api
-Landroid/app/StatsManager;->getIStatsManagerServiceLocked()Landroid/os/IStatsManagerService;
 Landroid/app/StatsManager;->getMetadata()[B,system-api,test-api
 Landroid/app/StatsManager;->getRegisteredExperimentIds()[J,system-api,test-api
 Landroid/app/StatsManager;->getReports(J)[B,system-api,test-api
 Landroid/app/StatsManager;->getStatsMetadata()[B,system-api,test-api
-Landroid/app/StatsManager;->mContext:Landroid/content/Context;
-Landroid/app/StatsManager;->mStatsManagerService:Landroid/os/IStatsManagerService;
 Landroid/app/StatsManager;->removeConfig(J)V,system-api,test-api
 Landroid/app/StatsManager;->removeConfiguration(J)Z,system-api,test-api
-Landroid/app/StatsManager;->sLock:Ljava/lang/Object;
 Landroid/app/StatsManager;->setActiveConfigsChangedOperation(Landroid/app/PendingIntent;)[J,system-api,test-api
 Landroid/app/StatsManager;->setBroadcastSubscriber(JJLandroid/app/PendingIntent;)Z,system-api,test-api
 Landroid/app/StatsManager;->setBroadcastSubscriber(Landroid/app/PendingIntent;JJ)V,system-api,test-api
 Landroid/app/StatsManager;->setDataFetchOperation(JLandroid/app/PendingIntent;)Z,system-api,test-api
 Landroid/app/StatsManager;->setFetchReportsOperation(Landroid/app/PendingIntent;J)V,system-api,test-api
 Landroid/app/StatsManager;->setPullAtomCallback(ILandroid/app/StatsManager$PullAtomMetadata;Ljava/util/concurrent/Executor;Landroid/app/StatsManager$StatsPullAtomCallback;)V,system-api,test-api
-Landroid/os/IPendingIntentRef$Default;-><init>()V
 Landroid/os/IPendingIntentRef$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPendingIntentRef$Default;->sendActiveConfigsChangedBroadcast([J)V
-Landroid/os/IPendingIntentRef$Default;->sendDataBroadcast(J)V
-Landroid/os/IPendingIntentRef$Default;->sendSubscriberBroadcast(JJJJ[Ljava/lang/String;Landroid/os/StatsDimensionsValueParcel;)V
-Landroid/os/IPendingIntentRef$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/os/IPendingIntentRef$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPendingIntentRef$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
-Landroid/os/IPendingIntentRef$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/os/IPendingIntentRef$Stub$Proxy;->sendActiveConfigsChangedBroadcast([J)V
-Landroid/os/IPendingIntentRef$Stub$Proxy;->sendDataBroadcast(J)V
-Landroid/os/IPendingIntentRef$Stub$Proxy;->sendSubscriberBroadcast(JJJJ[Ljava/lang/String;Landroid/os/StatsDimensionsValueParcel;)V
-Landroid/os/IPendingIntentRef$Stub;-><init>()V
-Landroid/os/IPendingIntentRef$Stub;->TRANSACTION_sendActiveConfigsChangedBroadcast:I
-Landroid/os/IPendingIntentRef$Stub;->TRANSACTION_sendDataBroadcast:I
-Landroid/os/IPendingIntentRef$Stub;->TRANSACTION_sendSubscriberBroadcast:I
 Landroid/os/IPendingIntentRef$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPendingIntentRef$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPendingIntentRef;
 Landroid/os/IPendingIntentRef$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/os/IPendingIntentRef;->DESCRIPTOR:Ljava/lang/String;
-Landroid/os/IPendingIntentRef;->sendActiveConfigsChangedBroadcast([J)V
-Landroid/os/IPendingIntentRef;->sendDataBroadcast(J)V
-Landroid/os/IPendingIntentRef;->sendSubscriberBroadcast(JJJJ[Ljava/lang/String;Landroid/os/StatsDimensionsValueParcel;)V
-Landroid/os/IPullAtomCallback$Default;-><init>()V
 Landroid/os/IPullAtomCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPullAtomCallback$Default;->onPullAtom(ILandroid/os/IPullAtomResultReceiver;)V
-Landroid/os/IPullAtomCallback$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/os/IPullAtomCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPullAtomCallback$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
-Landroid/os/IPullAtomCallback$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/os/IPullAtomCallback$Stub$Proxy;->onPullAtom(ILandroid/os/IPullAtomResultReceiver;)V
-Landroid/os/IPullAtomCallback$Stub;-><init>()V
-Landroid/os/IPullAtomCallback$Stub;->TRANSACTION_onPullAtom:I
 Landroid/os/IPullAtomCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPullAtomCallback$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPullAtomCallback;
 Landroid/os/IPullAtomCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/os/IPullAtomCallback;->DESCRIPTOR:Ljava/lang/String;
-Landroid/os/IPullAtomCallback;->onPullAtom(ILandroid/os/IPullAtomResultReceiver;)V
-Landroid/os/IPullAtomResultReceiver$Default;-><init>()V
 Landroid/os/IPullAtomResultReceiver$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPullAtomResultReceiver$Default;->pullFinished(IZ[Landroid/util/StatsEventParcel;)V
-Landroid/os/IPullAtomResultReceiver$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/os/IPullAtomResultReceiver$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPullAtomResultReceiver$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
-Landroid/os/IPullAtomResultReceiver$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/os/IPullAtomResultReceiver$Stub$Proxy;->pullFinished(IZ[Landroid/util/StatsEventParcel;)V
-Landroid/os/IPullAtomResultReceiver$Stub;-><init>()V
-Landroid/os/IPullAtomResultReceiver$Stub;->TRANSACTION_pullFinished:I
 Landroid/os/IPullAtomResultReceiver$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IPullAtomResultReceiver$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IPullAtomResultReceiver;
 Landroid/os/IPullAtomResultReceiver$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/os/IPullAtomResultReceiver;->DESCRIPTOR:Ljava/lang/String;
-Landroid/os/IPullAtomResultReceiver;->pullFinished(IZ[Landroid/util/StatsEventParcel;)V
-Landroid/os/IStatsCompanionService$Default;-><init>()V
 Landroid/os/IStatsCompanionService$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsCompanionService$Default;->cancelAlarmForSubscriberTriggering()V
-Landroid/os/IStatsCompanionService$Default;->cancelAnomalyAlarm()V
-Landroid/os/IStatsCompanionService$Default;->cancelPullingAlarm()V
-Landroid/os/IStatsCompanionService$Default;->checkPermission(Ljava/lang/String;II)Z
-Landroid/os/IStatsCompanionService$Default;->setAlarmForSubscriberTriggering(J)V
-Landroid/os/IStatsCompanionService$Default;->setAnomalyAlarm(J)V
-Landroid/os/IStatsCompanionService$Default;->setPullingAlarm(J)V
-Landroid/os/IStatsCompanionService$Default;->statsdReady()V
-Landroid/os/IStatsCompanionService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
 Landroid/os/IStatsCompanionService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsCompanionService$Stub$Proxy;->cancelAlarmForSubscriberTriggering()V
-Landroid/os/IStatsCompanionService$Stub$Proxy;->cancelAnomalyAlarm()V
-Landroid/os/IStatsCompanionService$Stub$Proxy;->cancelPullingAlarm()V
-Landroid/os/IStatsCompanionService$Stub$Proxy;->checkPermission(Ljava/lang/String;II)Z
-Landroid/os/IStatsCompanionService$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
-Landroid/os/IStatsCompanionService$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/os/IStatsCompanionService$Stub$Proxy;->setAlarmForSubscriberTriggering(J)V
-Landroid/os/IStatsCompanionService$Stub$Proxy;->setAnomalyAlarm(J)V
-Landroid/os/IStatsCompanionService$Stub$Proxy;->setPullingAlarm(J)V
-Landroid/os/IStatsCompanionService$Stub$Proxy;->statsdReady()V
-Landroid/os/IStatsCompanionService$Stub;-><init>()V
-Landroid/os/IStatsCompanionService$Stub;->DESCRIPTOR:Ljava/lang/String;
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_cancelAlarmForSubscriberTriggering:I
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_cancelAnomalyAlarm:I
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_cancelPullingAlarm:I
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_checkPermission:I
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_setAlarmForSubscriberTriggering:I
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_setAnomalyAlarm:I
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_setPullingAlarm:I
-Landroid/os/IStatsCompanionService$Stub;->TRANSACTION_statsdReady:I
 Landroid/os/IStatsCompanionService$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsCompanionService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IStatsCompanionService;
 Landroid/os/IStatsCompanionService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/os/IStatsCompanionService;->cancelAlarmForSubscriberTriggering()V
-Landroid/os/IStatsCompanionService;->cancelAnomalyAlarm()V
-Landroid/os/IStatsCompanionService;->cancelPullingAlarm()V
-Landroid/os/IStatsCompanionService;->checkPermission(Ljava/lang/String;II)Z
-Landroid/os/IStatsCompanionService;->setAlarmForSubscriberTriggering(J)V
-Landroid/os/IStatsCompanionService;->setAnomalyAlarm(J)V
-Landroid/os/IStatsCompanionService;->setPullingAlarm(J)V
-Landroid/os/IStatsCompanionService;->statsdReady()V
-Landroid/os/IStatsManagerService$Default;-><init>()V
-Landroid/os/IStatsManagerService$Default;->addConfiguration(J[BLjava/lang/String;)V
 Landroid/os/IStatsManagerService$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsManagerService$Default;->getData(JLjava/lang/String;)[B
-Landroid/os/IStatsManagerService$Default;->getMetadata(Ljava/lang/String;)[B
-Landroid/os/IStatsManagerService$Default;->getRegisteredExperimentIds()[J
-Landroid/os/IStatsManagerService$Default;->registerPullAtomCallback(IJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsManagerService$Default;->removeActiveConfigsChangedOperation(Ljava/lang/String;)V
-Landroid/os/IStatsManagerService$Default;->removeConfiguration(JLjava/lang/String;)V
-Landroid/os/IStatsManagerService$Default;->removeDataFetchOperation(JLjava/lang/String;)V
-Landroid/os/IStatsManagerService$Default;->setActiveConfigsChangedOperation(Landroid/app/PendingIntent;Ljava/lang/String;)[J
-Landroid/os/IStatsManagerService$Default;->setBroadcastSubscriber(JJLandroid/app/PendingIntent;Ljava/lang/String;)V
-Landroid/os/IStatsManagerService$Default;->setDataFetchOperation(JLandroid/app/PendingIntent;Ljava/lang/String;)V
-Landroid/os/IStatsManagerService$Default;->unregisterPullAtomCallback(I)V
-Landroid/os/IStatsManagerService$Default;->unsetBroadcastSubscriber(JJLjava/lang/String;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->addConfiguration(J[BLjava/lang/String;)V
 Landroid/os/IStatsManagerService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsManagerService$Stub$Proxy;->getData(JLjava/lang/String;)[B
-Landroid/os/IStatsManagerService$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
-Landroid/os/IStatsManagerService$Stub$Proxy;->getMetadata(Ljava/lang/String;)[B
-Landroid/os/IStatsManagerService$Stub$Proxy;->getRegisteredExperimentIds()[J
-Landroid/os/IStatsManagerService$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/os/IStatsManagerService$Stub$Proxy;->registerPullAtomCallback(IJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->removeActiveConfigsChangedOperation(Ljava/lang/String;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->removeConfiguration(JLjava/lang/String;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->removeDataFetchOperation(JLjava/lang/String;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->setActiveConfigsChangedOperation(Landroid/app/PendingIntent;Ljava/lang/String;)[J
-Landroid/os/IStatsManagerService$Stub$Proxy;->setBroadcastSubscriber(JJLandroid/app/PendingIntent;Ljava/lang/String;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->setDataFetchOperation(JLandroid/app/PendingIntent;Ljava/lang/String;)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->unregisterPullAtomCallback(I)V
-Landroid/os/IStatsManagerService$Stub$Proxy;->unsetBroadcastSubscriber(JJLjava/lang/String;)V
-Landroid/os/IStatsManagerService$Stub;-><init>()V
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_addConfiguration:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_getData:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_getMetadata:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_getRegisteredExperimentIds:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_registerPullAtomCallback:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_removeActiveConfigsChangedOperation:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_removeConfiguration:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_removeDataFetchOperation:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_setActiveConfigsChangedOperation:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_setBroadcastSubscriber:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_setDataFetchOperation:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_unregisterPullAtomCallback:I
-Landroid/os/IStatsManagerService$Stub;->TRANSACTION_unsetBroadcastSubscriber:I
 Landroid/os/IStatsManagerService$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsManagerService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IStatsManagerService;
 Landroid/os/IStatsManagerService$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/os/IStatsManagerService;->DESCRIPTOR:Ljava/lang/String;
-Landroid/os/IStatsManagerService;->addConfiguration(J[BLjava/lang/String;)V
-Landroid/os/IStatsManagerService;->getData(JLjava/lang/String;)[B
-Landroid/os/IStatsManagerService;->getMetadata(Ljava/lang/String;)[B
-Landroid/os/IStatsManagerService;->getRegisteredExperimentIds()[J
-Landroid/os/IStatsManagerService;->registerPullAtomCallback(IJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsManagerService;->removeActiveConfigsChangedOperation(Ljava/lang/String;)V
-Landroid/os/IStatsManagerService;->removeConfiguration(JLjava/lang/String;)V
-Landroid/os/IStatsManagerService;->removeDataFetchOperation(JLjava/lang/String;)V
-Landroid/os/IStatsManagerService;->setActiveConfigsChangedOperation(Landroid/app/PendingIntent;Ljava/lang/String;)[J
-Landroid/os/IStatsManagerService;->setBroadcastSubscriber(JJLandroid/app/PendingIntent;Ljava/lang/String;)V
-Landroid/os/IStatsManagerService;->setDataFetchOperation(JLandroid/app/PendingIntent;Ljava/lang/String;)V
-Landroid/os/IStatsManagerService;->unregisterPullAtomCallback(I)V
-Landroid/os/IStatsManagerService;->unsetBroadcastSubscriber(JJLjava/lang/String;)V
-Landroid/os/IStatsd$Default;-><init>()V
-Landroid/os/IStatsd$Default;->addConfiguration(J[BI)V
-Landroid/os/IStatsd$Default;->allPullersFromBootRegistered()V
 Landroid/os/IStatsd$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsd$Default;->bootCompleted()V
-Landroid/os/IStatsd$Default;->getData(JI)[B
-Landroid/os/IStatsd$Default;->getMetadata()[B
-Landroid/os/IStatsd$Default;->getRegisteredExperimentIds()[J
-Landroid/os/IStatsd$Default;->informAlarmForSubscriberTriggeringFired()V
-Landroid/os/IStatsd$Default;->informAllUidData(Landroid/os/ParcelFileDescriptor;)V
-Landroid/os/IStatsd$Default;->informAnomalyAlarmFired()V
-Landroid/os/IStatsd$Default;->informDeviceShutdown()V
-Landroid/os/IStatsd$Default;->informOnePackage(Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;)V
-Landroid/os/IStatsd$Default;->informOnePackageRemoved(Ljava/lang/String;I)V
-Landroid/os/IStatsd$Default;->informPollAlarmFired()V
-Landroid/os/IStatsd$Default;->registerNativePullAtomCallback(IJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsd$Default;->registerPullAtomCallback(IIJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsd$Default;->removeActiveConfigsChangedOperation(I)V
-Landroid/os/IStatsd$Default;->removeConfiguration(JI)V
-Landroid/os/IStatsd$Default;->removeDataFetchOperation(JI)V
-Landroid/os/IStatsd$Default;->setActiveConfigsChangedOperation(Landroid/os/IPendingIntentRef;I)[J
-Landroid/os/IStatsd$Default;->setBroadcastSubscriber(JJLandroid/os/IPendingIntentRef;I)V
-Landroid/os/IStatsd$Default;->setDataFetchOperation(JLandroid/os/IPendingIntentRef;I)V
-Landroid/os/IStatsd$Default;->statsCompanionReady()V
-Landroid/os/IStatsd$Default;->systemRunning()V
-Landroid/os/IStatsd$Default;->unregisterNativePullAtomCallback(I)V
-Landroid/os/IStatsd$Default;->unregisterPullAtomCallback(II)V
-Landroid/os/IStatsd$Default;->unsetBroadcastSubscriber(JJI)V
-Landroid/os/IStatsd$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
-Landroid/os/IStatsd$Stub$Proxy;->addConfiguration(J[BI)V
-Landroid/os/IStatsd$Stub$Proxy;->allPullersFromBootRegistered()V
 Landroid/os/IStatsd$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsd$Stub$Proxy;->bootCompleted()V
-Landroid/os/IStatsd$Stub$Proxy;->getData(JI)[B
-Landroid/os/IStatsd$Stub$Proxy;->getInterfaceDescriptor()Ljava/lang/String;
-Landroid/os/IStatsd$Stub$Proxy;->getMetadata()[B
-Landroid/os/IStatsd$Stub$Proxy;->getRegisteredExperimentIds()[J
-Landroid/os/IStatsd$Stub$Proxy;->informAlarmForSubscriberTriggeringFired()V
-Landroid/os/IStatsd$Stub$Proxy;->informAllUidData(Landroid/os/ParcelFileDescriptor;)V
-Landroid/os/IStatsd$Stub$Proxy;->informAnomalyAlarmFired()V
-Landroid/os/IStatsd$Stub$Proxy;->informDeviceShutdown()V
-Landroid/os/IStatsd$Stub$Proxy;->informOnePackage(Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;)V
-Landroid/os/IStatsd$Stub$Proxy;->informOnePackageRemoved(Ljava/lang/String;I)V
-Landroid/os/IStatsd$Stub$Proxy;->informPollAlarmFired()V
-Landroid/os/IStatsd$Stub$Proxy;->mRemote:Landroid/os/IBinder;
-Landroid/os/IStatsd$Stub$Proxy;->registerNativePullAtomCallback(IJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsd$Stub$Proxy;->registerPullAtomCallback(IIJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsd$Stub$Proxy;->removeActiveConfigsChangedOperation(I)V
-Landroid/os/IStatsd$Stub$Proxy;->removeConfiguration(JI)V
-Landroid/os/IStatsd$Stub$Proxy;->removeDataFetchOperation(JI)V
-Landroid/os/IStatsd$Stub$Proxy;->setActiveConfigsChangedOperation(Landroid/os/IPendingIntentRef;I)[J
-Landroid/os/IStatsd$Stub$Proxy;->setBroadcastSubscriber(JJLandroid/os/IPendingIntentRef;I)V
-Landroid/os/IStatsd$Stub$Proxy;->setDataFetchOperation(JLandroid/os/IPendingIntentRef;I)V
-Landroid/os/IStatsd$Stub$Proxy;->statsCompanionReady()V
-Landroid/os/IStatsd$Stub$Proxy;->systemRunning()V
-Landroid/os/IStatsd$Stub$Proxy;->unregisterNativePullAtomCallback(I)V
-Landroid/os/IStatsd$Stub$Proxy;->unregisterPullAtomCallback(II)V
-Landroid/os/IStatsd$Stub$Proxy;->unsetBroadcastSubscriber(JJI)V
-Landroid/os/IStatsd$Stub;-><init>()V
-Landroid/os/IStatsd$Stub;->TRANSACTION_addConfiguration:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_allPullersFromBootRegistered:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_bootCompleted:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_getData:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_getMetadata:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_getRegisteredExperimentIds:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_informAlarmForSubscriberTriggeringFired:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_informAllUidData:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_informAnomalyAlarmFired:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_informDeviceShutdown:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_informOnePackage:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_informOnePackageRemoved:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_informPollAlarmFired:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_registerNativePullAtomCallback:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_registerPullAtomCallback:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_removeActiveConfigsChangedOperation:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_removeConfiguration:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_removeDataFetchOperation:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_setActiveConfigsChangedOperation:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_setBroadcastSubscriber:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_setDataFetchOperation:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_statsCompanionReady:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_systemRunning:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_unregisterNativePullAtomCallback:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_unregisterPullAtomCallback:I
-Landroid/os/IStatsd$Stub;->TRANSACTION_unsetBroadcastSubscriber:I
 Landroid/os/IStatsd$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/os/IStatsd$Stub;->asInterface(Landroid/os/IBinder;)Landroid/os/IStatsd;
 Landroid/os/IStatsd$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/os/IStatsd;->DESCRIPTOR:Ljava/lang/String;
-Landroid/os/IStatsd;->FLAG_REQUIRE_LOW_LATENCY_MONITOR:I
-Landroid/os/IStatsd;->FLAG_REQUIRE_STAGING:I
-Landroid/os/IStatsd;->FLAG_ROLLBACK_ENABLED:I
-Landroid/os/IStatsd;->addConfiguration(J[BI)V
-Landroid/os/IStatsd;->allPullersFromBootRegistered()V
-Landroid/os/IStatsd;->bootCompleted()V
-Landroid/os/IStatsd;->getData(JI)[B
-Landroid/os/IStatsd;->getMetadata()[B
-Landroid/os/IStatsd;->getRegisteredExperimentIds()[J
-Landroid/os/IStatsd;->informAlarmForSubscriberTriggeringFired()V
-Landroid/os/IStatsd;->informAllUidData(Landroid/os/ParcelFileDescriptor;)V
-Landroid/os/IStatsd;->informAnomalyAlarmFired()V
-Landroid/os/IStatsd;->informDeviceShutdown()V
-Landroid/os/IStatsd;->informOnePackage(Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;)V
-Landroid/os/IStatsd;->informOnePackageRemoved(Ljava/lang/String;I)V
-Landroid/os/IStatsd;->informPollAlarmFired()V
-Landroid/os/IStatsd;->registerNativePullAtomCallback(IJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsd;->registerPullAtomCallback(IIJJ[ILandroid/os/IPullAtomCallback;)V
-Landroid/os/IStatsd;->removeActiveConfigsChangedOperation(I)V
-Landroid/os/IStatsd;->removeConfiguration(JI)V
-Landroid/os/IStatsd;->removeDataFetchOperation(JI)V
-Landroid/os/IStatsd;->setActiveConfigsChangedOperation(Landroid/os/IPendingIntentRef;I)[J
-Landroid/os/IStatsd;->setBroadcastSubscriber(JJLandroid/os/IPendingIntentRef;I)V
-Landroid/os/IStatsd;->setDataFetchOperation(JLandroid/os/IPendingIntentRef;I)V
-Landroid/os/IStatsd;->statsCompanionReady()V
-Landroid/os/IStatsd;->systemRunning()V
-Landroid/os/IStatsd;->unregisterNativePullAtomCallback(I)V
-Landroid/os/IStatsd;->unregisterPullAtomCallback(II)V
-Landroid/os/IStatsd;->unsetBroadcastSubscriber(JJI)V
-Landroid/os/StatsDimensionsValue$1;-><init>()V
-Landroid/os/StatsDimensionsValue$1;->createFromParcel(Landroid/os/Parcel;)Landroid/os/StatsDimensionsValue;
 Landroid/os/StatsDimensionsValue$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/os/StatsDimensionsValue$1;->newArray(I)[Landroid/os/StatsDimensionsValue;
 Landroid/os/StatsDimensionsValue$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/os/StatsDimensionsValue;-><clinit>()V
-Landroid/os/StatsDimensionsValue;-><init>(Landroid/os/Parcel;)V
-Landroid/os/StatsDimensionsValue;-><init>(Landroid/os/StatsDimensionsValueParcel;)V
 Landroid/os/StatsDimensionsValue;->BOOLEAN_VALUE_TYPE:I,system-api,test-api
 Landroid/os/StatsDimensionsValue;->CREATOR:Landroid/os/Parcelable$Creator;,system-api,test-api
 Landroid/os/StatsDimensionsValue;->FLOAT_VALUE_TYPE:I,system-api,test-api
 Landroid/os/StatsDimensionsValue;->INT_VALUE_TYPE:I,system-api,test-api
 Landroid/os/StatsDimensionsValue;->LONG_VALUE_TYPE:I,system-api,test-api
 Landroid/os/StatsDimensionsValue;->STRING_VALUE_TYPE:I,system-api,test-api
-Landroid/os/StatsDimensionsValue;->TAG:Ljava/lang/String;
 Landroid/os/StatsDimensionsValue;->TUPLE_VALUE_TYPE:I,system-api,test-api
 Landroid/os/StatsDimensionsValue;->describeContents()I,public-api,system-api,test-api
 Landroid/os/StatsDimensionsValue;->getBooleanValue()Z,system-api,test-api
@@ -369,100 +78,27 @@ Landroid/os/StatsDimensionsValue;->getLongValue()J,system-api,test-api
 Landroid/os/StatsDimensionsValue;->getStringValue()Ljava/lang/String;,system-api,test-api
 Landroid/os/StatsDimensionsValue;->getTupleValueList()Ljava/util/List;,system-api,test-api
 Landroid/os/StatsDimensionsValue;->getValueType()I,system-api,test-api
-Landroid/os/StatsDimensionsValue;->getValueTypeAsString()Ljava/lang/String;
 Landroid/os/StatsDimensionsValue;->isValueType(I)Z,system-api,test-api
-Landroid/os/StatsDimensionsValue;->mInner:Landroid/os/StatsDimensionsValueParcel;
 Landroid/os/StatsDimensionsValue;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/os/StatsDimensionsValue;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/os/StatsDimensionsValueParcel$1;-><init>()V
-Landroid/os/StatsDimensionsValueParcel$1;->createFromParcel(Landroid/os/Parcel;)Landroid/os/StatsDimensionsValueParcel;
 Landroid/os/StatsDimensionsValueParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/os/StatsDimensionsValueParcel$1;->newArray(I)[Landroid/os/StatsDimensionsValueParcel;
 Landroid/os/StatsDimensionsValueParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/os/StatsDimensionsValueParcel;-><clinit>()V
-Landroid/os/StatsDimensionsValueParcel;-><init>()V
-Landroid/os/StatsDimensionsValueParcel;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/os/StatsDimensionsValueParcel;->boolValue:Z
 Landroid/os/StatsDimensionsValueParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/os/StatsDimensionsValueParcel;->describeContents(Ljava/lang/Object;)I
-Landroid/os/StatsDimensionsValueParcel;->field:I
-Landroid/os/StatsDimensionsValueParcel;->floatValue:F
-Landroid/os/StatsDimensionsValueParcel;->intValue:I
-Landroid/os/StatsDimensionsValueParcel;->longValue:J
-Landroid/os/StatsDimensionsValueParcel;->readFromParcel(Landroid/os/Parcel;)V
-Landroid/os/StatsDimensionsValueParcel;->stringValue:Ljava/lang/String;
-Landroid/os/StatsDimensionsValueParcel;->tupleValue:[Landroid/os/StatsDimensionsValueParcel;
-Landroid/os/StatsDimensionsValueParcel;->valueType:I
 Landroid/os/StatsDimensionsValueParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/os/StatsFrameworkInitializer$$ExternalSyntheticLambda0;-><clinit>()V
-Landroid/os/StatsFrameworkInitializer$$ExternalSyntheticLambda0;-><init>()V
-Landroid/os/StatsFrameworkInitializer$$ExternalSyntheticLambda0;->INSTANCE:Landroid/os/StatsFrameworkInitializer$$ExternalSyntheticLambda0;
 Landroid/os/StatsFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
-Landroid/os/StatsFrameworkInitializer;-><init>()V
-Landroid/os/StatsFrameworkInitializer;->getStatsServiceManager()Landroid/os/StatsServiceManager;
-Landroid/os/StatsFrameworkInitializer;->lambda$registerServiceWrappers$0(Landroid/content/Context;)Landroid/app/StatsManager;
-Landroid/os/StatsFrameworkInitializer;->registerServiceWrappers()V
-Landroid/os/StatsFrameworkInitializer;->sStatsServiceManager:Landroid/os/StatsServiceManager;
-Landroid/os/StatsFrameworkInitializer;->setStatsServiceManager(Landroid/os/StatsServiceManager;)V
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mgetBytes(Landroid/util/StatsEvent$Buffer;)[B
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mhasOverflowed(Landroid/util/StatsEvent$Buffer;)Z
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mputBoolean(Landroid/util/StatsEvent$Buffer;IZ)I
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mputByte(Landroid/util/StatsEvent$Buffer;IB)I
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mputByteArray(Landroid/util/StatsEvent$Buffer;I[B)I
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mputFloat(Landroid/util/StatsEvent$Buffer;IF)I
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mputInt(Landroid/util/StatsEvent$Buffer;II)I
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mputLong(Landroid/util/StatsEvent$Buffer;IJ)I
-Landroid/util/StatsEvent$Buffer;->-$$Nest$mrelease(Landroid/util/StatsEvent$Buffer;)V
-Landroid/util/StatsEvent$Buffer;->-$$Nest$msetMaxSize(Landroid/util/StatsEvent$Buffer;II)V
-Landroid/util/StatsEvent$Buffer;->-$$Nest$smobtain()Landroid/util/StatsEvent$Buffer;
-Landroid/util/StatsEvent$Buffer;-><clinit>()V
-Landroid/util/StatsEvent$Buffer;-><init>()V
-Landroid/util/StatsEvent$Buffer;->getBytes()[B
-Landroid/util/StatsEvent$Buffer;->hasEnoughSpace(II)Z
-Landroid/util/StatsEvent$Buffer;->hasOverflowed()Z
-Landroid/util/StatsEvent$Buffer;->mBytes:[B
-Landroid/util/StatsEvent$Buffer;->mMaxSize:I
-Landroid/util/StatsEvent$Buffer;->mOverflow:Z
-Landroid/util/StatsEvent$Buffer;->obtain()Landroid/util/StatsEvent$Buffer;
-Landroid/util/StatsEvent$Buffer;->putBoolean(IZ)I
-Landroid/util/StatsEvent$Buffer;->putByte(IB)I
-Landroid/util/StatsEvent$Buffer;->putByteArray(I[B)I
-Landroid/util/StatsEvent$Buffer;->putFloat(IF)I
-Landroid/util/StatsEvent$Buffer;->putInt(II)I
-Landroid/util/StatsEvent$Buffer;->putLong(IJ)I
-Landroid/util/StatsEvent$Buffer;->release()V
-Landroid/util/StatsEvent$Buffer;->reset()V
-Landroid/util/StatsEvent$Buffer;->sLock:Ljava/lang/Object;
-Landroid/util/StatsEvent$Buffer;->sPool:Landroid/util/StatsEvent$Buffer;
-Landroid/util/StatsEvent$Buffer;->setMaxSize(II)V
-Landroid/util/StatsEvent$Builder;-><init>(Landroid/util/StatsEvent$Buffer;)V
-Landroid/util/StatsEvent$Builder;-><init>(Landroid/util/StatsEvent$Buffer;Landroid/util/StatsEvent$Builder-IA;)V
-Landroid/util/StatsEvent$Builder;->POS_ATOM_ID:I
-Landroid/util/StatsEvent$Builder;->POS_NUM_ELEMENTS:I
-Landroid/util/StatsEvent$Builder;->POS_TIMESTAMP_NS:I
+Landroid/util/PropertyParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/util/PropertyParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/util/PropertyParcel;->describeContents()I,public-api,system-api,test-api
+Landroid/util/PropertyParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/util/StatsEvent$Builder;->addBooleanAnnotation(BZ)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->addIntAnnotation(BI)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->build()Landroid/util/StatsEvent;,system-api,test-api
-Landroid/util/StatsEvent$Builder;->mAtomId:I
-Landroid/util/StatsEvent$Builder;->mBuffer:Landroid/util/StatsEvent$Buffer;
-Landroid/util/StatsEvent$Builder;->mCurrentAnnotationCount:B
-Landroid/util/StatsEvent$Builder;->mErrorMask:I
-Landroid/util/StatsEvent$Builder;->mLastType:B
-Landroid/util/StatsEvent$Builder;->mNumElements:I
-Landroid/util/StatsEvent$Builder;->mPos:I
-Landroid/util/StatsEvent$Builder;->mPosLastField:I
-Landroid/util/StatsEvent$Builder;->mTimestampNs:J
-Landroid/util/StatsEvent$Builder;->mUsePooledBuffer:Z
 Landroid/util/StatsEvent$Builder;->setAtomId(I)Landroid/util/StatsEvent$Builder;,system-api,test-api
-Landroid/util/StatsEvent$Builder;->stringToBytes(Ljava/lang/String;)[B
 Landroid/util/StatsEvent$Builder;->usePooledBuffer()Landroid/util/StatsEvent$Builder;,system-api,test-api
-Landroid/util/StatsEvent$Builder;->writeAnnotationCount()V
-Landroid/util/StatsEvent$Builder;->writeArrayInfo(BB)Z
 Landroid/util/StatsEvent$Builder;->writeAttributionChain([I[Ljava/lang/String;)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->writeBoolean(Z)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->writeBooleanArray([Z)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->writeByteArray([B)Landroid/util/StatsEvent$Builder;,system-api,test-api
-Landroid/util/StatsEvent$Builder;->writeByteArray([BB)V
 Landroid/util/StatsEvent$Builder;->writeFloat(F)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->writeFloatArray([F)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->writeInt(I)Landroid/util/StatsEvent$Builder;,system-api,test-api
@@ -472,63 +108,11 @@ Landroid/util/StatsEvent$Builder;->writeLong(J)Landroid/util/StatsEvent$Builder;
 Landroid/util/StatsEvent$Builder;->writeLongArray([J)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->writeString(Ljava/lang/String;)Landroid/util/StatsEvent$Builder;,system-api,test-api
 Landroid/util/StatsEvent$Builder;->writeStringArray([Ljava/lang/String;)Landroid/util/StatsEvent$Builder;,system-api,test-api
-Landroid/util/StatsEvent$Builder;->writeTypeId(B)V
-Landroid/util/StatsEvent;-><init>(ILandroid/util/StatsEvent$Buffer;[BI)V
-Landroid/util/StatsEvent;-><init>(ILandroid/util/StatsEvent$Buffer;[BILandroid/util/StatsEvent-IA;)V
-Landroid/util/StatsEvent;->ERROR_ANNOTATION_DOES_NOT_FOLLOW_FIELD:I
-Landroid/util/StatsEvent;->ERROR_ANNOTATION_ID_TOO_LARGE:I
-Landroid/util/StatsEvent;->ERROR_ATOM_ID_INVALID_POSITION:I
-Landroid/util/StatsEvent;->ERROR_ATTRIBUTION_CHAIN_TOO_LONG:I
-Landroid/util/StatsEvent;->ERROR_ATTRIBUTION_UIDS_TAGS_SIZES_NOT_EQUAL:I
-Landroid/util/StatsEvent;->ERROR_INVALID_ANNOTATION_ID:I
-Landroid/util/StatsEvent;->ERROR_LIST_TOO_LONG:I
-Landroid/util/StatsEvent;->ERROR_NO_ATOM_ID:I
-Landroid/util/StatsEvent;->ERROR_NO_TIMESTAMP:I
-Landroid/util/StatsEvent;->ERROR_OVERFLOW:I
-Landroid/util/StatsEvent;->ERROR_TOO_MANY_ANNOTATIONS:I
-Landroid/util/StatsEvent;->ERROR_TOO_MANY_FIELDS:I
-Landroid/util/StatsEvent;->ERROR_TOO_MANY_KEY_VALUE_PAIRS:I
-Landroid/util/StatsEvent;->LOGGER_ENTRY_MAX_PAYLOAD:I
-Landroid/util/StatsEvent;->MAX_ANNOTATION_COUNT:I
-Landroid/util/StatsEvent;->MAX_ATTRIBUTION_NODES:I
-Landroid/util/StatsEvent;->MAX_KEY_VALUE_PAIRS:I
-Landroid/util/StatsEvent;->MAX_NUM_ELEMENTS:I
-Landroid/util/StatsEvent;->MAX_PULL_PAYLOAD_SIZE:I
-Landroid/util/StatsEvent;->MAX_PUSH_PAYLOAD_SIZE:I
-Landroid/util/StatsEvent;->TYPE_ATTRIBUTION_CHAIN:B
-Landroid/util/StatsEvent;->TYPE_BOOLEAN:B
-Landroid/util/StatsEvent;->TYPE_BYTE_ARRAY:B
-Landroid/util/StatsEvent;->TYPE_ERRORS:B
-Landroid/util/StatsEvent;->TYPE_FLOAT:B
-Landroid/util/StatsEvent;->TYPE_INT:B
-Landroid/util/StatsEvent;->TYPE_KEY_VALUE_PAIRS:B
-Landroid/util/StatsEvent;->TYPE_LIST:B
-Landroid/util/StatsEvent;->TYPE_LONG:B
-Landroid/util/StatsEvent;->TYPE_OBJECT:B
-Landroid/util/StatsEvent;->TYPE_STRING:B
-Landroid/util/StatsEvent;->getAtomId()I
-Landroid/util/StatsEvent;->getBytes()[B
-Landroid/util/StatsEvent;->getNumBytes()I
-Landroid/util/StatsEvent;->mAtomId:I
-Landroid/util/StatsEvent;->mBuffer:Landroid/util/StatsEvent$Buffer;
-Landroid/util/StatsEvent;->mNumBytes:I
-Landroid/util/StatsEvent;->mPayload:[B
 Landroid/util/StatsEvent;->newBuilder()Landroid/util/StatsEvent$Builder;,system-api,test-api
-Landroid/util/StatsEvent;->release()V
-Landroid/util/StatsEventParcel$1;-><init>()V
-Landroid/util/StatsEventParcel$1;->createFromParcel(Landroid/os/Parcel;)Landroid/util/StatsEventParcel;
 Landroid/util/StatsEventParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/util/StatsEventParcel$1;->newArray(I)[Landroid/util/StatsEventParcel;
 Landroid/util/StatsEventParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/util/StatsEventParcel;-><clinit>()V
-Landroid/util/StatsEventParcel;-><init>()V
-Landroid/util/StatsEventParcel;->CREATOR:Landroid/os/Parcelable$Creator;
-Landroid/util/StatsEventParcel;->buffer:[B
 Landroid/util/StatsEventParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/util/StatsEventParcel;->readFromParcel(Landroid/os/Parcel;)V
 Landroid/util/StatsEventParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/util/StatsLog;-><clinit>()V
-Landroid/util/StatsLog;-><init>()V
 Landroid/util/StatsLog;->ANNOTATION_ID_DEFAULT_STATE:B,system-api,test-api
 Landroid/util/StatsLog;->ANNOTATION_ID_EXCLUSIVE_STATE:B,system-api,test-api
 Landroid/util/StatsLog;->ANNOTATION_ID_IS_UID:B,system-api,test-api
@@ -537,132 +121,9 @@ Landroid/util/StatsLog;->ANNOTATION_ID_PRIMARY_FIELD_FIRST_UID:B,system-api,test
 Landroid/util/StatsLog;->ANNOTATION_ID_STATE_NESTED:B,system-api,test-api
 Landroid/util/StatsLog;->ANNOTATION_ID_TRIGGER_STATE_RESET:B,system-api,test-api
 Landroid/util/StatsLog;->ANNOTATION_ID_TRUNCATE_TIMESTAMP:B,system-api,test-api
-Landroid/util/StatsLog;->DEBUG:Z
-Landroid/util/StatsLog;->EXPERIMENT_IDS_FIELD_ID:I
-Landroid/util/StatsLog;->TAG:Ljava/lang/String;
 Landroid/util/StatsLog;->logBinaryPushStateChanged(Ljava/lang/String;JII[J)Z,public-api,system-api,test-api
 Landroid/util/StatsLog;->logEvent(I)Z,public-api,system-api,test-api
 Landroid/util/StatsLog;->logStart(I)Z,public-api,system-api,test-api
 Landroid/util/StatsLog;->logStop(I)Z,public-api,system-api,test-api
 Landroid/util/StatsLog;->write(Landroid/util/StatsEvent;)V,system-api,test-api
-Landroid/util/StatsLog;->writeImpl([BII)V
 Landroid/util/StatsLog;->writeRaw([BI)V,system-api,test-api
-Lcom/android/internal/statsd/StatsdStatsLog;-><clinit>()V
-Lcom/android/internal/statsd/StatsdStatsLog;-><init>()V
-Lcom/android/internal/statsd/StatsdStatsLog;->ANNOTATION_ID_EXCLUSIVE_STATE:B
-Lcom/android/internal/statsd/StatsdStatsLog;->ANNOTATION_ID_IS_UID:B
-Lcom/android/internal/statsd/StatsdStatsLog;->ANNOTATION_ID_PRIMARY_FIELD:B
-Lcom/android/internal/statsd/StatsdStatsLog;->ANNOTATION_ID_PRIMARY_FIELD_FIRST_UID:B
-Lcom/android/internal/statsd/StatsdStatsLog;->ANNOTATION_ID_STATE_NESTED:B
-Lcom/android/internal/statsd/StatsdStatsLog;->ANNOTATION_ID_TRIGGER_STATE_RESET:B
-Lcom/android/internal/statsd/StatsdStatsLog;->ANNOTATION_ID_TRUNCATE_TIMESTAMP:B
-Lcom/android/internal/statsd/StatsdStatsLog;->ANOMALY_DETECTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->APP_BREADCRUMB_REPORTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->APP_BREADCRUMB_REPORTED__STATE__START:I
-Lcom/android/internal/statsd/StatsdStatsLog;->APP_BREADCRUMB_REPORTED__STATE__STOP:I
-Lcom/android/internal/statsd/StatsdStatsLog;->APP_BREADCRUMB_REPORTED__STATE__UNKNOWN:I
-Lcom/android/internal/statsd/StatsdStatsLog;->APP_BREADCRUMB_REPORTED__STATE__UNSPECIFIED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__CHECKPOINT_NOT_SUPPORTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_BOOT_TRIGGERED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_BOOT_TRIGGERED_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_INITIATED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_INITIATED_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_STAGED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_STAGED_CANCEL_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_STAGED_CANCEL_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_STAGED_CANCEL_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_STAGED_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALLER_ROLLBACK_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_CANCELLED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_FAILURE_COMMIT:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_FAILURE_DOWNLOAD:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_FAILURE_STATE_MISMATCH:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_STAGED_CANCEL_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_STAGED_CANCEL_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_STAGED_CANCEL_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_STAGED_NOT_READY:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_STAGED_READY:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_STARTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__INSTALL_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__LSKF_PREPARATION_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__LSKF_PREPARATION_INITITATED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__LSKF_PREPARATION_RETRY:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__LSKF_PREPARATION_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__NOTIFICATION_RESTART_ELIGIBLE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__NO_REBOOT_PROMOTION_STRATEGY_ELIGIBLE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__PENDING_REBOOT_CANCELLED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__PENDING_REBOOT_MARKED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__REBOOT_NOT_REQUIRED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__REBOOT_TRIGGERED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__REBOOT_TRIGGER_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__SIGNAL_NOT_READY_TO_REBOOT_RECEIVED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__SIGNAL_READY_TO_REBOOT_RECEIVED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__SIM_PIN_PREPARATION_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__SIM_PIN_PREPARATION_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__SOFT_RESTART_ELIGIBLE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__UNATTENDED_REBOOT_ABORT:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__UNATTENDED_REBOOT_ELIGIBLE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__UNATTENDED_REBOOT_NOT_TRIGGERED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__UNKNOWN:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINARY_PUSH_STATE_CHANGED__STATE__UNTRACKED_TRAIN_CANCELLED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->BINDER_CALLS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->CPU_TIME_PER_UID_FREQ:I
-Lcom/android/internal/statsd/StatsdStatsLog;->DAVEY_OCCURRED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->ISOLATED_UID_CHANGED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->ISOLATED_UID_CHANGED__EVENT__CREATED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->ISOLATED_UID_CHANGED__EVENT__REMOVED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->LOOPER_STATS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_BOOT_TRIGGERED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_BOOT_TRIGGERED_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_INITIATED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_INITIATED_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_STAGED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_STAGED_CANCEL_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_STAGED_CANCEL_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_STAGED_CANCEL_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_STAGED_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALLER_ROLLBACK_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_CANCELLED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_FAILURE_COMMIT:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_FAILURE_DOWNLOAD:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_FAILURE_STATE_MISMATCH:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_STAGED_CANCEL_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_STAGED_CANCEL_REQUESTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_STAGED_CANCEL_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_STAGED_NOT_READY:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_STAGED_READY:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_STARTED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__INSTALL_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__REBOOT_TRIGGERED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->TRAIN_INFO__STATUS__UNKNOWN:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_CRASH:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_APP_NOT_RESPONDING:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_EXPLICIT_HEALTH_CHECK:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_NATIVE_CRASH_DURING_BOOT:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_REASON__REASON_UNKNOWN:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_BOOT_TRIGGERED:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS:I
-Lcom/android/internal/statsd/StatsdStatsLog;->WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__UNKNOWN:I
-Lcom/android/internal/statsd/StatsdStatsLog;->buildStatsEvent(IIIJ)Landroid/util/StatsEvent;
-Lcom/android/internal/statsd/StatsdStatsLog;->buildStatsEvent(IILjava/lang/String;Ljava/lang/String;JJJJJJJJJZI)Landroid/util/StatsEvent;
-Lcom/android/internal/statsd/StatsdStatsLog;->buildStatsEvent(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;JJJJJZJJJJJ)Landroid/util/StatsEvent;
-Lcom/android/internal/statsd/StatsdStatsLog;->buildStatsEvent(IJ[BLjava/lang/String;I)Landroid/util/StatsEvent;
-Lcom/android/internal/statsd/StatsdStatsLog;->write(IIII)V
-Lcom/android/internal/statsd/StatsdStatsLog;->write(IIJ)V
-Lcom/android/internal/statsd/StatsdStatsLog;->write(IIJJ)V
-Lcom/android/internal/statsd/StatsdStatsLog;->write(IILjava/lang/String;IILjava/lang/String;[B)V
-Lcom/android/internal/statsd/StatsdStatsLog;->write(ILjava/lang/String;JZZZI[BIIZ)V
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index b0017c8..f28a601 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -8,7 +8,8 @@ android/os/IStatsd
 android/os/StatsDimensionsValue
 android/os/StatsDimensionsValueParcel
 android/os/StatsFrameworkInitializer
+android/util/PropertyParcel
 android/util/StatsEvent
 android/util/StatsEventParcel
 android/util/StatsLog
-com/android/internal/statsd/StatsdStatsLog
+com/android/internal/statsd/**
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
new file mode 100644
index 0000000..5619cf2
--- /dev/null
+++ b/current/snapshot-creation-build-number.txt
@@ -0,0 +1 @@
+8598579
\ No newline at end of file
diff --git a/current/x86/lib/libstatssocket.so b/current/x86/lib/libstatssocket.so
index bba8c71..3922f38 100755
--- a/current/x86/lib/libstatssocket.so
+++ b/current/x86/lib/libstatssocket.so
diff --git a/current/x86_64/lib/libstatssocket.so b/current/x86_64/lib/libstatssocket.so
index 72c17c7..6fe4f6b 100755
--- a/current/x86_64/lib/libstatssocket.so
+++ b/current/x86_64/lib/libstatssocket.so