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

Commit 56464672 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'gingerbread' into gingerbread-release

parents 9337ce3d baced375

api/current.xml

+0 −45
Original line number Diff line number Diff line
@@ -96518,32 +96518,6 @@ 
<parameter name="callbackImmediately" type="boolean">

</parameter>

</method>

<method name="setRingbackToneEnabled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="enabled" type="boolean">

</parameter>

</method>

<method name="setRingtoneEnabled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="enabled" type="boolean">

</parameter>

</method>

<method name="setSpeakerMode"

 return="void"

 abstract="false"
@@ -97242,25 +97216,6 @@ 
<exception name="SipException" type="android.net.sip.SipException">

</exception>

</method>

<method name="takeAudioCall"

 return="android.net.sip.SipAudioCall"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="incomingCallIntent" type="android.content.Intent">

</parameter>

<parameter name="listener" type="android.net.sip.SipAudioCall.Listener">

</parameter>

<parameter name="ringtoneEnabled" type="boolean">

</parameter>

<exception name="SipException" type="android.net.sip.SipException">

</exception>

</method>

<method name="unregister"

 return="void"

 abstract="false"

core/java/android/app/NativeActivity.java

+4 −9
Original line number Diff line number Diff line
@@ -162,16 +162,11 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback2, 
        

        String path = null;

        

        if ((ai.applicationInfo.flags&ApplicationInfo.FLAG_HAS_CODE) == 0) {

            // If the application does not have (Java) code, then no ClassLoader

            // has been set up for it.  We will need to do our own search for

            // the native code.

        File libraryFile = new File(ai.applicationInfo.nativeLibraryDir,

                System.mapLibraryName(libname));

        if (libraryFile.exists()) {

            path = libraryFile.getPath();

        }

        }

        

        if (path == null) {

            throw new IllegalArgumentException("Unable to find native library: " + libname);

core/java/android/hardware/SensorEvent.java

+3 −3
Original line number Diff line number Diff line
@@ -177,12 +177,12 @@ public class SensorEvent { 
     *  <h4>{@link android.hardware.Sensor#TYPE_ROTATION_VECTOR Sensor.TYPE_ROTATION_VECTOR}:</h4>

     *  The rotation vector represents the orientation of the device as a combination of an angle

     *  and an axis, in which the device has rotated through an angle theta around an axis

     *  <x, y, z>. The three elements of the rotation vector are

     *  <x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>, such that the magnitude of the rotation

     *  &lt;x, y, z>. The three elements of the rotation vector are

     *  &lt;x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>, such that the magnitude of the rotation

     *  vector is equal to sin(theta/2), and the direction of the rotation vector is equal to the

     *  direction of the axis of rotation. The three elements of the rotation vector are equal to

     *  the last three components of a unit quaternion

     *  <cos(theta/2), x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>.  Elements of the rotation

     *  &lt;cos(theta/2), x*sin(theta/2), y*sin(theta/2), z*sin(theta/2)>.  Elements of the rotation

     *  vector are unitless.  The x,y, and z axis are defined in the same way as the acceleration

     *  sensor.

     *

telephony/java/com/android/internal/telephony/CallManager.java

+20 −2
Original line number Diff line number Diff line
@@ -1626,7 +1626,15 @@ public final class CallManager { 
    }







    private boolean hasMoreThanOneRingingCall() {

        int count = 0;

        for (Call call : mRingingCalls) {

            if (call.getState().isRinging()) {

                if (++count > 1) return true;

            }

        }

        return false;

    }



    private Handler mHandler = new Handler() {
@@ -1644,7 +1652,17 @@ public final class CallManager { 
                    break;

                case EVENT_NEW_RINGING_CONNECTION:

                    if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_NEW_RINGING_CONNECTION)");

                    if (getActiveFgCallState().isDialing() || hasMoreThanOneRingingCall()) {

                        Connection c = (Connection) ((AsyncResult) msg.obj).result;

                        try {

                            Log.d(LOG_TAG, "silently drop incoming call: " + c.getCall());

                            c.getCall().hangup();

                        } catch (CallStateException e) {

                            Log.w(LOG_TAG, "new ringing connection", e);

                        }

                    } else {

                        mNewRingingConnectionRegistrants.notifyRegistrants((AsyncResult) msg.obj);

                    }

                    break;

                case EVENT_UNKNOWN_CONNECTION:

                    if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_UNKNOWN_CONNECTION)");

telephony/java/com/android/internal/telephony/sip/SipPhone.java

+0 −1
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ public class SipPhone extends SipPhoneBase { 
            setState(Call.State.DIALING);

            mSipAudioCall = mSipManager.makeAudioCall(mProfile, mPeer, null,

                    TIMEOUT_MAKE_CALL);

            mSipAudioCall.setRingbackToneEnabled(false);

            mSipAudioCall.setListener(mAdapter);

        }