Merge "Merge "Replace libsuspend with android.system.suspend@1.0" am:... (49056604) · Commits · e / os / android_frameworks_base

services/core/jni/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,6 @@ cc_defaults {
		"libsensorservicehidl",
		"libgui",
		"libusbhost",
		"libsuspend",
		"libtinyalsa",
		"libEGL",
		"libGLESv2",
		@@ -130,6 +129,7 @@ cc_defaults {
		"android.hardware.vr@1.0",
		"android.frameworks.schedulerservice@1.0",
		"android.frameworks.sensorservice@1.0",
		"android.system.suspend@1.0",
		],

		static_libs: [

services/core/jni/com_android_server_am_BatteryStatsService.cpp

+21 −11

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@

		#include <android/hardware/power/1.0/IPower.h>
		#include <android/hardware/power/1.1/IPower.h>
		#include <android/system/suspend/1.0/ISystemSuspend.h>
		#include <android/system/suspend/1.0/ISystemSuspendCallback.h>
		#include <android_runtime/AndroidRuntime.h>
		#include <jni.h>

		@@ -39,7 +41,6 @@
		#include <log/log.h>
		#include <utils/misc.h>
		#include <utils/Log.h>
		#include <suspend/autosuspend.h>

		using android::hardware::Return;
		using android::hardware::Void;
		@@ -49,6 +50,8 @@ using android::hardware::power::V1_0::Status;
		using android::hardware::power::V1_1::PowerStateSubsystem;
		using android::hardware::power::V1_1::PowerStateSubsystemSleepState;
		using android::hardware::hidl_vec;
		using android::system::suspend::V1_0::ISystemSuspend;
		using android::system::suspend::V1_0::ISystemSuspendCallback;
		using IPowerV1_1 = android::hardware::power::V1_1::IPower;
		using IPowerV1_0 = android::hardware::power::V1_0::IPower;

		@@ -63,6 +66,7 @@ static sem_t wakeup_sem;
		extern sp<IPowerV1_0> getPowerHalV1_0();
		extern sp<IPowerV1_1> getPowerHalV1_1();
		extern bool processPowerHalReturn(const Return<void> &ret, const char* functionName);
		extern sp<ISystemSuspend> getSuspendHal();

		// Java methods used in getLowPowerStats
		static jmethodID jgetAndUpdatePlatformState = NULL;
		@@ -70,8 +74,9 @@ static jmethodID jgetSubsystem = NULL;
		static jmethodID jputVoter = NULL;
		static jmethodID jputState = NULL;

		static void wakeup_callback(bool success)
		{
		class WakeupCallback : public ISystemSuspendCallback {
		public:
		Return<void> notifyWakeup(bool success) override {
		ALOGV("In wakeup_callback: %s", success ? "resumed from suspend" : "suspend aborted");
		int ret = sem_post(&wakeup_sem);
		if (ret < 0) {
		@@ -79,7 +84,9 @@ static void wakeup_callback(bool success)
		strerror_r(errno, buf, sizeof(buf));
		ALOGE("Error posting wakeup sem: %s\n", buf);
		}
		return Void();
		}
		};

		static jint nativeWaitWakeup(JNIEnv *env, jobject clazz, jobject outBuf)
		{
		@@ -101,11 +108,14 @@ static jint nativeWaitWakeup(JNIEnv *env, jobject clazz, jobject outBuf)
		return -1;
		}
		ALOGV("Registering callback...");
		autosuspend_set_wakeup_callback(&wakeup_callback);
		sp<ISystemSuspend> suspendHal = getSuspendHal();
		suspendHal->registerCallback(new WakeupCallback());
		}

		// Wait for wakeup.
		ALOGV("Waiting for wakeup...");
		// TODO(b/116747600): device can suspend and wakeup after sem_wait() finishes and before wakeup
		// reason is recorded, i.e. BatteryStats might occasionally miss wakeup events.
		int ret = sem_wait(&wakeup_sem);
		if (ret < 0) {
		char buf[80];

services/core/jni/com_android_server_power_PowerManagerService.cpp

+47 −3

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		//#define LOG_NDEBUG 0

		#include <android/hardware/power/1.1/IPower.h>
		#include <android/system/suspend/1.0/ISystemSuspend.h>
		#include <nativehelper/JNIHelp.h>
		#include "jni.h"

		@@ -35,7 +36,7 @@
		#include <utils/Log.h>
		#include <hardware/power.h>
		#include <hardware_legacy/power.h>
		#include <suspend/autosuspend.h>
		#include <hidl/ServiceManagement.h>

		#include "com_android_server_power_PowerManagerService.h"

		@@ -44,6 +45,9 @@ using android::hardware::Void;
		using android::hardware::power::V1_0::PowerHint;
		using android::hardware::power::V1_0::Feature;
		using android::String8;
		using android::system::suspend::V1_0::ISystemSuspend;
		using android::system::suspend::V1_0::IWakeLock;
		using android::system::suspend::V1_0::WakeLockType;
		using IPowerV1_1 = android::hardware::power::V1_1::IPower;
		using IPowerV1_0 = android::hardware::power::V1_0::IPower;

		@@ -171,6 +175,46 @@ void android_server_PowerManagerService_userActivity(nsecs_t eventTime, int32_t
		}
		}

		static sp<ISystemSuspend> gSuspendHal = nullptr;
		static sp<IWakeLock> gSuspendBlocker = nullptr;
		static std::mutex gSuspendMutex;

		// Assume SystemSuspend HAL is always alive.
		// TODO: Force device to restart if SystemSuspend HAL dies.
		sp<ISystemSuspend> getSuspendHal() {
		static std::once_flag suspendHalFlag;
		std::call_once(suspendHalFlag, [](){
		::android::hardware::details::waitForHwService(ISystemSuspend::descriptor, "default");
		gSuspendHal = ISystemSuspend::getService();
		assert(gSuspendHal != nullptr);
		});
		return gSuspendHal;
		}

		void enableAutoSuspend() {
		static bool enabled = false;

		std::lock_guard<std::mutex> lock(gSuspendMutex);
		if (!enabled) {
		sp<ISystemSuspend> suspendHal = getSuspendHal();
		suspendHal->enableAutosuspend();
		enabled = true;
		}
		if (gSuspendBlocker) {
		gSuspendBlocker->release();
		gSuspendBlocker.clear();
		}
		}

		void disableAutoSuspend() {
		std::lock_guard<std::mutex> lock(gSuspendMutex);
		if (!gSuspendBlocker) {
		sp<ISystemSuspend> suspendHal = getSuspendHal();
		gSuspendBlocker = suspendHal->acquireWakeLock(WakeLockType::PARTIAL,
		"PowerManager.SuspendLockout");
		}
		}

		// ----------------------------------------------------------------------------

		static void nativeInit(JNIEnv* env, jobject obj) {
		@@ -207,13 +251,13 @@ static void nativeSetInteractive(JNIEnv* /* env /, jclass / clazz */, jboolean
		static void nativeSetAutoSuspend(JNIEnv* /* env /, jclass / clazz */, jboolean enable) {
		if (enable) {
		android::base::Timer t;
		autosuspend_enable();
		enableAutoSuspend();
		if (t.duration() > 100ms) {
		ALOGD("Excessive delay in autosuspend_enable() while turning screen off");
		}
		} else {
		android::base::Timer t;
		autosuspend_disable();
		disableAutoSuspend();
		if (t.duration() > 100ms) {
		ALOGD("Excessive delay in autosuspend_disable() while turning screen on");
		}