Snap for 6544675 from 289a482fea6a4c0772db4b45529798be33b96980 to rvc-release (f049cfde) · Commits · e / os / android_frameworks_base

apex/media/framework/Android.bp

+15 −82

Original line number	Diff line number	Diff line
		@@ -85,96 +85,29 @@ filegroup {
		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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+20 −10

Original line number	Diff line number	Diff line
		@@ -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,8 +54,23 @@ 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

		/*
		@@ -63,7 +78,6 @@ int register_android_util_StatsLog(JNIEnv* env)
		*/
		jint JNI_OnLoad(JavaVM* jvm, void* reserved) {
		JNIEnv* e;
		int status;

		ALOGV("statsd : loading JNI\n");
		// Check JNI version
		@@ -71,10 +85,6 @@ jint JNI_OnLoad(JavaVM* jvm, void* reserved) {
		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

+5 −8

Original line number	Diff line number	Diff line
		@@ -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