Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base (a854544e) · Commits · e / os / android_frameworks_base

libs/hwui/utils/GenerationCache.h→GenerationCache.h

+0 −0

File moved.

core/java/android/net/LinkProperties.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ public class LinkProperties implements Parcelable {
		}

		public void addLinkAddress(LinkAddress address) {
		mLinkAddresses.add(address);
		if (address != null) mLinkAddresses.add(address);
		}

		public Collection<LinkAddress> getLinkAddresses() {
		@@ -99,7 +99,7 @@ public class LinkProperties implements Parcelable {
		}

		public void addDns(InetAddress dns) {
		mDnses.add(dns);
		if (dns != null) mDnses.add(dns);
		}

		public Collection<InetAddress> getDnses() {
		@@ -107,7 +107,7 @@ public class LinkProperties implements Parcelable {
		}

		public void addGateway(InetAddress gateway) {
		mGateways.add(gateway);
		if (gateway != null) mGateways.add(gateway);
		}
		public Collection<InetAddress> getGateways() {
		return Collections.unmodifiableCollection(mGateways);

core/java/android/net/http/HttpsConnection.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -289,11 +289,9 @@ public class HttpsConnection extends Connection {
		} else {
		// if we do not have a proxy, we simply connect to the host
		try {
		sslSock = (SSLSocket) getSocketFactory().createSocket();

		sslSock = (SSLSocket) getSocketFactory().createSocket(
		mHost.getHostName(), mHost.getPort());
		sslSock.setSoTimeout(SOCKET_TIMEOUT);
		sslSock.connect(new InetSocketAddress(mHost.getHostName(),
		mHost.getPort()));
		} catch(IOException e) {
		if (sslSock != null) {
		sslSock.close();

core/jni/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ LOCAL_SRC_FILES:= \
		android/graphics/Movie.cpp \
		android/graphics/NinePatch.cpp \
		android/graphics/NinePatchImpl.cpp \
		android/graphics/NinePatchPeeker.cpp \
		android/graphics/Paint.cpp \
		android/graphics/Path.cpp \
		android/graphics/PathMeasure.cpp \
		@@ -112,6 +113,7 @@ LOCAL_SRC_FILES:= \
		android/graphics/Shader.cpp \
		android/graphics/SurfaceTexture.cpp \
		android/graphics/TextLayout.cpp \
		android/graphics/TextLayoutCache.cpp \
		android/graphics/Typeface.cpp \
		android/graphics/Utils.cpp \
		android/graphics/Xfermode.cpp \

core/jni/android/graphics/BitmapFactory.cpp

+1 −59

Original line number	Diff line number	Diff line
		#define LOG_TAG "BitmapFactory"

		#include "BitmapFactory.h"
		#include "NinePatchPeeker.h"
		#include "SkImageDecoder.h"
		#include "SkImageRef_ashmem.h"
		#include "SkImageRef_GlobalPool.h"
		@@ -47,65 +48,6 @@ static jfieldID gFileDescriptor_descriptor;

		using namespace android;

		class NinePatchPeeker : public SkImageDecoder::Peeker {
		SkImageDecoder* fHost;
		public:
		NinePatchPeeker(SkImageDecoder* host) {
		// the host lives longer than we do, so a raw ptr is safe
		fHost = host;
		fPatchIsValid = false;
		}

		~NinePatchPeeker() {
		if (fPatchIsValid) {
		free(fPatch);
		}
		}

		bool fPatchIsValid;
		Res_png_9patch* fPatch;

		virtual bool peek(const char tag[], const void* data, size_t length) {
		if (strcmp("npTc", tag) == 0 && length >= sizeof(Res_png_9patch)) {
		Res_png_9patch* patch = (Res_png_9patch*) data;
		size_t patchSize = patch->serializedSize();
		assert(length == patchSize);
		// You have to copy the data because it is owned by the png reader
		Res_png_9patch* patchNew = (Res_png_9patch*) malloc(patchSize);
		memcpy(patchNew, patch, patchSize);
		// this relies on deserialization being done in place
		Res_png_9patch::deserialize(patchNew);
		patchNew->fileToDevice();
		if (fPatchIsValid) {
		free(fPatch);
		}
		fPatch = patchNew;
		//printf("9patch: (%d,%d)-(%d,%d)\n",
		// fPatch.sizeLeft, fPatch.sizeTop,
		// fPatch.sizeRight, fPatch.sizeBottom);
		fPatchIsValid = true;

		// now update our host to force index or 32bit config
		// 'cause we don't want 565 predithered, since as a 9patch, we know
		// we will be stretched, and therefore we want to dither afterwards.
		static const SkBitmap::Config gNo565Pref[] = {
		SkBitmap::kIndex8_Config,
		SkBitmap::kIndex8_Config,
		SkBitmap::kARGB_8888_Config,
		SkBitmap::kARGB_8888_Config,
		SkBitmap::kARGB_8888_Config,
		SkBitmap::kARGB_8888_Config,
		};
		fHost->setPrefConfigTable(gNo565Pref);
		} else {
		fPatch = NULL;
		}
		return true; // keep on decoding
		}
		};

		///////////////////////////////////////////////////////////////////////////////

		static inline int32_t validOrNeg1(bool isValid, int32_t value) {
		// return isValid ? value : -1;
		SkASSERT((int)isValid == 0 \|\| (int)isValid == 1);