Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b7e3ef4 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 55bef14f: am fb234bbe: merge from open-source master

parents f41bc120 55bef14f

opengl/libagl/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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 <bionic_tls.h>

    # on ARM platforms, we need to mirror the ARCH_ARM_HAVE_TLS_REGISTER

opengl/libagl/texture.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1515,7 +1515,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;

    }

telephony/java/com/android/internal/telephony/Connection.java

+1 −0
Original line number Diff line number Diff line
@@ -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 */

telephony/java/com/android/internal/telephony/gsm/CallFailCause.java

+3 −0
Original line number Diff line number Diff line
@@ -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;

telephony/java/com/android/internal/telephony/gsm/GsmConnection.java

+3 −0
Original line number Diff line number Diff line
@@ -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: