Merge branch 'eclair' into openvpn-device (f40f89a9) · Commits · e / os / android_frameworks_base

libs/surfaceflinger/LayerBuffer.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,6 @@ status_t LayerBuffer::BufferSource::initTempBuffer(int w, int h) const
		glDeleteTextures(1, &mTexture.name);
		eglDestroyImageKHR(dpy, mTexture.image);
		Texture defaultTexture;
		mTexture = defaultTexture;
		mTexture.name = mLayer.createTexture();
		mTempGraphicBuffer.clear();
		} else if (!mLayer.mInvalidEGLImage) {

+4 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,10 @@ ifeq ($(LIBAGL_USE_GRALLOC_COPYBITS),1)
		LOCAL_SHARED_LIBRARIES += libui
		endif

		ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
		LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
		endif


		LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/egl
		LOCAL_MODULE:= libGLES_android

+1 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ static inline gl_hooks_t const * volatile * get_tls_hooks() {

		static inline void setGlThreadSpecific(gl_hooks_t const *value) {
		gl_hooks_t const * volatile * tls_hooks = get_tls_hooks();
		LOGD("Setting TLS: %p to %p", tls_hooks, value);
		tls_hooks[TLS_SLOT_OPENGL_API] = value;
		}

+11 −6

Original line number	Diff line number	Diff line
		@@ -13181,11 +13181,6 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		// counts as being in the foreground.
		adj = FOREGROUND_APP_ADJ;
		app.adjType = "exec-service";
		} else if (mUidWakeLocks.get(app.info.uid) != null) {
		// An app that is currently holding a wakelock also
		// counts as being in the foreground.
		adj = FOREGROUND_APP_ADJ;
		app.adjType = "wakelock";
		} else if (app.foregroundServices) {
		// The user is aware of this app, so make it visible.
		adj = VISIBLE_APP_ADJ;
		@@ -13378,11 +13373,21 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
		adj = app.maxAdj;
		}

		app.curAdj = adj;
		app.curSchedGroup = adj > VISIBLE_APP_ADJ
		? Process.THREAD_GROUP_BG_NONINTERACTIVE
		: Process.THREAD_GROUP_DEFAULT;

		// An app that is currently holding a wakelock also
		// counts as being in the foreground.
		// We do this after setting the schedgroup so that it can't
		// escalate beyond it's original priority
		if (mUidWakeLocks.get(app.info.uid) != null) {
		adj = FOREGROUND_APP_ADJ;
		app.adjType = "wakelock";
		}

		app.curAdj = adj;

		return adj;
		}