Merge commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036' into kraken
* commit 'a3d5549c802bc4fbf1e1ca05bc3552db17212036':
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp
* commit '098e58da93f304d7d7791f193c6237870b94989d':
Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
This avoids problems if the time is reset while shutting down.
Change-Id: I54c7c787e55648ebf5a68e79056f92fbac0081ae
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken
* commit 'f9e90378d50210298d1cec2b913653597cd62be4':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
Merge commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7' into froyo-plus-aosp
* commit 'bc284a5f9f1e3f19ddd45cfb233f0d1775b612a7':
Move the public method HttpDateTime.parse() into AndroidHttpClient.
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
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.
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 '128f1a87c55a291109ce521a92308c186e5d2db5' into kraken
* commit '128f1a87c55a291109ce521a92308c186e5d2db5':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Merge commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a' into froyo-plus-aosp
* commit '6024ca5c90203b6c33acc6adfbf7e4e613549a0a':
Fix bug 2185026 - back button in context menu now calls onContextMenuClosed()
Look for corrupted bytes and replace with ?
If the problem is in the parsing code, then this will not help.
Change-Id: If33643f126a4099d4113e37760c6ef74683fe97e
Merge commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e' into kraken
* commit '15be35f6c9a88f453ba3a6be8d93fed8537ad77e':
Fix 2538826: Allow aspect of LockPatternView to be customized.
Merge commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6' into froyo-plus-aosp
* commit 'bf1259b8a6a44d7a4eab5131cd33dac0fbcb50b6':
Fix 2538826: Allow aspect of LockPatternView to be customized.
This fixes a problem where the pattern unlock area shrank on
mdpi devices.
This change is required since some devices (mdpi) don't have
enough vertical room to show a square LockPatternView and shrink
the area to match the minimum of width and height. To fix the
problem and minimize changes to existing platforms, the parameter
is configurable and has a default in values/donottranslate that
emulates the old behavior. New behavior for mdpi devices is
specified in values-port-mdpi/donottranslate, which is the
only place we currently see the problem.
Tested:
mdpi device in both orientations
hdpi device in both orientations
hdpi device in both orientations with keyboard open/closed
Change-Id: I3b9a5ef1d9b5e70f7b1823c9f48a3938f52cc7a4
Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken
* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
Don't load photo if it's id is 0. Saves one database query
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp
* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
Don't load photo if it's id is 0. Saves one database query
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken
* commit '3e9032e646c898a725c256c90031494cc349eea0':
Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
Some applications are setting the MIME type field for an http:
intent, which is technically wrong because the recipient opening
the URI will get the MIME type from the header. This was hitting
a bug when we compute the intent filter when setting the
preferred activity, where we have to set both the MIME type and
data URI for the intent filter. (For file: and content: URIs
only the MIME type is needed, since these can be opened directly
through ContentResolver so everyone is presumed to be able to
handle them.)
Change-Id: Ia7025e6859e9c90997bf56c2c80f225fca7a2007
