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

Commit 93171b74 authored by android-build SharedAccount's avatar android-build SharedAccount
Browse files

Merge branch 'eclair' into eclair-release

parents 46e510b0 063d03ed

core/java/android/accounts/AccountManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -152,8 +152,7 @@ public class AccountManagerService 
            new AtomicReference<AccountManagerService>();



    private static final boolean isDebuggableMonkeyBuild =

            SystemProperties.getBoolean("monkey.running", false)

                    && SystemProperties.getBoolean("ro.debuggable", false);

            SystemProperties.getBoolean("ro.monkey", false);

    private static final Account[] EMPTY_ACCOUNT_ARRAY = new Account[]{};



    static {

core/java/android/provider/ContactsContract.java

+22 −22
Original line number Diff line number Diff line
@@ -48,49 +48,49 @@ import java.io.InputStream; 
 * ContactsContract defines an extensible database of contact-related

 * information. Contact information is stored in a three-tier data model:

 * </p>

 * <blockquote>

 * <p>

 * <ul>

 * <li>

 * The {@link Data} table contains all kinds of personal data: phone numbers,

 * email addresses etc. The list of data kinds that can be stored in this table

 * is open-ended. There is a predefined set of common kinds, but any application

 * can add its own data kinds.

 * </p>

 * <p>

 * </li>

 * <li>

 * A row in the {@link RawContacts} table represents a set of Data describing a

 * person and associated with a single account.

 * </p>

 * <p>

 * </li>

 * <li>

 * A row in the {@link Contacts} table represents an aggregate of one or more

 * RawContacts presumably describing the same person.

 * </p>

 * </blockquote>

 * </li>

 * </ul>

 * <p>

 * Other tables include:

 * </p>

 * <blockquote>

 * <p>

 * <ul>

 * <li>

 * {@link Groups}, which contains information about raw contact groups - the

 * current API does not support the notion of groups spanning multiple accounts.

 * </p>

 * <p>

 * </li>

 * <li>

 * {@link StatusUpdates}, which contains social status updates including IM

 * availability.

 * </p>

 * <p>

 * </li>

 * <li>

 * {@link AggregationExceptions}, which is used for manual aggregation and

 * disaggregation of raw contacts

 * </p>

 * <p>

 * </li>

 * <li>

 * {@link Settings}, which contains visibility and sync settings for accounts

 * and groups.

 * </p>

 * <p>

 * </li>

 * <li>

 * {@link SyncState}, which contains free-form data maintained on behalf of sync

 * adapters

 * </p>

 * <p>

 * {@link PhoneLookup}, which is used for quick caller-ID lookup</id>

 * </blockquote>

 * </li>

 * <li>

 * {@link PhoneLookup}, which is used for quick caller-ID lookup</li>

 * </ul>

 */

@SuppressWarnings("unused")

public final class ContactsContract {

core/java/android/server/BluetoothA2dpService.java

+2 −1
Original line number Diff line number Diff line
@@ -463,7 +463,8 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub { 
                mAudioManager.setParameters("A2dpSuspended=false");

            }



            if (state == BluetoothA2dp.STATE_CONNECTING ||

            if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&

                    state == BluetoothA2dp.STATE_CONNECTING ||

                    state == BluetoothA2dp.STATE_CONNECTED) {

                // We have connected or attempting to connect.

                // Bump priority

docs/html/guide/appendix/faq/commontasks.jd

+2 −4
Original line number Diff line number Diff line
@@ -160,11 +160,9 @@ It is not necessary to put external JARs in the assets folder. 
    <li>Create an {@link android.app.AlertDialog app.AlertDialog} class </li>

    <li>Set the {@link android.R.style#Theme_Dialog} <em>theme</em> attribute to <code>&#064;android:style/Theme.Dialog</code>

        in your AndroidManifest.xml file. For example:    

</ul>

<blockquote>

    <pre>&lt;activity class=&quot;AddRssItem&quot; android:label=&quot;Add an item&quot; android:theme=&quot;&#064;android:style/Theme.Dialog&quot;/&gt;

</pre>

</blockquote>

</pre></li>

</ul>

<p>Calling startActivity() or startActivityForResult() will open a new screen in whatever

    way it defines itself (if it uses a floating theme it will be floating,

    otherwise it will be full screen). </p>

docs/html/guide/developing/tools/adb.jd

+2 −2
Original line number Diff line number Diff line
@@ -83,12 +83,12 @@ page.title=Android Debug Bridge 


<p>The server then sets up connections to all running emulator/device instances. It locates emulator/device instances by scanning odd-numbered ports in the range 5555 to 5585, the range used by emulators/devices. Where the server finds an adb daemon, it sets up a connection to that port. Note that each emulator/device instance acquires a pair of sequential ports &mdash; an even-numbered port for console connections and an odd-numbered port for adb connections. For example: </p>



<blockquote>

<p style="margin-left:2em">

Emulator 1, console: 5554<br/>

Emulator 1, adb: 5555<br>

Emulator 2, console: 5556<br>

Emulator 2, adb: 5557 ...

</blockquote>

</p>



<p>As shown, the emulator instance connected to adb on port 5555 is the same as the instance whose console listens on port 5554. </p>