am 030b0ebe: merge from froyo-plus-aosp (e4031a37) · Commits · e / os / android_frameworks_base

core/java/android/net/http/HttpsConnection.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -204,10 +204,13 @@ public class HttpsConnection extends Connection {
		BasicHttpRequest proxyReq = new BasicHttpRequest
		("CONNECT", mHost.toHostString());

		// add all 'proxy' headers from the original request
		// add all 'proxy' headers from the original request, we also need
		// to add 'host' header unless we want proxy to answer us with a
		// 400 Bad Request
		for (Header h : req.mHttpRequest.getAllHeaders()) {
		String headerName = h.getName().toLowerCase();
		if (headerName.startsWith("proxy") \|\| headerName.equals("keep-alive")) {
		if (headerName.startsWith("proxy") \|\| headerName.equals("keep-alive")
		\|\| headerName.equals("host")) {
		proxyReq.addHeader(h);
		}
		}

core/java/android/server/BluetoothEventLoop.java

+30 −3

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ import android.util.Log;

		import java.util.HashMap;
		import java.util.Set;
		import android.os.PowerManager;


		/**
		* TODO: Move this to
		@@ -51,6 +53,9 @@ class BluetoothEventLoop {
		private final BluetoothService mBluetoothService;
		private final BluetoothAdapter mAdapter;
		private final Context mContext;
		// The WakeLock is used for bringing up the LCD during a pairing request
		// from remote device when Android is in Suspend state.
		private PowerManager.WakeLock mWakeLock;

		private static final int EVENT_AUTO_PAIRING_FAILURE_ATTEMPT_DELAY = 1;
		private static final int EVENT_RESTART_BLUETOOTH = 2;
		@@ -121,6 +126,11 @@ class BluetoothEventLoop {
		mContext = context;
		mPasskeyAgentRequestData = new HashMap();
		mAdapter = adapter;
		//WakeLock instantiation in BluetoothEventLoop class
		PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
		mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK \| PowerManager.ACQUIRE_CAUSES_WAKEUP
		\| PowerManager.ON_AFTER_RELEASE, TAG);
		mWakeLock.setReferenceCounted(false);
		initializeNativeDataNative();
		}

		@@ -458,37 +468,46 @@ class BluetoothEventLoop {
		mHandler.sendMessageDelayed(message, 1500);
		return;
		}

		// Acquire wakelock during PIN code request to bring up LCD display
		mWakeLock.acquire();
		Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);
		intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));
		intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
		BluetoothDevice.PAIRING_VARIANT_CONSENT);
		mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
		// Release wakelock to allow the LCD to go off after the PIN popup notifcation.
		mWakeLock.release();
		return;
		}

		private void onRequestPasskeyConfirmation(String objectPath, int passkey, int nativeData) {
		String address = checkPairingRequestAndGetAddress(objectPath, nativeData);
		if (address == null) return;

		// Acquire wakelock during PIN code request to bring up LCD display
		mWakeLock.acquire();
		Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);
		intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));
		intent.putExtra(BluetoothDevice.EXTRA_PASSKEY, passkey);
		intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
		BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION);
		mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
		// Release wakelock to allow the LCD to go off after the PIN popup notifcation.
		mWakeLock.release();
		return;
		}

		private void onRequestPasskey(String objectPath, int nativeData) {
		String address = checkPairingRequestAndGetAddress(objectPath, nativeData);
		if (address == null) return;

		// Acquire wakelock during PIN code request to bring up LCD display
		mWakeLock.acquire();
		Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);
		intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));
		intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
		BluetoothDevice.PAIRING_VARIANT_PASSKEY);
		mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
		// Release wakelock to allow the LCD to go off after the PIN popup notifcation.
		mWakeLock.release();
		return;
		}

		@@ -526,10 +545,14 @@ class BluetoothEventLoop {
		}
		}
		}
		// Acquire wakelock during PIN code request to bring up LCD display
		mWakeLock.acquire();
		Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);
		intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));
		intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.PAIRING_VARIANT_PIN);
		mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
		// Release wakelock to allow the LCD to go off after the PIN popup notifcation.
		mWakeLock.release();
		return;
		}

		@@ -537,12 +560,16 @@ class BluetoothEventLoop {
		String address = checkPairingRequestAndGetAddress(objectPath, nativeData);
		if (address == null) return;

		// Acquire wakelock during PIN code request to bring up LCD display
		mWakeLock.acquire();
		Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);
		intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));
		intent.putExtra(BluetoothDevice.EXTRA_PASSKEY, passkey);
		intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
		BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY);
		mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);
		//Release wakelock to allow the LCD to go off after the PIN popup notifcation.
		mWakeLock.release();
		}

		private boolean onAgentAuthorize(String objectPath, String deviceUuid) {

core/java/android/webkit/MimeTypeMap.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -369,10 +369,13 @@ public class MimeTypeMap {
		sMimeTypeMap.loadEntry("application/x-xfig", "fig");
		sMimeTypeMap.loadEntry("application/xhtml+xml", "xhtml");
		sMimeTypeMap.loadEntry("audio/3gpp", "3gpp");
		sMimeTypeMap.loadEntry("audio/amr", "amr");
		sMimeTypeMap.loadEntry("audio/basic", "snd");
		sMimeTypeMap.loadEntry("audio/midi", "mid");
		sMimeTypeMap.loadEntry("audio/midi", "midi");
		sMimeTypeMap.loadEntry("audio/midi", "kar");
		sMimeTypeMap.loadEntry("audio/midi", "xmf");
		sMimeTypeMap.loadEntry("audio/mobile-xmf", "mxmf");
		sMimeTypeMap.loadEntry("audio/mpeg", "mpga");
		sMimeTypeMap.loadEntry("audio/mpeg", "mpega");
		sMimeTypeMap.loadEntry("audio/mpeg", "mp2");

core/java/android/widget/TextView.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -4515,6 +4515,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		partialStartOffset = 0;
		partialEndOffset = N;
		} else {
		// Now use the delta to determine the actual amount of text
		// we need.
		partialEndOffset += delta;
		// Adjust offsets to ensure we contain full spans.
		if (content instanceof Spanned) {
		Spanned spanned = (Spanned)content;
		@@ -4530,10 +4533,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		}
		}
		outText.partialStartOffset = partialStartOffset;
		outText.partialEndOffset = partialEndOffset;
		// Now use the delta to determine the actual amount of text
		// we need.
		partialEndOffset += delta;
		outText.partialEndOffset = partialEndOffset - delta;

		if (partialStartOffset > N) {
		partialStartOffset = N;
		} else if (partialStartOffset < 0) {
		@@ -4597,6 +4598,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		+ ": " + ims.mTmpExtracted.text);
		imm.updateExtractedText(this, req.token,
		mInputMethodState.mTmpExtracted);
		ims.mChangedStart = EXTRACT_UNKNOWN;
		ims.mChangedEnd = EXTRACT_UNKNOWN;
		ims.mChangedDelta = 0;
		ims.mContentChanged = false;
		return true;
		}
		}
		@@ -6178,8 +6183,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		ims.mChangedStart = start;
		ims.mChangedEnd = start+before;
		} else {
		if (ims.mChangedStart > start) ims.mChangedStart = start;
		if (ims.mChangedEnd < (start+before)) ims.mChangedEnd = start+before;
		ims.mChangedStart = Math.min(ims.mChangedStart, start);
		ims.mChangedEnd = Math.max(ims.mChangedEnd, start + before - ims.mChangedDelta);
		}
		ims.mChangedDelta += after-before;
		}