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

Commit 60d112d8 authored by android-build SharedAccount's avatar android-build SharedAccount
Browse files

Merge branch 'eclair' into eclair-release

parents 0a0c3d80 52cde727

api/current.xml

+26 −2
Original line number Original line Diff line number Diff line
@@ -25618,7 +25618,7 @@ 
 visibility="public"

 visibility="public"

>

>

</method>

</method>

<method name="listenUsingRfcommOn"

<method name="listenUsingRfcomm"

 return="android.bluetooth.BluetoothServerSocket"

 return="android.bluetooth.BluetoothServerSocket"

 abstract="false"

 abstract="false"

 native="false"

 native="false"
@@ -25628,7 +25628,9 @@ 
 deprecated="not deprecated"

 deprecated="not deprecated"

 visibility="public"

 visibility="public"

>

>

<parameter name="channel" type="int">

<parameter name="name" type="java.lang.String">

</parameter>

<parameter name="uuid" type="android.os.ParcelUuid">

</parameter>

</parameter>

<exception name="IOException" type="java.io.IOException">

<exception name="IOException" type="java.io.IOException">

</exception>

</exception>
@@ -27787,6 +27789,28 @@ 
<parameter name="makeMap" type="boolean">

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

</parameter>

</parameter>

</method>

</method>

<method name="isInitialStickyBroadcast"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="isOrderedBroadcast"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onReceive"

<method name="onReceive"

 return="void"

 return="void"

 abstract="true"

 abstract="true"

cmds/am/src/com/android/commands/am/Am.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -340,7 +340,8 @@ public class Am { 
        private boolean mFinished = false;

        private boolean mFinished = false;





        public synchronized void performReceive(

        public synchronized void performReceive(

                Intent intent, int rc, String data, Bundle ext, boolean ord) {

                Intent intent, int rc, String data, Bundle ext, boolean ord,

                boolean sticky) {

            String line = "Broadcast completed: result=" + rc;

            String line = "Broadcast completed: result=" + rc;

            if (data != null) line = line + ", data=\"" + data + "\"";

            if (data != null) line = line + ", data=\"" + data + "\"";

            if (ext != null) line = line + ", extras: " + ext;

            if (ext != null) line = line + ", extras: " + ext;

cmds/dumpstate/dumpstate.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,10 @@ 
#include <cutils/sockets.h>

#include <cutils/sockets.h>

#include "private/android_filesystem_config.h"

#include "private/android_filesystem_config.h"





#define LOG_NDEBUG 0

#define LOG_TAG "dumpstate"

#include <utils/Log.h>



#include "dumpstate.h"

#include "dumpstate.h"





static char* const gzip_args[] = { "gzip", "-6", 0 };

static char* const gzip_args[] = { "gzip", "-6", 0 };
@@ -182,6 +186,8 @@ int main(int argc, char *argv[]) { 
    pid_t   pid;

    pid_t   pid;

    gid_t groups[] = { AID_LOG, AID_SDCARD_RW };

    gid_t groups[] = { AID_LOG, AID_SDCARD_RW };





    LOGI("begin\n");



    /* set as high priority, and protect from OOM killer */

    /* set as high priority, and protect from OOM killer */

    setpriority(PRIO_PROCESS, 0, -20);

    setpriority(PRIO_PROCESS, 0, -20);

    protect_from_oom_killer();

    protect_from_oom_killer();
@@ -332,6 +338,8 @@ int main(int argc, char *argv[]) { 
    /* so gzip will terminate */

    /* so gzip will terminate */

    close(STDOUT_FILENO);

    close(STDOUT_FILENO);





    LOGI("done\n");



    return 0;

    return 0;

}

}

core/java/android/accounts/AccountAuthenticatorResponse.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,7 @@ import android.os.Parcel; 
import android.os.RemoteException;

import android.os.RemoteException;





/**

/**

 * Object that wraps calls to an {@link IAccountAuthenticatorResponse} object.

 * Object used to communicate responses back to the AccountManager

 * TODO: this interface is still in flux

 */

 */

public class AccountAuthenticatorResponse implements Parcelable {

public class AccountAuthenticatorResponse implements Parcelable {

    private IAccountAuthenticatorResponse mAccountAuthenticatorResponse;

    private IAccountAuthenticatorResponse mAccountAuthenticatorResponse;

core/java/android/accounts/AccountManager.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -44,8 +44,7 @@ import com.google.android.collect.Maps; 
/**

/**

 * A class that helps with interactions with the AccountManagerService. It provides

 * A class that helps with interactions with the AccountManagerService. It provides

 * methods to allow for account, password, and authtoken management for all accounts on the

 * methods to allow for account, password, and authtoken management for all accounts on the

 * device. Some of these calls are implemented with the help of the corresponding

 * device. One accesses the {@link AccountManager} by calling:

 * {@link IAccountAuthenticator} services. One accesses the {@link AccountManager} by calling:

 *    AccountManager accountManager = AccountManager.get(context);

 *    AccountManager accountManager = AccountManager.get(context);

 *

 *

 * <p>

 * <p>