From 81d42591f766928fe250a0182e707e864f6e1f54 Mon Sep 17 00:00:00 2001 From: Mike Playle Date: Fri, 29 Jan 2010 09:52:22 +0000 Subject: [PATCH 1/3] Fix glReadPixels() to verify that both x and y are non-negative. --- opengl/libagl/texture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 13d078e2a3d86..89a19b66d5559 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -1467,7 +1467,7 @@ void glReadPixels( ogles_error(c, GL_INVALID_VALUE); return; } - if (x<0 || x<0) { + if (x<0 || y<0) { ogles_error(c, GL_INVALID_VALUE); return; } From f123ec8f7d449b2e079ea8d5d7e431ff83235f56 Mon Sep 17 00:00:00 2001 From: Magnus Landqvist Date: Fri, 19 Feb 2010 12:06:59 +0100 Subject: [PATCH 2/3] Build software AGL library with correct get_tls() macro for ARMv7 based platforms This prevents crashes on snapdragon processors. --- opengl/libagl/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk index 983784554d301..518be8b5322e9 100644 --- a/opengl/libagl/Android.mk +++ b/opengl/libagl/Android.mk @@ -37,6 +37,10 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -fstrict-aliasing endif +ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) + LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER +endif + ifneq ($(TARGET_SIMULATOR),true) # we need to access the private Bionic header LOCAL_C_INCLUDES += bionic/libc/private From 6308e48d40e72a53ddaf7881e1c95223ddf33b5d Mon Sep 17 00:00:00 2001 From: Naveen Kalla Date: Fri, 23 Apr 2010 09:39:33 -0700 Subject: [PATCH 3/3] Notify user regarding invalid number during MO call. When user dials an invalid number, network returns an error indicating "unobtainable number" (See the Table 10.5.123/3GPP TS 24.008 for the possible failure causes). Changes done to display message to indicate user that an invalid number has been dialed. Change-Id: I477d64bc3b59cc205396f911ff9630c640f619f3 --- telephony/java/com/android/internal/telephony/Connection.java | 1 + .../java/com/android/internal/telephony/gsm/CallFailCause.java | 3 +++ .../java/com/android/internal/telephony/gsm/GsmConnection.java | 3 +++ 3 files changed, 7 insertions(+) diff --git a/telephony/java/com/android/internal/telephony/Connection.java b/telephony/java/com/android/internal/telephony/Connection.java index 37e8a99e6799f..6b4c551b80f72 100644 --- a/telephony/java/com/android/internal/telephony/Connection.java +++ b/telephony/java/com/android/internal/telephony/Connection.java @@ -50,6 +50,7 @@ public abstract class Connection { CS_RESTRICTED, /* call was blocked by restricted all voice access */ CS_RESTRICTED_NORMAL, /* call was blocked by restricted normal voice access */ CS_RESTRICTED_EMERGENCY, /* call was blocked by restricted emergency voice access */ + UNOBTAINABLE_NUMBER, /* Unassigned number (3GPP TS 24.008 table 10.5.123) */ CDMA_LOCKED_UNTIL_POWER_CYCLE, /* MS is locked until next power cycle */ CDMA_DROP, CDMA_INTERCEPT, /* INTERCEPT order received, MS state idle entered */ diff --git a/telephony/java/com/android/internal/telephony/gsm/CallFailCause.java b/telephony/java/com/android/internal/telephony/gsm/CallFailCause.java index e7fbf6bd8a8b3..af2ad48a9bc03 100644 --- a/telephony/java/com/android/internal/telephony/gsm/CallFailCause.java +++ b/telephony/java/com/android/internal/telephony/gsm/CallFailCause.java @@ -25,6 +25,9 @@ package com.android.internal.telephony.gsm; * */ public interface CallFailCause { + // Unassigned/Unobtainable number + static final int UNOBTAINABLE_NUMBER = 1; + static final int NORMAL_CLEARING = 16; // Busy Tone static final int USER_BUSY = 17; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java index 445be396ab45c..985ec9a900d31 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmConnection.java @@ -356,6 +356,9 @@ public class GsmConnection extends Connection { case CallFailCause.FDN_BLOCKED: return DisconnectCause.FDN_BLOCKED; + case CallFailCause.UNOBTAINABLE_NUMBER: + return DisconnectCause.UNOBTAINABLE_NUMBER; + case CallFailCause.ERROR_UNSPECIFIED: case CallFailCause.NORMAL_CLEARING: default: