Merge "move ndk headers to frameworks/native" (2cd24ecf) · Commits · e / os / android_frameworks_base

native/copy-to-ndk.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ copyndkheaders() {
		local CURR_PLATFORM=android-9
		local ALL_PLATFORMS="$CURR_PLATFORM android-8 android-5 android-4 android-3"

		local SRC_HEADERS=$ANDROID_BUILD_TOP/frameworks/base/native/include/android
		local SRC_HEADERS=$ANDROID_BUILD_TOP/frameworks/native/include/android
		local NDK_PLATFORMS=$ANDROID_BUILD_TOP/development/ndk/platforms
		local DST_HEADERS=$NDK_PLATFORMS/$CURR_PLATFORM

native/include/android/asset_manager.h

deleted100644 → 0

+0 −175

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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_ASSET_MANAGER_H
		#define ANDROID_ASSET_MANAGER_H

		#ifdef __cplusplus
		extern "C" {
		#endif

		struct AAssetManager;
		typedef struct AAssetManager AAssetManager;

		struct AAssetDir;
		typedef struct AAssetDir AAssetDir;

		struct AAsset;
		typedef struct AAsset AAsset;

		/* Available modes for opening assets */
		enum {
		AASSET_MODE_UNKNOWN = 0,
		AASSET_MODE_RANDOM = 1,
		AASSET_MODE_STREAMING = 2,
		AASSET_MODE_BUFFER = 3
		};


		/**
		* Open the named directory within the asset hierarchy. The directory can then
		* be inspected with the AAssetDir functions. To open the top-level directory,
		* pass in "" as the dirName.
		*
		* The object returned here should be freed by calling AAssetDir_close().
		*/
		AAssetDir* AAssetManager_openDir(AAssetManager* mgr, const char* dirName);

		/**
		* Open an asset.
		*
		* The object returned here should be freed by calling AAsset_close().
		*/
		AAsset* AAssetManager_open(AAssetManager* mgr, const char* filename, int mode);

		/**
		* Iterate over the files in an asset directory. A NULL string is returned
		* when all the file names have been returned.
		*
		* The returned file name is suitable for passing to AAssetManager_open().
		*
		* The string returned here is owned by the AssetDir implementation and is not
		* guaranteed to remain valid if any other calls are made on this AAssetDir
		* instance.
		*/
		const char* AAssetDir_getNextFileName(AAssetDir* assetDir);

		/**
		* Reset the iteration state of AAssetDir_getNextFileName() to the beginning.
		*/
		void AAssetDir_rewind(AAssetDir* assetDir);

		/**
		* Close an opened AAssetDir, freeing any related resources.
		*/
		void AAssetDir_close(AAssetDir* assetDir);

		/**
		* Attempt to read 'count' bytes of data from the current offset.
		*
		* Returns the number of bytes read, zero on EOF, or < 0 on error.
		*/
		int AAsset_read(AAsset* asset, void* buf, size_t count);

		/**
		* Seek to the specified offset within the asset data. 'whence' uses the
		* same constants as lseek()/fseek().
		*
		* Returns the new position on success, or (off_t) -1 on error.
		*/
		off_t AAsset_seek(AAsset* asset, off_t offset, int whence);

		/**
		* Seek to the specified offset within the asset data. 'whence' uses the
		* same constants as lseek()/fseek().
		*
		* Uses 64-bit data type for large files as opposed to the 32-bit type used
		* by AAsset_seek.
		*
		* Returns the new position on success, or (off64_t) -1 on error.
		*/
		off64_t AAsset_seek64(AAsset* asset, off64_t offset, int whence);

		/**
		* Close the asset, freeing all associated resources.
		*/
		void AAsset_close(AAsset* asset);

		/**
		* Get a pointer to a buffer holding the entire contents of the assset.
		*
		* Returns NULL on failure.
		*/
		const void* AAsset_getBuffer(AAsset* asset);

		/**
		* Report the total size of the asset data.
		*/
		off_t AAsset_getLength(AAsset* asset);

		/**
		* Report the total size of the asset data. Reports the size using a 64-bit
		* number insted of 32-bit as AAsset_getLength.
		*/
		off64_t AAsset_getLength64(AAsset* asset);

		/**
		* Report the total amount of asset data that can be read from the current position.
		*/
		off_t AAsset_getRemainingLength(AAsset* asset);

		/**
		* Report the total amount of asset data that can be read from the current position.
		*
		* Uses a 64-bit number instead of a 32-bit number as AAsset_getRemainingLength does.
		*/
		off64_t AAsset_getRemainingLength64(AAsset* asset);

		/**
		* Open a new file descriptor that can be used to read the asset data. If the
		* start or length cannot be represented by a 32-bit number, it will be
		* truncated. If the file is large, use AAsset_openFileDescriptor64 instead.
		*
		* Returns < 0 if direct fd access is not possible (for example, if the asset is
		* compressed).
		*/
		int AAsset_openFileDescriptor(AAsset* asset, off_t* outStart, off_t* outLength);

		/**
		* Open a new file descriptor that can be used to read the asset data.
		*
		* Uses a 64-bit number for the offset and length instead of 32-bit instead of
		* as AAsset_openFileDescriptor does.
		*
		* Returns < 0 if direct fd access is not possible (for example, if the asset is
		* compressed).
		*/
		int AAsset_openFileDescriptor64(AAsset* asset, off64_t* outStart, off64_t* outLength);

		/**
		* Returns whether this asset's internal buffer is allocated in ordinary RAM (i.e. not
		* mmapped).
		*/
		int AAsset_isAllocated(AAsset* asset);



		#ifdef __cplusplus
		};
		#endif

		#endif // ANDROID_ASSET_MANAGER_H

native/include/android/asset_manager_jni.h

deleted100644 → 0

+0 −40

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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_ASSET_MANAGER_JNI_H
		#define ANDROID_ASSET_MANAGER_JNI_H

		#include <android/asset_manager.h>
		#include <jni.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		/**
		* Given a Dalvik AssetManager object, obtain the corresponding native AAssetManager
		* object. Note that the caller is responsible for obtaining and holding a VM reference
		* to the jobject to prevent its being garbage collected while the native object is
		* in use.
		*/
		AAssetManager* AAssetManager_fromJava(JNIEnv* env, jobject assetManager);

		#ifdef __cplusplus
		};
		#endif

		#endif // ANDROID_ASSET_MANAGER_JNI_H

native/include/android/bitmap.h

deleted100644 → 0

+0 −79

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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_BITMAP_H
		#define ANDROID_BITMAP_H

		#include <stdint.h>
		#include <jni.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		#define ANDROID_BITMAP_RESUT_SUCCESS 0
		#define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1
		#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2
		#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3

		enum AndroidBitmapFormat {
		ANDROID_BITMAP_FORMAT_NONE = 0,
		ANDROID_BITMAP_FORMAT_RGBA_8888 = 1,
		ANDROID_BITMAP_FORMAT_RGB_565 = 4,
		ANDROID_BITMAP_FORMAT_RGBA_4444 = 7,
		ANDROID_BITMAP_FORMAT_A_8 = 8,
		};

		typedef struct {
		uint32_t width;
		uint32_t height;
		uint32_t stride;
		int32_t format;
		uint32_t flags; // 0 for now
		} AndroidBitmapInfo;

		/**
		* Given a java bitmap object, fill out the AndroidBitmap struct for it.
		* If the call fails, the info parameter will be ignored
		*/
		int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
		AndroidBitmapInfo* info);

		/**
		* Given a java bitmap object, attempt to lock the pixel address.
		* Locking will ensure that the memory for the pixels will not move
		* until the unlockPixels call, and ensure that, if the pixels had been
		* previously purged, they will have been restored.
		*
		* If this call succeeds, it must be balanced by a call to
		* AndroidBitmap_unlockPixels, after which time the address of the pixels should
		* no longer be used.
		*
		* If this succeeds, *addrPtr will be set to the pixel address. If the call
		* fails, addrPtr will be ignored.
		*/
		int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr);

		/**
		* Call this to balanace a successful call to AndroidBitmap_lockPixels
		*/
		int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap);

		#ifdef __cplusplus
		}
		#endif

		#endif

native/include/android/configuration.h

deleted100644 → 0

+0 −364

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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_CONFIGURATION_H
		#define ANDROID_CONFIGURATION_H

		#include <android/asset_manager.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		struct AConfiguration;
		typedef struct AConfiguration AConfiguration;

		enum {
		ACONFIGURATION_ORIENTATION_ANY = 0x0000,
		ACONFIGURATION_ORIENTATION_PORT = 0x0001,
		ACONFIGURATION_ORIENTATION_LAND = 0x0002,
		ACONFIGURATION_ORIENTATION_SQUARE = 0x0003,

		ACONFIGURATION_TOUCHSCREEN_ANY = 0x0000,
		ACONFIGURATION_TOUCHSCREEN_NOTOUCH = 0x0001,
		ACONFIGURATION_TOUCHSCREEN_STYLUS = 0x0002,
		ACONFIGURATION_TOUCHSCREEN_FINGER = 0x0003,

		ACONFIGURATION_DENSITY_DEFAULT = 0,
		ACONFIGURATION_DENSITY_LOW = 120,
		ACONFIGURATION_DENSITY_MEDIUM = 160,
		ACONFIGURATION_DENSITY_TV = 213,
		ACONFIGURATION_DENSITY_HIGH = 240,
		ACONFIGURATION_DENSITY_XHIGH = 320,
		ACONFIGURATION_DENSITY_XXHIGH = 480,
		ACONFIGURATION_DENSITY_NONE = 0xffff,

		ACONFIGURATION_KEYBOARD_ANY = 0x0000,
		ACONFIGURATION_KEYBOARD_NOKEYS = 0x0001,
		ACONFIGURATION_KEYBOARD_QWERTY = 0x0002,
		ACONFIGURATION_KEYBOARD_12KEY = 0x0003,

		ACONFIGURATION_NAVIGATION_ANY = 0x0000,
		ACONFIGURATION_NAVIGATION_NONAV = 0x0001,
		ACONFIGURATION_NAVIGATION_DPAD = 0x0002,
		ACONFIGURATION_NAVIGATION_TRACKBALL = 0x0003,
		ACONFIGURATION_NAVIGATION_WHEEL = 0x0004,

		ACONFIGURATION_KEYSHIDDEN_ANY = 0x0000,
		ACONFIGURATION_KEYSHIDDEN_NO = 0x0001,
		ACONFIGURATION_KEYSHIDDEN_YES = 0x0002,
		ACONFIGURATION_KEYSHIDDEN_SOFT = 0x0003,

		ACONFIGURATION_NAVHIDDEN_ANY = 0x0000,
		ACONFIGURATION_NAVHIDDEN_NO = 0x0001,
		ACONFIGURATION_NAVHIDDEN_YES = 0x0002,

		ACONFIGURATION_SCREENSIZE_ANY = 0x00,
		ACONFIGURATION_SCREENSIZE_SMALL = 0x01,
		ACONFIGURATION_SCREENSIZE_NORMAL = 0x02,
		ACONFIGURATION_SCREENSIZE_LARGE = 0x03,
		ACONFIGURATION_SCREENSIZE_XLARGE = 0x04,

		ACONFIGURATION_SCREENLONG_ANY = 0x00,
		ACONFIGURATION_SCREENLONG_NO = 0x1,
		ACONFIGURATION_SCREENLONG_YES = 0x2,

		ACONFIGURATION_UI_MODE_TYPE_ANY = 0x00,
		ACONFIGURATION_UI_MODE_TYPE_NORMAL = 0x01,
		ACONFIGURATION_UI_MODE_TYPE_DESK = 0x02,
		ACONFIGURATION_UI_MODE_TYPE_CAR = 0x03,
		ACONFIGURATION_UI_MODE_TYPE_TELEVISION = 0x04,
		ACONFIGURATION_UI_MODE_TYPE_APPLIANCE = 0x05,

		ACONFIGURATION_UI_MODE_NIGHT_ANY = 0x00,
		ACONFIGURATION_UI_MODE_NIGHT_NO = 0x1,
		ACONFIGURATION_UI_MODE_NIGHT_YES = 0x2,

		ACONFIGURATION_SCREEN_WIDTH_DP_ANY = 0x0000,

		ACONFIGURATION_SCREEN_HEIGHT_DP_ANY = 0x0000,

		ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY = 0x0000,

		ACONFIGURATION_MCC = 0x0001,
		ACONFIGURATION_MNC = 0x0002,
		ACONFIGURATION_LOCALE = 0x0004,
		ACONFIGURATION_TOUCHSCREEN = 0x0008,
		ACONFIGURATION_KEYBOARD = 0x0010,
		ACONFIGURATION_KEYBOARD_HIDDEN = 0x0020,
		ACONFIGURATION_NAVIGATION = 0x0040,
		ACONFIGURATION_ORIENTATION = 0x0080,
		ACONFIGURATION_DENSITY = 0x0100,
		ACONFIGURATION_SCREEN_SIZE = 0x0200,
		ACONFIGURATION_VERSION = 0x0400,
		ACONFIGURATION_SCREEN_LAYOUT = 0x0800,
		ACONFIGURATION_UI_MODE = 0x1000,
		ACONFIGURATION_SMALLEST_SCREEN_SIZE = 0x2000,
		};

		/**
		* Create a new AConfiguration, initialized with no values set.
		*/
		AConfiguration* AConfiguration_new();

		/**
		* Free an AConfiguration that was previously created with
		* AConfiguration_new().
		*/
		void AConfiguration_delete(AConfiguration* config);

		/**
		* Create and return a new AConfiguration based on the current configuration in
		* use in the given AssetManager.
		*/
		void AConfiguration_fromAssetManager(AConfiguration* out, AAssetManager* am);

		/**
		* Copy the contents of 'src' to 'dest'.
		*/
		void AConfiguration_copy(AConfiguration* dest, AConfiguration* src);

		/**
		* Return the current MCC set in the configuration. 0 if not set.
		*/
		int32_t AConfiguration_getMcc(AConfiguration* config);

		/**
		* Set the current MCC in the configuration. 0 to clear.
		*/
		void AConfiguration_setMcc(AConfiguration* config, int32_t mcc);

		/**
		* Return the current MNC set in the configuration. 0 if not set.
		*/
		int32_t AConfiguration_getMnc(AConfiguration* config);

		/**
		* Set the current MNC in the configuration. 0 to clear.
		*/
		void AConfiguration_setMnc(AConfiguration* config, int32_t mnc);

		/**
		* Return the current language code set in the configuration. The output will
		* be filled with an array of two characters. They are not 0-terminated. If
		* a language is not set, they will be 0.
		*/
		void AConfiguration_getLanguage(AConfiguration* config, char* outLanguage);

		/**
		* Set the current language code in the configuration, from the first two
		* characters in the string.
		*/
		void AConfiguration_setLanguage(AConfiguration* config, const char* language);

		/**
		* Return the current country code set in the configuration. The output will
		* be filled with an array of two characters. They are not 0-terminated. If
		* a country is not set, they will be 0.
		*/
		void AConfiguration_getCountry(AConfiguration* config, char* outCountry);

		/**
		* Set the current country code in the configuration, from the first two
		* characters in the string.
		*/
		void AConfiguration_setCountry(AConfiguration* config, const char* country);

		/**
		* Return the current ACONFIGURATION_ORIENTATION_* set in the configuration.
		*/
		int32_t AConfiguration_getOrientation(AConfiguration* config);

		/**
		* Set the current orientation in the configuration.
		*/
		void AConfiguration_setOrientation(AConfiguration* config, int32_t orientation);

		/**
		* Return the current ACONFIGURATION_TOUCHSCREEN_* set in the configuration.
		*/
		int32_t AConfiguration_getTouchscreen(AConfiguration* config);

		/**
		* Set the current touchscreen in the configuration.
		*/
		void AConfiguration_setTouchscreen(AConfiguration* config, int32_t touchscreen);

		/**
		* Return the current ACONFIGURATION_DENSITY_* set in the configuration.
		*/
		int32_t AConfiguration_getDensity(AConfiguration* config);

		/**
		* Set the current density in the configuration.
		*/
		void AConfiguration_setDensity(AConfiguration* config, int32_t density);

		/**
		* Return the current ACONFIGURATION_KEYBOARD_* set in the configuration.
		*/
		int32_t AConfiguration_getKeyboard(AConfiguration* config);

		/**
		* Set the current keyboard in the configuration.
		*/
		void AConfiguration_setKeyboard(AConfiguration* config, int32_t keyboard);

		/**
		* Return the current ACONFIGURATION_NAVIGATION_* set in the configuration.
		*/
		int32_t AConfiguration_getNavigation(AConfiguration* config);

		/**
		* Set the current navigation in the configuration.
		*/
		void AConfiguration_setNavigation(AConfiguration* config, int32_t navigation);

		/**
		* Return the current ACONFIGURATION_KEYSHIDDEN_* set in the configuration.
		*/
		int32_t AConfiguration_getKeysHidden(AConfiguration* config);

		/**
		* Set the current keys hidden in the configuration.
		*/
		void AConfiguration_setKeysHidden(AConfiguration* config, int32_t keysHidden);

		/**
		* Return the current ACONFIGURATION_NAVHIDDEN_* set in the configuration.
		*/
		int32_t AConfiguration_getNavHidden(AConfiguration* config);

		/**
		* Set the current nav hidden in the configuration.
		*/
		void AConfiguration_setNavHidden(AConfiguration* config, int32_t navHidden);

		/**
		* Return the current SDK (API) version set in the configuration.
		*/
		int32_t AConfiguration_getSdkVersion(AConfiguration* config);

		/**
		* Set the current SDK version in the configuration.
		*/
		void AConfiguration_setSdkVersion(AConfiguration* config, int32_t sdkVersion);

		/**
		* Return the current ACONFIGURATION_SCREENSIZE_* set in the configuration.
		*/
		int32_t AConfiguration_getScreenSize(AConfiguration* config);

		/**
		* Set the current screen size in the configuration.
		*/
		void AConfiguration_setScreenSize(AConfiguration* config, int32_t screenSize);

		/**
		* Return the current ACONFIGURATION_SCREENLONG_* set in the configuration.
		*/
		int32_t AConfiguration_getScreenLong(AConfiguration* config);

		/**
		* Set the current screen long in the configuration.
		*/
		void AConfiguration_setScreenLong(AConfiguration* config, int32_t screenLong);

		/**
		* Return the current ACONFIGURATION_UI_MODE_TYPE_* set in the configuration.
		*/
		int32_t AConfiguration_getUiModeType(AConfiguration* config);

		/**
		* Set the current UI mode type in the configuration.
		*/
		void AConfiguration_setUiModeType(AConfiguration* config, int32_t uiModeType);

		/**
		* Return the current ACONFIGURATION_UI_MODE_NIGHT_* set in the configuration.
		*/
		int32_t AConfiguration_getUiModeNight(AConfiguration* config);

		/**
		* Set the current UI mode night in the configuration.
		*/
		void AConfiguration_setUiModeNight(AConfiguration* config, int32_t uiModeNight);

		/**
		* Return the current configuration screen width in dp units, or
		* ACONFIGURATION_SCREEN_WIDTH_DP_ANY if not set.
		*/
		int32_t AConfiguration_getScreenWidthDp(AConfiguration* config);

		/**
		* Set the configuration's current screen width in dp units.
		*/
		void AConfiguration_setScreenWidthDp(AConfiguration* config, int32_t value);

		/**
		* Return the current configuration screen height in dp units, or
		* ACONFIGURATION_SCREEN_HEIGHT_DP_ANY if not set.
		*/
		int32_t AConfiguration_getScreenHeightDp(AConfiguration* config);

		/**
		* Set the configuration's current screen width in dp units.
		*/
		void AConfiguration_setScreenHeightDp(AConfiguration* config, int32_t value);

		/**
		* Return the configuration's smallest screen width in dp units, or
		* ACONFIGURATION_SMALLEST_SCREEN_WIDTH_DP_ANY if not set.
		*/
		int32_t AConfiguration_getSmallestScreenWidthDp(AConfiguration* config);

		/**
		* Set the configuration's smallest screen width in dp units.
		*/
		void AConfiguration_setSmallestScreenWidthDp(AConfiguration* config, int32_t value);

		/**
		* Perform a diff between two configurations. Returns a bit mask of
		* ACONFIGURATION_* constants, each bit set meaning that configuration element
		* is different between them.
		*/
		int32_t AConfiguration_diff(AConfiguration* config1, AConfiguration* config2);

		/**
		* Determine whether 'base' is a valid configuration for use within the
		* environment 'requested'. Returns 0 if there are any values in 'base'
		* that conflict with 'requested'. Returns 1 if it does not conflict.
		*/
		int32_t AConfiguration_match(AConfiguration* base, AConfiguration* requested);

		/**
		* Determine whether the configuration in 'test' is better than the existing
		* configuration in 'base'. If 'requested' is non-NULL, this decision is based
		* on the overall configuration given there. If it is NULL, this decision is
		* simply based on which configuration is more specific. Returns non-0 if
		* 'test' is better than 'base'.
		*
		* This assumes you have already filtered the configurations with
		* AConfiguration_match().
		*/
		int32_t AConfiguration_isBetterThan(AConfiguration* base, AConfiguration* test,
		AConfiguration* requested);

		#ifdef __cplusplus
		};
		#endif

		#endif // ANDROID_CONFIGURATION_H