Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad52d7f2 authored Apr 01, 2021 by Steven Moreland Committed by Automerger Merge Worker Apr 01, 2021

Merge "Refactor for moved batterystats AIDL." am: ed53c412 am: 60d845e9 am: 117a03a4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1660623

Change-Id: I2cf32b72fe3009fe781a54241fd3623225949ac2

parents ebc0b269 117a03a4

media/utils/Android.bp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ cc_library {
	],		],
	static_libs: [		static_libs: [
	"libc_malloc_debug_backtrace",		"libc_malloc_debug_backtrace",
			"libbatterystats_aidl",
	],		],
	shared_libs: [		shared_libs: [
	"libaudioclient_aidl_conversion",		"libaudioclient_aidl_conversion",
	@@ -50,6 +51,9 @@ cc_library {
	"android.hidl.token@1.0-utils",		"android.hidl.token@1.0-utils",
	"media_permission-aidl-cpp",		"media_permission-aidl-cpp",
	],		],
			export_static_lib_headers: [
			"libbatterystats_aidl",
			],

	logtags: ["EventLogTags.logtags"],		logtags: ["EventLogTags.logtags"],

media/utils/fuzzers/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -10,6 +10,7 @@ package {
	cc_defaults {		cc_defaults {
	name: "libmediautils_fuzzer_defaults",		name: "libmediautils_fuzzer_defaults",
	shared_libs: [		shared_libs: [
			"libbatterystats_aidl",
	"libbinder",		"libbinder",
	"libcutils",		"libcutils",
	"liblog",		"liblog",

media/utils/fuzzers/SchedulingPolicyServiceFuzz.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License.		* limitations under the License.
	*/		*/
	#define LOG_TAG "BatteryNotifierFuzzer"		#define LOG_TAG "BatteryNotifierFuzzer"
	#include <binder/IBatteryStats.h>		#include <batterystats/IBatteryStats.h>
	#include <binder/IServiceManager.h>		#include <binder/IServiceManager.h>
	#include <utils/String16.h>		#include <utils/String16.h>
	#include <android/log.h>		#include <android/log.h>

media/utils/include/mediautils/BatteryNotifier.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@
	#ifndef MEDIA_BATTERY_NOTIFIER_H		#ifndef MEDIA_BATTERY_NOTIFIER_H
	#define MEDIA_BATTERY_NOTIFIER_H		#define MEDIA_BATTERY_NOTIFIER_H

	#include <binder/IBatteryStats.h>		#include <batterystats/IBatteryStats.h>
	#include <utils/Singleton.h>		#include <utils/Singleton.h>
	#include <utils/String8.h>		#include <utils/String8.h>