Merge branch 'master' into honeycomb-release (0dd7a766) · Commits · e / os / android_frameworks_native

cmds/keystore/keystore.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ static int8_t encrypt_blob(char name, AES_KEY aes_key)
		int length;
		int fd;

		if (read(the_entropy, vector, AES_BLOCK_SIZE) != AES_BLOCK_SIZE) {
		if (read(the_entropy, blob.vector, AES_BLOCK_SIZE) != AES_BLOCK_SIZE) {
		return SYSTEM_ERROR;
		}

cmds/keystore/keystore_get.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ extern "C" {
		#endif

		/* This function is provided for native components to get values from keystore.
		* Users are required to link against libcutils. Keys are values are 8-bit safe.
		* Users are required to link against libcutils. Keys and values are 8-bit safe.
		* The first two arguments are the key and its length. The third argument
		* specifies the buffer to store the retrieved value, which must be an array of
		* KEYSTORE_MESSAGE_SIZE bytes. This function returns the length of the value or
		@@ -65,7 +65,10 @@ static int keystore_get(const char key, int length, char value)
		}
		offset += n;
		}
		} else {
		length = -1;
		}

		close(sock);
		return length;
		}

include/ui/InputReader.h

+10 −7

Original line number	Diff line number	Diff line
		@@ -308,9 +308,6 @@ private:
		GetStateFunc getStateFunc);
		bool markSupportedKeyCodes(int32_t deviceId, uint32_t sourceMask, size_t numCodes,
		const int32_t* keyCodes, uint8_t* outFlags);

		// dump state
		void dumpDeviceInfo(String8& dump);
		};


		@@ -340,6 +337,7 @@ public:

		inline bool isIgnored() { return mMappers.isEmpty(); }

		void dump(String8& dump);
		void addMapper(InputMapper* mapper);
		void configure();
		void reset();
		@@ -393,6 +391,7 @@ public:

		virtual uint32_t getSources() = 0;
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
		virtual void dump(String8& dump);
		virtual void configure();
		virtual void reset();
		virtual void process(const RawEvent* rawEvent) = 0;
		@@ -436,6 +435,7 @@ public:

		virtual uint32_t getSources();
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
		virtual void dump(String8& dump);
		virtual void reset();
		virtual void process(const RawEvent* rawEvent);

		@@ -484,6 +484,7 @@ public:

		virtual uint32_t getSources();
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
		virtual void dump(String8& dump);
		virtual void reset();
		virtual void process(const RawEvent* rawEvent);

		@@ -540,6 +541,7 @@ public:

		virtual uint32_t getSources();
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo);
		virtual void dump(String8& dump);
		virtual void configure();
		virtual void reset();

		@@ -761,15 +763,16 @@ protected:
		} mLocked;

		virtual void configureParameters();
		virtual void logParameters();
		virtual void dumpParameters(String8& dump);
		virtual void configureRawAxes();
		virtual void logRawAxes();
		virtual void dumpRawAxes(String8& dump);
		virtual bool configureSurfaceLocked();
		virtual void logMotionRangesLocked();
		virtual void dumpSurfaceLocked(String8& dump);
		virtual void configureVirtualKeysLocked();
		virtual void dumpVirtualKeysLocked(String8& dump);
		virtual void parseCalibration();
		virtual void resolveCalibration();
		virtual void logCalibration();
		virtual void dumpCalibration(String8& dump);

		enum TouchResult {
		// Dispatch the touch normally.

libs/ui/InputReader.cpp

+161 −138

File changed.

Preview size limit exceeded, changes collapsed.