Merge changes I140d291e,Id443ec5c (f3c2e3bd) · Commits · e / os / android_frameworks_av

include/private/binder/Static.h

deleted100644 → 0

+0 −39

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 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.
		*/

		// All static variables go here, to control initialization and
		// destruction order in the library.

		#include <utils/threads.h>

		#include <binder/IBinder.h>
		#include <binder/IMemory.h>
		#include <binder/ProcessState.h>
		#include <binder/IPermissionController.h>
		#include <binder/IServiceManager.h>

		namespace android {

		// For ProcessState.cpp
		extern Mutex gProcessMutex;
		extern sp<ProcessState> gProcess;

		// For ServiceManager.cpp
		extern Mutex gDefaultServiceManagerLock;
		extern sp<IServiceManager> gDefaultServiceManager;
		extern sp<IPermissionController> gPermissionController;

		} // namespace android

include/private/binder/binder_module.h

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 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.
		*/

		#ifndef _BINDER_MODULE_H_
		#define _BINDER_MODULE_H_

		#ifdef __cplusplus
		namespace android {
		#endif

		/* obtain structures and constants from the kernel header */

		#include <sys/ioctl.h>
		#include <linux/binder.h>

		#ifdef __cplusplus
		} // namespace android
		#endif

		#endif // _BINDER_MODULE_H_

include/private/gui/ComposerService.h

deleted100644 → 0

+0 −53

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 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.
		*/

		#ifndef ANDROID_PRIVATE_GUI_COMPOSER_SERVICE_H
		#define ANDROID_PRIVATE_GUI_COMPOSER_SERVICE_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Singleton.h>
		#include <utils/StrongPointer.h>


		namespace android {

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

		class IMemoryHeap;
		class ISurfaceComposer;
		class surface_flinger_cblk_t;

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

		class ComposerService : public Singleton<ComposerService>
		{
		// these are constants
		sp<ISurfaceComposer> mComposerService;
		sp<IMemoryHeap> mServerCblkMemory;
		surface_flinger_cblk_t volatile* mServerCblk;
		ComposerService();
		friend class Singleton<ComposerService>;
		public:
		static sp<ISurfaceComposer> getComposerService();
		static surface_flinger_cblk_t const volatile * getControlBlock();
		};

		// ---------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_PRIVATE_GUI_COMPOSER_SERVICE_H

include/private/gui/LayerState.h

deleted100644 → 0

+0 −81

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 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.
		*/

		#ifndef ANDROID_SF_LAYER_STATE_H
		#define ANDROID_SF_LAYER_STATE_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>

		#include <ui/Region.h>
		#include <gui/ISurface.h>

		namespace android {

		class Parcel;
		class ISurfaceComposerClient;

		struct layer_state_t {

		layer_state_t()
		: surface(0), what(0),
		x(0), y(0), z(0), w(0), h(0),
		alpha(0), tint(0), flags(0), mask(0),
		reserved(0)
		{
		matrix.dsdx = matrix.dtdy = 1.0f;
		matrix.dsdy = matrix.dtdx = 0.0f;
		}

		status_t write(Parcel& output) const;
		status_t read(const Parcel& input);

		struct matrix22_t {
		float dsdx;
		float dtdx;
		float dsdy;
		float dtdy;
		};
		SurfaceID surface;
		uint32_t what;
		float x;
		float y;
		uint32_t z;
		uint32_t w;
		uint32_t h;
		float alpha;
		uint32_t tint;
		uint8_t flags;
		uint8_t mask;
		uint8_t reserved;
		matrix22_t matrix;
		// non POD must be last. see write/read
		Region transparentRegion;
		};

		struct ComposerState {
		sp<ISurfaceComposerClient> client;
		layer_state_t state;
		status_t write(Parcel& output) const;
		status_t read(const Parcel& input);
		};

		}; // namespace android

		#endif // ANDROID_SF_LAYER_STATE_H

include/private/gui/SharedBufferStack.h

deleted100644 → 0

+0 −59

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 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.
		*/

		#ifndef ANDROID_SF_SHARED_BUFFER_STACK_H
		#define ANDROID_SF_SHARED_BUFFER_STACK_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Debug.h>

		namespace android {
		// ---------------------------------------------------------------------------

		#define NUM_DISPLAY_MAX 4

		struct display_cblk_t
		{
		uint16_t w;
		uint16_t h;
		uint8_t format;
		uint8_t orientation;
		uint8_t reserved[2];
		float fps;
		float density;
		float xdpi;
		float ydpi;
		uint32_t pad[2];
		};

		struct surface_flinger_cblk_t // 4KB max
		{
		uint8_t connected;
		uint8_t reserved[3];
		uint32_t pad[7];
		display_cblk_t displays[NUM_DISPLAY_MAX];
		};

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

		COMPILE_TIME_ASSERT(sizeof(surface_flinger_cblk_t) <= 4096)

		// ---------------------------------------------------------------------------
		}; // namespace android

		#endif /* ANDROID_SF_SHARED_BUFFER_STACK_H */