Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am fb234bbe: merge from open-source master

Browse Source 
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken

* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
  Notify user regarding invalid number during MO call.
  Build software AGL library with correct get_tls() macro for ARMv7 based platforms
  Fix glReadPixels() to verify that both x and y are non-negative.
This commit is contained in:
The Android Open Source Project
2010-05-12 12:13:18 -07:00
committed by Android Git Automerger
parent e46defea3a fb234bbe5e
commit 55bef14f15
5 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opengl/libagl/Android.mk
View File

@@ -37,6 +37,10 @@ ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -fstrict-aliasing LOCAL_CFLAGS += -fstrict-aliasing
endif endif
ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true)
LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER
endif
ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_SIMULATOR),true)
# we need to access the private Bionic header <bionic_tls.h> # we need to access the private Bionic header <bionic_tls.h>
# on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER

2
opengl/libagl/texture.cpp
View File

@@ -1515,7 +1515,7 @@ void glReadPixels(
ogles_error(c, GL_INVALID_VALUE); ogles_error(c, GL_INVALID_VALUE);
return; return;
} }
if (x<0 || x<0) { if (x<0 || y<0) {
ogles_error(c, GL_INVALID_VALUE); ogles_error(c, GL_INVALID_VALUE);
return; return;
} }

1
telephony/java/com/android/internal/telephony/Connection.java
View File

@@ -50,6 +50,7 @@ public abstract class Connection {
CS_RESTRICTED, /* call was blocked by restricted all voice access */ CS_RESTRICTED, /* call was blocked by restricted all voice access */
CS_RESTRICTED_NORMAL, /* call was blocked by restricted normal voice access */ CS_RESTRICTED_NORMAL, /* call was blocked by restricted normal voice access */
CS_RESTRICTED_EMERGENCY, /* call was blocked by restricted emergency 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_LOCKED_UNTIL_POWER_CYCLE, /* MS is locked until next power cycle */
CDMA_DROP, CDMA_DROP,
CDMA_INTERCEPT, /* INTERCEPT order received, MS state idle entered */ CDMA_INTERCEPT, /* INTERCEPT order received, MS state idle entered */

3
telephony/java/com/android/internal/telephony/gsm/CallFailCause.java
View File

@@ -25,6 +25,9 @@ package com.android.internal.telephony.gsm;
* *
*/ */
public interface CallFailCause { public interface CallFailCause {
// Unassigned/Unobtainable number
static final int UNOBTAINABLE_NUMBER = 1;
static final int NORMAL_CLEARING = 16; static final int NORMAL_CLEARING = 16;
// Busy Tone // Busy Tone
static final int USER_BUSY = 17; static final int USER_BUSY = 17;

3
telephony/java/com/android/internal/telephony/gsm/GsmConnection.java
View File

@@ -356,6 +356,9 @@ public class GsmConnection extends Connection {
case CallFailCause.FDN_BLOCKED: case CallFailCause.FDN_BLOCKED:
return DisconnectCause.FDN_BLOCKED; return DisconnectCause.FDN_BLOCKED;
case CallFailCause.UNOBTAINABLE_NUMBER:
return DisconnectCause.UNOBTAINABLE_NUMBER;
case CallFailCause.ERROR_UNSPECIFIED: case CallFailCause.ERROR_UNSPECIFIED:
case CallFailCause.NORMAL_CLEARING: case CallFailCause.NORMAL_CLEARING:
default: default: