Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken
* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
Comment-only change to clarify the role and use of IntentService
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp
* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
Comment-only change to clarify the role and use of IntentService
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp
* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
This is a fix for http://code.google.com/p/android/issues/detail?id=907. Note that
that issue was declined without comment, but the bug (while incredibly minor)
does exist. This can be seen on the facebook app, as well as many third party apps.
Change-Id: I8f1449c47228f5f757a5baf389656e51c817b150
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken
* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
Correctly resize dialogs when measured in WRAP_CONTENT
Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
Bug #2549649
If the window had a different size than its content but the content had already
been measured with the appropriate size, the window would not be resized. This
happens in wrap_content windows (dialogs.) This change simply adds a new codition
to window resizing: if the window is wrap_content, not as big as it can be and
not as big as its content, it gets resized.
Change-Id: I1d82d03af5a15c9ad8dffa0511d5f6d522578285
Merge commit '16419aca40e9d570eef4f51133ba1b734d3012c0' into kraken
* commit '16419aca40e9d570eef4f51133ba1b734d3012c0':
Guard against NPE in SearchManagerService
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Merge commit 'c94dad83be792928206363cb43524a68b6a62ffe' into kraken
* commit 'c94dad83be792928206363cb43524a68b6a62ffe':
2568467 System crash when installing corrupt APK
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp
* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
2568467 System crash when installing corrupt APK
Also fix another crash I just saw in the package manager, when a
permission got left around from a previous install but as no
longer defined.
Change-Id: I33b87420f0c59e24b8b77fab8b0316461d99e048
Merge commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e' into kraken
* commit 'ca5e7de82b18dcd5fb8f617b40b45c95edce8c3e':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '16197a246fdeff0167f9abdc6a3da5d83759993d' into kraken
* commit '16197a246fdeff0167f9abdc6a3da5d83759993d':
Revert to previous text selection behavior
Merge commit '21390f08138801f9e008917c0c0149839a80d002' into froyo-plus-aosp
* commit '21390f08138801f9e008917c0c0149839a80d002':
Adding a feature definition for touchscreens that was overlooked in the last
Merge commit '0db37997366a4d781af48be758a9d90b6d07d7d5' into froyo-plus-aosp
* commit '0db37997366a4d781af48be758a9d90b6d07d7d5':
Revert to previous text selection behavior
Merge commit 'f84207f6ca90307b10d94e484baf55330d644c1d' into kraken
* commit 'f84207f6ca90307b10d94e484baf55330d644c1d':
Add an extra for the Disconnect Headset State.
Merge commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12' into froyo-plus-aosp
* commit 'c6af69b2684e1a95368f52e1f1614595f85c9c12':
Add an extra for the Disconnect Headset State.
There was a new behavior that starting "Select text" would allow you to
swipe from beginning to end and immediately copy that. This change
reverts to the previous behavior that "Select text" will start where
your cursor is currently and any tap will extend the selection from that
origin to the point of the tap.
Change-Id: Ib955cc8d62a652f518435953da2f54e810d9dfb0
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken
* commit '733a2f654934d452b2febf6f80cd1136830758d5':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '1b4c0d702066794b9ce97b02721aa9e552997381' into froyo-plus-aosp
* commit '1b4c0d702066794b9ce97b02721aa9e552997381':
Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3' into kraken
* commit '6c9356028cc94259c9d1f5f937d9cca1f45914d3':
Make createVideoThumbnail and createImageThumbnail look consistent.
Merge commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a' into froyo-plus-aosp
* commit '44dcf658718fcc0b563dcad50fb59e8fe507cd0a':
Make createVideoThumbnail and createImageThumbnail look consistent.
This is probably the real fix for the original bug. The last line was probably not
well formed and resulted in an overrun in the native code.
Bug: 2564824
Change-Id: I8a9cc267f8045a61eff4b5d532258afa32a8b837
Merge commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a' into kraken
* commit '6cf2c14f65336cf32dba5faa812cc2eca8c31a6a':
check for webviewcore before reading settings
Merge commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c' into froyo-plus-aosp
* commit '3eefc126e5a0b4af4738332e8d43fe2e2d00424c':
check for webviewcore before reading settings
In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.
Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
Merge commit 'e64e090e0d4f70233fac901ac1b977123f6f0452' into kraken
* commit 'e64e090e0d4f70233fac901ac1b977123f6f0452':
Only include WEB_EDIT if there are more textfields.
Merge commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e' into froyo-plus-aosp
* commit 'f9b1a092b6c86549a8257015a03ea59ebcd9a85e':
Only include WEB_EDIT if there are more textfields.
