Merge commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae' into eclair-plus-aosp
* commit '383aa124de2a830be83a4c90bdd8a3f3e03f05ae':
fix an npe when a user tries to get an auth token from an authenticator that doesn't support it, like exchange
Merge commit '991475a2e5dcb344299387521b52fb637d6b1e4d' into eclair-plus-aosp
* commit '991475a2e5dcb344299387521b52fb637d6b1e4d':
Add isScreenOn() to LocalPowerManager interface so we can call it from PhoneWindowManager
Needed for the fix for b/2260437 (device wakes itself back up when camera is last application running)
Change-Id: I0e419fcf05542df203eb3f127dde7a888416e86d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '9284dec737da58a92b3aa916a357e700d291a68a' into eclair-plus-aosp
* commit '9284dec737da58a92b3aa916a357e700d291a68a':
Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-plus-aosp
* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
docs: document the 'showSearchIconAsBadge" flag and
Add check in getOwnerPhoneNumberVcard(). If the incoming phonenumber is empty,
do not add "TEL" to vcard data.
Original Change by: Yue Lixin
DrNo: Eastham
Bug: 2247067
Merge commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51' into eclair
* commit 'dbc7e27ef10349f11ac940d59ff4f812319fce51':
docs: document the 'showSearchIconAsBadge" flag and
Merge commit '2a1e96412c66f22939c010f10524122718c7bbeb' into eclair-plus-aosp
* commit '2a1e96412c66f22939c010f10524122718c7bbeb':
Add code to use Gservices provided values for throtting NITZ updates.
The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected.
Modified HeadsetObserver to broacast a state conforming to java doc.
Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not.
Removed handling of non standard headset indications from HeadsetObserver.
Removed platform specific devices from output devices defined in AudioSystem.
Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
Merge commit '3c58d279abed1da56b0ece74ded5854c509a42a4' into eclair-plus-aosp
* commit '3c58d279abed1da56b0ece74ded5854c509a42a4':
Fix BMW and Audi auto pairing lists.
Merge commit '013b0e531a4318b3e78c9bd0e077d3632fce2280' into eclair-plus-aosp
* commit '013b0e531a4318b3e78c9bd0e077d3632fce2280':
Add BMW and Audi to Auto Pairing black list.
Merge commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259' into eclair-plus-aosp
* commit 'dc30d28bc8321171fbf4ed92a9486eb8dd382259':
Honor the mInitialScale set on WebView. This was
Also reworks this intent protocol a little bit to be much more efficient, only
requiring one broadcast per package.
Change-Id: I580de4843ebd3c7f2e6df7295a2f80d2937cef7c
Merge commit '001e5242c8a801664ea454a2ed6d4fddb600157a' into eclair-plus-aosp
* commit '001e5242c8a801664ea454a2ed6d4fddb600157a':
Fix broken handling of the BACK key in PopupWindow. Needed by Launcher2.
Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-plus-aosp
* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
New Javadoc for ContactsContract.
Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-plus-aosp
* commit '2ade6421f2d6dd615b559c951deace7143958b90':
Debugging for issue #2250075: Desk dock clock app sometimes doesn't
You can no longer receive CONFIGURATION_CHANGED in a manifest, which is really really
bad (launching apps every time the screen is rotated!). A new LOCALE_CHANGED broadcast
is sent that you can receive in a manifest.
Change-Id: I80022375f0716db2e672382a29db3cea1af74702
This adds a history of the last 100 broadcasts that is printed in the
debug log, to be able to see what recently happened at the time the
bug report was taken. Also does some optimization of the printing of
the broadcast records to make it feasible to print this number of
entries. (We kind-of need to do this because there are some broadcasts
like SIG_STR and SYNC_STATE_CHANGED that are being broadcast a LOT.)
Change-Id: I775e1ec0f63369c8bca8c83cee27b95ddc5ec450
Merge commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20' into eclair-plus-aosp
* commit '4cb6fc7ed2e4371b7ea4d053064fbeb3f86cfc20':
don't request a sync when temp providers are created
