Snap for 6544675 from 289a482 to rvc-release

Change-Id: Ibe75e02be15cf79d694b4db44db2d750323082c2

Author: android-build-team Robot

apex/media/framework/Android.bp

@@ -83,98 +83,31 @@ filegroup {
         "java/android/media/MediaParser.java"
     ],
     path: "java",
-}
+}	
 
-stubs_defaults {
-    name: "framework-media-stubs-srcs-defaults",
-    srcs: [ ":updatable-media-srcs" ],
-    libs: [ "framework_media_annotation" ],
-    aidl: {
-        // TODO(b/135922046) remove this
-        include_dirs: ["frameworks/base/core/java"],
-    },
-    dist: { dest: "framework-media.txt" },
-}
+java_sdk_library {
+    name: "framework-media",
+    defaults: ["framework-module-defaults"],
 
-droidstubs {
-    name: "framework-media-stubs-srcs-publicapi",
-    defaults: [
-        "framework-media-stubs-srcs-defaults",
-        "framework-module-stubs-defaults-publicapi",
-    ],
-    check_api: {
-        last_released: {
-            api_file: ":framework-media.api.public.latest",
-            removed_api_file: ":framework-media-removed.api.public.latest",
-        },
-        api_lint: {
-            new_since: ":framework-media.api.public.latest",
-        },
-    },
-}
+    // This is only used to define the APIs for updatable-media.
+    api_only: true,
 
-droidstubs {
-    name: "framework-media-stubs-srcs-systemapi",
-    defaults: [
-        "framework-media-stubs-srcs-defaults",
-        "framework-module-stubs-defaults-systemapi",
+    srcs: [
+        ":updatable-media-srcs",
     ],
-    check_api: {
-        last_released: {
-            api_file: ":framework-media.api.system.latest",
-            removed_api_file: ":framework-media-removed.api.system.latest",
-        },
-        api_lint: {
-            new_since: ":framework-media.api.system.latest",
-        },
-    },
-}
 
-droidstubs {
-    name: "framework-media-api-module_libs_api",
-    defaults: [
-        "framework-media-stubs-srcs-defaults",
-        "framework-module-api-defaults-module_libs_api",
-    ],
-    check_api: {
-        last_released: {
-            api_file: ":framework-media.api.module-lib.latest",
-            removed_api_file: ":framework-media-removed.api.module-lib.latest",
-        },
-        api_lint: {
-            new_since: ":framework-media.api.module-lib.latest",
-        },
-    },
-}
+    // TODO(b/155480189) - Remove naming_scheme once references have been resolved.
+    // Temporary java_sdk_library component naming scheme to use to ease the transition from separate
+    // modules to java_sdk_library.
+    naming_scheme: "framework-modules",
 
-droidstubs {
-    name: "framework-media-stubs-srcs-module_libs_api",
-    defaults: [
-        "framework-media-stubs-srcs-defaults",
-        "framework-module-stubs-defaults-module_libs_api",
+    libs: [
+        "framework_media_annotation",
     ],
-}
 
-java_library {
-    name: "framework-media-stubs-publicapi",
-    srcs: [":framework-media-stubs-srcs-publicapi"],
-    defaults: ["framework-module-stubs-lib-defaults-publicapi"],
-    dist: { dest: "framework-media.jar" },
-}
-
-java_library {
-    name: "framework-media-stubs-systemapi",
-    srcs: [":framework-media-stubs-srcs-systemapi"],
-    defaults: ["framework-module-stubs-lib-defaults-systemapi"],
-    dist: { dest: "framework-media.jar" },
+    visibility: ["//frameworks/av/apex:__subpackages__"],
 }
 
-java_library {
-    name: "framework-media-stubs-module_libs_api",
-    srcs: [":framework-media-stubs-srcs-module_libs_api"],
-    defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
-    dist: { dest: "framework-media.jar" },
-}
 
 java_library {
     name: "framework_media_annotation",

apex/statsd/Android.bp

@@ -62,8 +62,8 @@ prebuilt_etc {
 cc_library_shared {
     name: "libstats_jni",
     srcs: ["jni/**/*.cpp"],
+    header_libs: ["libnativehelper_header_only"],
     shared_libs: [
-        "libnativehelper", // Has stable abi - should not be copied into apex.
         "liblog",  // Has a stable abi - should not be copied into apex.
         "libstatssocket",
     ],

apex/statsd/framework/java/android/app/StatsManager.java

@@ -120,7 +120,7 @@ public final class StatsManager {
     /**
      * @hide
      **/
-    @VisibleForTesting public static final long DEFAULT_TIMEOUT_MILLIS = 10_000L; // 10 seconds.
+    @VisibleForTesting public static final long DEFAULT_TIMEOUT_MILLIS = 2_000L; // 2 seconds.
 
     /**
      * Constructor for StatsManagerClient.

apex/statsd/jni/android_util_StatsLog.cpp

@@ -17,9 +17,9 @@
 #define LOG_NAMESPACE "StatsLog.tag."
 #define LOG_TAG "StatsLog_println"
 
-#include "jni.h"
+#include <jni.h>
 #include <log/log.h>
-#include <nativehelper/JNIHelp.h>
+#include <nativehelper/scoped_local_ref.h>
 #include "stats_buffer_writer.h"
 
 namespace android {
@@ -54,27 +54,37 @@ static const JNINativeMethod gMethods[] = {
 
 int register_android_util_StatsLog(JNIEnv* env)
 {
-    return jniRegisterNativeMethods(env, "android/util/StatsLog", gMethods, NELEM(gMethods));
+    static const char* kStatsLogClass = "android/util/StatsLog";
+
+    ScopedLocalRef<jclass> cls(env, env->FindClass(kStatsLogClass));
+    if (cls.get() == nullptr) {
+        ALOGE("jni statsd registration failure, class not found '%s'", kStatsLogClass);
+        return JNI_ERR;
+    }
+
+    const jint count = sizeof(gMethods) / sizeof(gMethods[0]);
+    int status = env->RegisterNatives(cls.get(), gMethods, count);
+    if (status < 0) {
+        ALOGE("jni statsd registration failure, status: %d", status);
+        return JNI_ERR;
+    }
+    return JNI_VERSION_1_4;
 }
+
 }; // namespace android
 
 /*
  * JNI Initialization
  */
 jint JNI_OnLoad(JavaVM* jvm, void* reserved) {
     JNIEnv* e;
-    int status;
 
     ALOGV("statsd : loading JNI\n");
     // Check JNI version
     if (jvm->GetEnv((void**)&e, JNI_VERSION_1_4)) {
         ALOGE("JNI version mismatch error");
         return JNI_ERR;
     }
-    status = android::register_android_util_StatsLog(e);
-    if (status < 0) {
-        ALOGE("jni statsd registration failure, status: %d", status);
-        return JNI_ERR;
-    }
-    return JNI_VERSION_1_4;
+
+    return android::register_android_util_StatsLog(e);
 }

cmds/statsd/src/condition/CombinationConditionTracker.cpp

@@ -141,17 +141,14 @@ void CombinationConditionTracker::evaluateCondition(
     ConditionState newCondition =
             evaluateCombinationCondition(mChildren, mLogicalOperation, nonSlicedConditionCache);
     if (!mSliced) {
+        bool nonSlicedChanged = (mUnSlicedPartCondition != newCondition);
+        mUnSlicedPartCondition = newCondition;
 
-        bool nonSlicedChanged = (mNonSlicedConditionState != newCondition);
-        mNonSlicedConditionState = newCondition;
-
-        nonSlicedConditionCache[mIndex] = mNonSlicedConditionState;
-
+        nonSlicedConditionCache[mIndex] = mUnSlicedPartCondition;
         conditionChangedCache[mIndex] = nonSlicedChanged;
-        mUnSlicedPart = newCondition;
     } else {
-        mUnSlicedPart = evaluateCombinationCondition(
-            mUnSlicedChildren, mLogicalOperation, nonSlicedConditionCache);
+        mUnSlicedPartCondition = evaluateCombinationCondition(mUnSlicedChildren, mLogicalOperation,
+                                                              nonSlicedConditionCache);
 
         for (const int childIndex : mChildren) {
             // If any of the sliced condition in children condition changes, the combination

cmds/statsd/src/condition/ConditionTracker.h

@@ -36,7 +36,7 @@ class ConditionTracker : public virtual RefBase {
           mIndex(index),
           mInitialized(false),
           mTrackerIndex(),
-          mNonSlicedConditionState(ConditionState::kUnknown),
+          mUnSlicedPartCondition(ConditionState::kUnknown),
           mSliced(false){};
 
     virtual ~ConditionTracker(){};
@@ -72,11 +72,6 @@ class ConditionTracker : public virtual RefBase {
                                    std::vector<ConditionState>& conditionCache,
                                    std::vector<bool>& conditionChanged) = 0;
 
-    // Return the current condition state.
-    virtual ConditionState isConditionMet() const {
-        return mNonSlicedConditionState;
-    };
-
     // Query the condition with parameters.
     // [conditionParameters]: a map from condition name to the HashableDimensionKey to query the
     //                       condition.
@@ -125,8 +120,9 @@ class ConditionTracker : public virtual RefBase {
         const std::vector<sp<ConditionTracker>>& allConditions,
         const vector<Matcher>& dimensions) const = 0;
 
+    // Return the current condition state of the unsliced part of the condition.
     inline ConditionState getUnSlicedPartConditionState() const  {
-        return mUnSlicedPart;
+        return mUnSlicedPartCondition;
     }
 
 protected:
@@ -141,10 +137,16 @@ class ConditionTracker : public virtual RefBase {
     // the list of LogMatchingTracker index that this ConditionTracker uses.
     std::set<int> mTrackerIndex;
 
-    ConditionState mNonSlicedConditionState;
+    // This variable is only used for CombinationConditionTrackers.
+    // SimpleConditionTrackers technically don't have an unsliced part because
+    // they are either sliced or unsliced.
+    //
+    // CombinationConditionTrackers have multiple children ConditionTrackers
+    // that can be a mixture of sliced or unsliced. This tracks the
+    // condition of the unsliced part of the combination condition.
+    ConditionState mUnSlicedPartCondition;
 
     bool mSliced;
-    ConditionState mUnSlicedPart;
 };
 
 }  // namespace statsd

cmds/statsd/src/condition/SimpleConditionTracker.cpp

@@ -85,12 +85,6 @@ SimpleConditionTracker::SimpleConditionTracker(
         mInitialValue = ConditionState::kUnknown;
     }
 
-    mNonSlicedConditionState = mInitialValue;
-
-    if (!mSliced) {
-        mUnSlicedPart = mInitialValue;
-    }
-
     mInitialized = true;
 }
 
@@ -141,9 +135,6 @@ void SimpleConditionTracker::handleStopAll(std::vector<ConditionState>& conditio
     mInitialValue = ConditionState::kFalse;
     mSlicedConditionState.clear();
     conditionCache[mIndex] = ConditionState::kFalse;
-    if (!mSliced) {
-        mUnSlicedPart = ConditionState::kFalse;
-    }
 }
 
 bool SimpleConditionTracker::hitGuardRail(const HashableDimensionKey& newKey) {
@@ -305,9 +296,7 @@ void SimpleConditionTracker::evaluateCondition(
                 conditionCache[mIndex] =
                         itr->second > 0 ? ConditionState::kTrue : ConditionState::kFalse;
             }
-            mUnSlicedPart = conditionCache[mIndex];
         }
-
         return;
     }
 
@@ -333,9 +322,6 @@ void SimpleConditionTracker::evaluateCondition(
     }
     conditionCache[mIndex] = overallState;
     conditionChangedCache[mIndex] = overallChanged;
-    if (!mSliced) {
-        mUnSlicedPart = overallState;
-    }
 }
 
 void SimpleConditionTracker::isConditionMet(

cmds/statsd/src/metrics/MetricProducer.cpp

@@ -293,6 +293,17 @@ void MetricProducer::mapStateValue(const int32_t atomId, FieldValue* value) {
     }
 }
 
+HashableDimensionKey MetricProducer::getUnknownStateKey() {
+    HashableDimensionKey stateKey;
+    for (auto atom : mSlicedStateAtoms) {
+        FieldValue fieldValue;
+        fieldValue.mField.setTag(atom);
+        fieldValue.mValue.setInt(StateTracker::kStateUnknown);
+        stateKey.addValue(fieldValue);
+    }
+    return stateKey;
+}
+
 DropEvent MetricProducer::buildDropEvent(const int64_t dropTimeNs, const BucketDropReason reason) {
     DropEvent event;
     event.reason = reason;

cmds/statsd/src/metrics/MetricProducer.h

@@ -386,6 +386,10 @@ class MetricProducer : public virtual android::RefBase, public virtual StateList
     // If no state map exists, keep the original state value.
     void mapStateValue(const int32_t atomId, FieldValue* value);
 
+    // Returns a HashableDimensionKey with unknown state value for each state
+    // atom.
+    HashableDimensionKey getUnknownStateKey();
+
     DropEvent buildDropEvent(const int64_t dropTimeNs, const BucketDropReason reason);
 
     // Returns true if the number of drop events in the current bucket has