Snap for 5472349 from c4f335d6f4b00bac3fde8c439bcc363dff0a77ac to qt-release (a75f6c51) · Commits · e / os / android_frameworks_native

services/sensorservice/SensorService.cpp

+67 −20

Original line number	Diff line number	Diff line
		@@ -565,11 +565,11 @@ status_t SensorService::shellCommand(int in, int out, int err, Vector<String16>&
		if (in == BAD_TYPE \|\| out == BAD_TYPE \|\| err == BAD_TYPE) {
		return BAD_VALUE;
		}
		if (args.size() == 3 && args[0] == String16("set-uid-state")) {
		if (args[0] == String16("set-uid-state")) {
		return handleSetUidState(args, err);
		} else if (args.size() == 2 && args[0] == String16("reset-uid-state")) {
		} else if (args[0] == String16("reset-uid-state")) {
		return handleResetUidState(args, err);
		} else if (args.size() == 2 && args[0] == String16("get-uid-state")) {
		} else if (args[0] == String16("get-uid-state")) {
		return handleGetUidState(args, out, err);
		} else if (args.size() == 1 && args[0] == String16("help")) {
		printHelp(out);
		@@ -579,14 +579,32 @@ status_t SensorService::shellCommand(int in, int out, int err, Vector<String16>&
		return BAD_VALUE;
		}

		status_t SensorService::handleSetUidState(Vector<String16>& args, int err) {
		static status_t getUidForPackage(String16 packageName, int userId, /inout/uid_t& uid, int err) {
		PermissionController pc;
		int uid = pc.getPackageUid(args[1], 0);
		uid = pc.getPackageUid(packageName, 0);
		if (uid <= 0) {
		ALOGE("Unknown package: '%s'", String8(args[1]).string());
		dprintf(err, "Unknown package: '%s'\n", String8(args[1]).string());
		ALOGE("Unknown package: '%s'", String8(packageName).string());
		dprintf(err, "Unknown package: '%s'\n", String8(packageName).string());
		return BAD_VALUE;
		}

		if (userId < 0) {
		ALOGE("Invalid user: %d", userId);
		dprintf(err, "Invalid user: %d\n", userId);
		return BAD_VALUE;
		}

		uid = multiuser_get_uid(userId, uid);
		return NO_ERROR;
		}

		status_t SensorService::handleSetUidState(Vector<String16>& args, int err) {
		// Valid arg.size() is 3 or 5, args.size() is 5 with --user option.
		if (!(args.size() == 3 \|\| args.size() == 5)) {
		printHelp(err);
		return BAD_VALUE;
		}

		bool active = false;
		if (args[2] == String16("active")) {
		active = true;
		@@ -594,30 +612,59 @@ status_t SensorService::handleSetUidState(Vector<String16>& args, int err) {
		ALOGE("Expected active or idle but got: '%s'", String8(args[2]).string());
		return BAD_VALUE;
		}

		int userId = 0;
		if (args.size() == 5 && args[3] == String16("--user")) {
		userId = atoi(String8(args[4]));
		}

		uid_t uid;
		if (getUidForPackage(args[1], userId, uid, err) != NO_ERROR) {
		return BAD_VALUE;
		}

		mUidPolicy->addOverrideUid(uid, active);
		return NO_ERROR;
		}

		status_t SensorService::handleResetUidState(Vector<String16>& args, int err) {
		PermissionController pc;
		int uid = pc.getPackageUid(args[1], 0);
		if (uid < 0) {
		ALOGE("Unknown package: '%s'", String8(args[1]).string());
		dprintf(err, "Unknown package: '%s'\n", String8(args[1]).string());
		// Valid arg.size() is 2 or 4, args.size() is 4 with --user option.
		if (!(args.size() == 2 \|\| args.size() == 4)) {
		printHelp(err);
		return BAD_VALUE;
		}

		int userId = 0;
		if (args.size() == 4 && args[2] == String16("--user")) {
		userId = atoi(String8(args[3]));
		}

		uid_t uid;
		if (getUidForPackage(args[1], userId, uid, err) == BAD_VALUE) {
		return BAD_VALUE;
		}

		mUidPolicy->removeOverrideUid(uid);
		return NO_ERROR;
		}

		status_t SensorService::handleGetUidState(Vector<String16>& args, int out, int err) {
		PermissionController pc;
		int uid = pc.getPackageUid(args[1], 0);
		if (uid < 0) {
		ALOGE("Unknown package: '%s'", String8(args[1]).string());
		dprintf(err, "Unknown package: '%s'\n", String8(args[1]).string());
		// Valid arg.size() is 2 or 4, args.size() is 4 with --user option.
		if (!(args.size() == 2 \|\| args.size() == 4)) {
		printHelp(err);
		return BAD_VALUE;
		}

		int userId = 0;
		if (args.size() == 4 && args[2] == String16("--user")) {
		userId = atoi(String8(args[3]));
		}

		uid_t uid;
		if (getUidForPackage(args[1], userId, uid, err) == BAD_VALUE) {
		return BAD_VALUE;
		}

		if (mUidPolicy->isUidActive(uid)) {
		return dprintf(out, "active\n");
		} else {
		@@ -627,9 +674,9 @@ status_t SensorService::handleGetUidState(Vector<String16>& args, int out, int e

		status_t SensorService::printHelp(int out) {
		return dprintf(out, "Sensor service commands:\n"
		" get-uid-state <PACKAGE> gets the uid state\n"
		" set-uid-state <PACKAGE> <active\|idle> overrides the uid state\n"
		" reset-uid-state <PACKAGE> clears the uid state override\n"
		" get-uid-state <PACKAGE> [--user USER_ID] gets the uid state\n"
		" set-uid-state <PACKAGE> <active\|idle> [--user USER_ID] overrides the uid state\n"
		" reset-uid-state <PACKAGE> [--user USER_ID] clears the uid state override\n"
		" help print this message\n");
		}

services/sensorservice/SensorService.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <binder/BinderService.h>
		#include <binder/IUidObserver.h>
		#include <cutils/compiler.h>
		#include <cutils/multiuser.h>
		#include <sensor/ISensorServer.h>
		#include <sensor/ISensorEventConnection.h>
		#include <sensor/Sensor.h>

services/surfaceflinger/CompositionEngine/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ cc_library {
		"mock/DisplaySurface.cpp",
		"mock/Layer.cpp",
		"mock/LayerFE.cpp",
		"mock/NativeWindow.cpp",
		"mock/Output.cpp",
		"mock/OutputLayer.cpp",
		"mock/RenderSurface.cpp",

services/surfaceflinger/CompositionEngine/include/compositionengine/mock/NativeWindow.h

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#pragma once

		#include <gmock/gmock.h>
		#include <system/window.h>
		#include <ui/ANativeObjectBase.h>
		#include <ui/GraphicTypes.h>
		#include <ui/PixelFormat.h>

		namespace android::compositionengine::mock {

		/* ------------------------------------------------------------------------
		* Mock NativeWindow
		*
		* An intentionally simplified Mock which implements a minimal subset of the full
		* ANativeWindow interface.
		*/
		class NativeWindow : public ANativeObjectBase<ANativeWindow, NativeWindow, RefBase> {
		public:
		NativeWindow();
		~NativeWindow();

		MOCK_METHOD1(setSwapInterval, int(int));
		MOCK_METHOD2(dequeueBuffer, int(struct ANativeWindowBuffer*, int));
		MOCK_METHOD2(cancelBuffer, int(struct ANativeWindowBuffer*, int));
		MOCK_METHOD2(queueBuffer, int(struct ANativeWindowBuffer*, int));
		MOCK_CONST_METHOD2(query, int(int, int*));
		MOCK_METHOD1(connect, int(int));
		MOCK_METHOD1(disconnect, int(int));
		MOCK_METHOD1(lockBuffer_DEPRECATED, int(struct ANativeWindowBuffer*));
		MOCK_METHOD1(setBuffersFormat, int(PixelFormat));
		MOCK_METHOD1(setBuffersDataSpace, int(ui::Dataspace));
		MOCK_METHOD1(setUsage, int(uint64_t));
		};

		} // namespace android::compositionengine::mock

services/surfaceflinger/CompositionEngine/mock/NativeWindow.cpp

0 → 100644

+121 −0

Original line number	Diff line number	Diff line

		/*
		* Copyright 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include "compositionengine/mock/NativeWindow.h"
		#include <log/log.h>

		namespace android::compositionengine::mock {

		static int forwardSetSwapInterval(ANativeWindow* window, int interval) {
		return static_cast<NativeWindow*>(window)->setSwapInterval(interval);
		}

		static int forwardDequeueBuffer(ANativeWindow* window, ANativeWindowBuffer** buffer, int* fenceFd) {
		return static_cast<NativeWindow*>(window)->dequeueBuffer(buffer, fenceFd);
		}

		static int forwardCancelBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer, int fenceFd) {
		return static_cast<NativeWindow*>(window)->cancelBuffer(buffer, fenceFd);
		}

		static int forwardQueueBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer, int fenceFd) {
		return static_cast<NativeWindow*>(window)->queueBuffer(buffer, fenceFd);
		}

		static int forwardQuery(const ANativeWindow* window, int what, int* value) {
		return static_cast<const NativeWindow*>(window)->query(what, value);
		}

		static int forwardPerform(ANativeWindow* window, int operation, ...) {
		va_list args;
		va_start(args, operation);
		int result = NO_ERROR;
		switch (operation) {
		case NATIVE_WINDOW_API_CONNECT: {
		int api = va_arg(args, int);
		result = static_cast<NativeWindow*>(window)->connect(api);
		break;
		}
		case NATIVE_WINDOW_SET_BUFFERS_FORMAT: {
		PixelFormat format = va_arg(args, PixelFormat);
		result = static_cast<NativeWindow*>(window)->setBuffersFormat(format);
		break;
		}
		case NATIVE_WINDOW_SET_BUFFERS_DATASPACE: {
		ui::Dataspace dataspace = static_cast<ui::Dataspace>(va_arg(args, int));
		result = static_cast<NativeWindow*>(window)->setBuffersDataSpace(dataspace);
		break;
		}
		case NATIVE_WINDOW_SET_USAGE: {
		// Note: Intentionally widens usage from 32 to 64 bits so we
		// just have one implementation.
		uint64_t usage = va_arg(args, uint32_t);
		result = static_cast<NativeWindow*>(window)->setUsage(usage);
		break;
		}
		case NATIVE_WINDOW_SET_USAGE64: {
		uint64_t usage = va_arg(args, uint64_t);
		result = static_cast<NativeWindow*>(window)->setUsage(usage);
		break;
		}
		case NATIVE_WINDOW_API_DISCONNECT: {
		int api = va_arg(args, int);
		result = static_cast<NativeWindow*>(window)->disconnect(api);
		break;
		}
		default:
		LOG_ALWAYS_FATAL("Unexpected operation %d", operation);
		break;
		}

		va_end(args);
		return result;
		}

		static int forwardDequeueBufferDeprecated(ANativeWindow* window, ANativeWindowBuffer** buffer) {
		int ignoredFenceFd = -1;
		return static_cast<NativeWindow*>(window)->dequeueBuffer(buffer, &ignoredFenceFd);
		}

		static int forwardCancelBufferDeprecated(ANativeWindow* window, ANativeWindowBuffer* buffer) {
		return static_cast<NativeWindow*>(window)->cancelBuffer(buffer, -1);
		}

		static int forwardLockBufferDeprecated(ANativeWindow* window, ANativeWindowBuffer* buffer) {
		return static_cast<NativeWindow*>(window)->lockBuffer_DEPRECATED(buffer);
		}

		static int forwardQueueBufferDeprecated(ANativeWindow* window, ANativeWindowBuffer* buffer) {
		return static_cast<NativeWindow*>(window)->queueBuffer(buffer, -1);
		}

		NativeWindow::NativeWindow() {
		ANativeWindow::setSwapInterval = &forwardSetSwapInterval;
		ANativeWindow::dequeueBuffer = &forwardDequeueBuffer;
		ANativeWindow::cancelBuffer = &forwardCancelBuffer;
		ANativeWindow::queueBuffer = &forwardQueueBuffer;
		ANativeWindow::query = &forwardQuery;
		ANativeWindow::perform = &forwardPerform;

		ANativeWindow::dequeueBuffer_DEPRECATED = &forwardDequeueBufferDeprecated;
		ANativeWindow::cancelBuffer_DEPRECATED = &forwardCancelBufferDeprecated;
		ANativeWindow::lockBuffer_DEPRECATED = &forwardLockBufferDeprecated;
		ANativeWindow::queueBuffer_DEPRECATED = &forwardQueueBufferDeprecated;
		}
		NativeWindow::~NativeWindow() = default;

		} // namespace android::compositionengine::mock