Revert "support work chain in pulled atoms"

This reverts commit ce8e4dce609541f90c444f27250a6a341b3f1d23.

Reason for revert: breaking multiple targets in master

Change-Id: I3ee74b314e06cb2c4d3d6da82ca116a91aad67d4

2 files changed, 1 insertions, 35 deletions

diff --git a/libs/services/include/android/os/StatsLogEventWrapper.h b/libs/services/include/android/os/StatsLogEventWrapper.h
index 8de2ab49f42b..f60c338bf9c4 100644
--- a/libs/services/include/android/os/StatsLogEventWrapper.h
+++ b/libs/services/include/android/os/StatsLogEventWrapper.h
@@ -82,11 +82,6 @@ struct StatsLogValue {
   STATS_LOG_VALUE_TYPE type;
 };
 
-struct WorkChain {
-  std::vector<int32_t> uids;
-  std::vector<std::string> tags;
-};
-
 // Represents a parcelable object. Only used to send data from Android OS to statsd.
 class StatsLogEventWrapper : public android::Parcelable {
  public:
@@ -104,9 +99,7 @@ class StatsLogEventWrapper : public android::Parcelable {
 
   int64_t getWallClockTimeNs() const { return mWallClockTimeNs; }
 
-  const std::vector<StatsLogValue>& getElements() const { return mElements; }
-
-  const std::vector<WorkChain>& getWorkChains() const { return mWorkChains; }
+  std::vector<StatsLogValue> getElements() const { return mElements; }
 
  private:
   int mTagId;
@@ -116,8 +109,6 @@ class StatsLogEventWrapper : public android::Parcelable {
   int64_t mWallClockTimeNs;
 
   std::vector<StatsLogValue> mElements;
-
-  std::vector<WorkChain> mWorkChains;
 };
 } // Namespace os
 } // Namespace android
diff --git a/libs/services/src/os/StatsLogEventWrapper.cpp b/libs/services/src/os/StatsLogEventWrapper.cpp
index f6dfdef16e19..04c4629b5432 100644
--- a/libs/services/src/os/StatsLogEventWrapper.cpp
+++ b/libs/services/src/os/StatsLogEventWrapper.cpp
@@ -58,31 +58,6 @@ status_t StatsLogEventWrapper::readFromParcel(const Parcel* in) {
     ALOGE("statsd could not read wall clock time from parcel");
     return res;
   }
-  int numWorkChain = 0;
-  if ((res = in->readInt32(&numWorkChain)) != OK) {
-    ALOGE("statsd could not read number of work chains from parcel");
-    return res;
-  }
-  if (numWorkChain > 0) {
-    for (int i = 0; i < numWorkChain; i++) {
-      int numNodes = 0;
-      if ((res = in->readInt32(&numNodes)) != OK) {
-        ALOGE(
-            "statsd could not read number of nodes in work chain from parcel");
-        return res;
-      }
-      if (numNodes == 0) {
-        ALOGE("empty work chain");
-        return BAD_VALUE;
-      }
-      WorkChain wc;
-      for (int j = 0; j < numNodes; j++) {
-        wc.uids.push_back(in->readInt32());
-        wc.tags.push_back(std::string(String8(in->readString16()).string()));
-      }
-      mWorkChains.push_back(wc);
-    }
-  }
   int dataSize = 0;
   if ((res = in->readInt32(&dataSize)) != OK) {
     ALOGE("statsd could not read data size from parcel");