Merge branch 'gingerbread' into gingerbread-release (ab021f99) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -5267,7 +5267,14 @@ public class Intent implements Parcelable, Cloneable {
		b.append(' ');
		}
		first = false;
		b.append("dat=").append(mData);
		b.append("dat=");
		if (mData.getScheme().equalsIgnoreCase("tel")) {
		b.append("tel:xxx-xxx-xxxx");
		} else if (mData.getScheme().equalsIgnoreCase("smsto")) {
		b.append("smsto:xxx-xxx-xxxx");
		} else {
		b.append(mData);
		}
		}
		if (mType != null) {
		if (!first) {

core/java/android/content/SyncStorageEngine.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -411,7 +411,7 @@ public class SyncStorageEngine extends Handler {
		}

		public void setSyncAutomatically(Account account, String providerName, boolean sync) {
		Log.d(TAG, "setSyncAutomatically: " + account + ", provider " + providerName
		Log.d(TAG, "setSyncAutomatically: " + /account +/ ", provider " + providerName
		+ " -> " + sync);
		synchronized (mAuthorities) {
		AuthorityInfo authority = getOrCreateAuthorityLocked(account, providerName, -1, false);

core/java/android/os/StrictMode.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,10 @@ import java.util.HashMap;
		* network access on the application's main thread, where UI
		* operations are received and animations take place. Keeping disk
		* and network operations off the main thread makes for much smoother,
		* more responsive applications.
		* more responsive applications. By keeping your application's main thread
		* responsive, you also prevent
		* <a href="{@docRoot}guide/practices/design/responsiveness.html">ANR dialogs</a>
		* from being shown to users.
		*
		* <p class="note">Note that even though an Android device's disk is
		* often on flash memory, many devices run a filesystem on top of that

core/java/android/provider/Telephony.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -1205,9 +1205,8 @@ public final class Telephony {
		}

		Uri uri = uriBuilder.build();
		if (DEBUG) {
		Log.v(TAG, "getOrCreateThreadId uri: " + uri);
		}
		//if (DEBUG) Log.v(TAG, "getOrCreateThreadId uri: " + uri);

		Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
		uri, ID_PROJECTION, null, null, null);
		if (DEBUG) {

core/java/android/server/BluetoothA2dpService.java

+8 −13

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
		private final BluetoothService mBluetoothService;
		private final BluetoothAdapter mAdapter;
		private int mTargetA2dpState;
		private boolean mAdjustedPriority = false;

		private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
		@Override
		@@ -326,7 +325,10 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {

		String path = mBluetoothService.getObjectPathFromAddress(device.getAddress());

		// State is DISCONNECTED
		// State is DISCONNECTED and we are connecting.
		if (getSinkPriority(device) < BluetoothA2dp.PRIORITY_AUTO_CONNECT) {
		setSinkPriority(device, BluetoothA2dp.PRIORITY_AUTO_CONNECT);
		}
		handleSinkStateChange(device, state, BluetoothA2dp.STATE_CONNECTING);

		if (!connectSinkNative(path)) {
		@@ -491,14 +493,10 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
		mTargetA2dpState = -1;

		if (getSinkPriority(device) > BluetoothA2dp.PRIORITY_OFF &&
		state == BluetoothA2dp.STATE_CONNECTING \|\|
		state == BluetoothA2dp.STATE_CONNECTED) {
		// We have connected or attempting to connect.
		// Bump priority
		setSinkPriority(device, BluetoothA2dp.PRIORITY_AUTO_CONNECT);
		}

		if (state == BluetoothA2dp.STATE_CONNECTED) {
		// We will only have 1 device with AUTO_CONNECT priority
		// To be backward compatible set everyone else to have PRIORITY_ON
		adjustOtherSinkPriorities(device);
		@@ -515,15 +513,12 @@ public class BluetoothA2dpService extends IBluetoothA2dp.Stub {
		}

		private void adjustOtherSinkPriorities(BluetoothDevice connectedDevice) {
		if (!mAdjustedPriority) {
		for (BluetoothDevice device : mAdapter.getBondedDevices()) {
		if (getSinkPriority(device) >= BluetoothA2dp.PRIORITY_AUTO_CONNECT &&
		!device.equals(connectedDevice)) {
		setSinkPriority(device, BluetoothA2dp.PRIORITY_ON);
		}
		}
		mAdjustedPriority = true;
		}
		}

		private synchronized Set<BluetoothDevice> lookupSinksMatchingStates(int[] states) {