Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp
* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
Make media scanner read the jpeg orientation tag.
Merge commit '5136e726015b2bea3309f44c503ccc49e264cdb6'
* commit '5136e726015b2bea3309f44c503ccc49e264cdb6':
Don't snap the initialScale to min or max if it is not defined.
Merge commit 'f53c1865248dd2b38f8c24a0419d550330619b19' into eclair-plus-aosp
* commit 'f53c1865248dd2b38f8c24a0419d550330619b19':
Don't snap the initialScale to min or max if it is not defined.
Merge commit '5b4aa6db428263aa0a48ab3efb896df66a852bce' into eclair-plus-aosp
* commit '5b4aa6db428263aa0a48ab3efb896df66a852bce':
VpnService: use Credentials instead of CertTool.
Fixes http://b/issue?id=2118143
"Sometimes clicking a contact suggestion opens the
wrong activity in Contacts"
Change-Id: Ie4c150e91e455949e9f17245920850cfe7e6599e
Merge commit 'f145f5c31028746e89a9a9f6f4cafe203043cc62'
* commit 'f145f5c31028746e89a9a9f6f4cafe203043cc62':
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
Merge commit '585c67f70f18b8879ced854c5865141d6c650cd8' into eclair-plus-aosp
* commit '585c67f70f18b8879ced854c5865141d6c650cd8':
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
* changes:
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
These are not stable, since any variance in the inverse matrix (even in the lowest bit) can cause some other
part of the ninepatch to start a hair to the left, resulting in misaligning every 3 pixels.
The fix changes the matrix' phase enough to keep all of the stretched ninepatches in phase.
Merge commit '302b363c5ed5672406f7a216929c42fddc68f053'
* commit '302b363c5ed5672406f7a216929c42fddc68f053':
Add search_mode flag to intents launched by QSB suggestions
Merge commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d' into eclair-plus-aosp
* commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d':
Add search_mode flag to intents launched by QSB suggestions
Merge commit 'a945ebadfcca0dbe3587d395e205470d7f23337d'
* commit 'a945ebadfcca0dbe3587d395e205470d7f23337d':
Fix the incorrect field name in EAP wifi network.
There was a regression introduced in AudioFlinger by change 24114 for suspended output:
The suspended output was not reading and mixing audio tracks.
When the phone is ringing, the A2DP output is suspended if the SCO headset and A2DP headset are the same. As the ringtone is played over the duplicated output, the fact that the A2DP output was not reading data was causing the hardware output to be stalled from time to time.
Merge commit '5f55d8c9d447f492aed955ac29454e0c482a4956' into eclair-plus-aosp
* commit '5f55d8c9d447f492aed955ac29454e0c482a4956':
Fix the incorrect field name in EAP wifi network.
Merge commit '6f462b06fdbe7d6bdb19ee14a6db1427ed36fd0c'
* commit '6f462b06fdbe7d6bdb19ee14a6db1427ed36fd0c':
Fix the issue of 'Wifi framework is not aware of state change'
Merge commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f' into eclair-plus-aosp
* commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f':
Fix the issue of 'Wifi framework is not aware of state change'
Merge commit '33c9d2492e9afd863841892d4a5ac2facbc716b8'
* commit '33c9d2492e9afd863841892d4a5ac2facbc716b8':
Basic API for third-party apps to define custom Data rows.
Merge commit '9cea89c103bc876bb083a9ac1b845534dca6172b' into eclair-plus-aosp
* commit '9cea89c103bc876bb083a9ac1b845534dca6172b':
Basic API for third-party apps to define custom Data rows.
Merge commit '678fa1898f8928cd6b81d2fe60ed54af60be3695'
* commit '678fa1898f8928cd6b81d2fe60ed54af60be3695':
PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
Merge commit '94db928d8cf5a69e8c2907fc33a6d656045f263d' into eclair-plus-aosp
* commit '94db928d8cf5a69e8c2907fc33a6d656045f263d':
PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
Merge commit '9ca231c5b616f7240021906b0decd1d412df00ab'
* commit '9ca231c5b616f7240021906b0decd1d412df00ab':
Basic API for third-party apps to define custom Data rows.
This allows us to support binary proximity sensors that only return 0.0 and 1.0
Change-Id: Ifaf3a4e6fc720cb246ac3558e3e733b4b612c95b
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '3f0476a4e283ce4e55caac016293dafe9dca11fa' into eclair-plus-aosp
* commit '3f0476a4e283ce4e55caac016293dafe9dca11fa':
Basic API for third-party apps to define custom Data rows.
To display styled ContactsContract.Data rows in UI, this
change adds basic styling attributes that third-party apps
can use. The Contacts app parses these structures before
displaying Data rows with unrecognized MIME-types.
Partially fixes http://b/2126691
Problem:
Connect to AP with WEP security.
Change AP's WEP password.
Phone will quickly reassociated (less than in 5 sec) and will not restart full "reconnect".
Indication will show "connected" but it will be no network access.
Fix: (for non-static IP only)
With WEP mode, the association could be successful if we change the AP's WEP password. However,
the phone wont be able to send/recv any traffic with the old password. What we could quickly
fix here is to send the DHCP request if the network is not configured to use static IP. We
can do nothing but ping access point to see if it we are able to communicate with it.
Merge commit 'da2c7b79808f755af148fdb9ee2be30b11e84085'
* commit 'da2c7b79808f755af148fdb9ee2be30b11e84085':
Implement more type checks on Allocations.
Merge commit 'cd263b5c072703e80fe43e46baa831304441369b' into eclair-plus-aosp
* commit 'cd263b5c072703e80fe43e46baa831304441369b':
Implement more type checks on Allocations.
* changes:
Implement more type checks on Allocations. Add tracking for allocations created using the "sized" helper. Add more param validation for data upload calls.
Merge commit 'e5910775c892f37ddc05c63eeaf62b74228cfb30'
* commit 'e5910775c892f37ddc05c63eeaf62b74228cfb30':
Make IBackupTransport.finishBackup() also return an int code, since it too can
