64142 Commits

Author SHA1 Message Date
Wink Saville
bbfec33d94 am f817e941: am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
* commit 'f817e9413356de2a303e14709e67457190e976c9':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
2012-01-06 14:32:37 -08:00
Wink Saville
f817e94133 am 2f143a96: Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1
* commit '2f143a966ccfec71de2c3a9785f5f3f47d418acb':
  Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
2012-01-06 14:30:20 -08:00
Wink Saville
2f143a966c Merge "Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete" into ics-mr1 2012-01-06 14:27:56 -08:00
Fabrice Di Meglio
5c9fe80e7a am 42e231bf: (-s ours) am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
* commit '42e231bf4a9995c334fa134aa21f859fa1f719fc':
  Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
2012-01-06 14:23:29 -08:00
Fabrice Di Meglio
42e231bf4a am c1d03cff: Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1
* commit 'c1d03cff271d81fc9948648583e9e07c0c624dc1':
  Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
2012-01-06 14:20:41 -08:00
Fabrice Di Meglio
c1d03cff27 Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE" into ics-mr1 2012-01-06 14:19:20 -08:00
Justin Ho
1317108e18 am bc72272c: am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
* commit 'bc72272cc07398a5dd6d7c76fb3eac91ad3e2bd8':
  Fixing crash when taking screenshot over secure window.
2012-01-06 14:13:47 -08:00
Justin Ho
fe3eb938ca am 7db47a42: am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '7db47a42f1211befb015a7a9640f0c447b477228':
  Updating default image wallpaper for tablet.
2012-01-06 14:13:38 -08:00
Justin Ho
bc72272cc0 am beb8be60: Merge "Fixing crash when taking screenshot over secure window." into ics-mr1
* commit 'beb8be60d157e4812e0195c2e445aa0abb82d9a2':
  Fixing crash when taking screenshot over secure window.
2012-01-06 14:10:01 -08:00
Justin Ho
7db47a42f1 am 3116b7a7: Merge "Updating default image wallpaper for tablet." into ics-mr1
* commit '3116b7a7ca6681daabbdac55e71203995e7a7afe':
  Updating default image wallpaper for tablet.
2012-01-06 14:09:59 -08:00
Justin Ho
beb8be60d1 Merge "Fixing crash when taking screenshot over secure window." into ics-mr1 2012-01-06 14:07:51 -08:00
Justin Ho
3116b7a7ca Merge "Updating default image wallpaper for tablet." into ics-mr1 2012-01-06 14:07:37 -08:00
George Mount
5755d01d2c Merge "Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI." 2012-01-06 14:00:30 -08:00
George Mount
427f2e5ac5 Remove GET_NATIVE_VIEW from WebViewCore to reduce JNI.
Bug 5827817
 Added a nativeClass parameter to all appropriate JNI methods
 and used it instead of GET_NATIVE_VIEW to reduce JNI overhead.

 Webkit Change: I02004fe1

Change-Id: I49c7ecfd598826ffe78067aab393a24860ce10ef
2012-01-06 13:58:27 -08:00
Guang Zhu
128386ca9a Merge "Small tweaks to Tile Benchmark test" 2012-01-06 11:21:07 -08:00
Steve Block
f4c2294b01 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 2012-01-06 10:30:56 -08:00
George Mount
d88f26e3aa Merge "Clean up code using eclipse's automatic cleanup feature." 2012-01-06 09:53:01 -08:00
Marco Nelissen
18c6afa0c5 Merge "Also accept non-parenthesized genre numbers" 2012-01-06 08:08:15 -08:00
Jonathan Dixon
5883520fd7 Merge "Make WebView.HitTestResult static" 2012-01-06 02:19:31 -08:00
Steve Block
8564c8da81 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
2012-01-06 10:07:54 +00:00
Ken Wakasa
c42e6a0bed Merge "Comment clean up for InputMethodSubtype." 2012-01-05 19:45:30 -08:00
Rajdeep Dua
3dc5a2eacf Merge "Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType) Bug Id : 5813366" 2012-01-05 19:41:23 -08:00
Ken Wakasa
9a74476c0a Comment clean up for InputMethodSubtype.
Change-Id: I50bca715f4caa669cb341b36a3d46358e1ad1ded
2012-01-06 12:32:15 +09:00
Wink Saville
17907a7b74 Fix an RuntimeExcpetion in GsmDCT.onDataSetupComplete
Instead of throwing an exception when the connection between
the DCT and a DC is broken (i.e. its null) it is treated as
an error with a new cause. And thus will be handled as other
typical errors.

Bug: 5798643
Change-Id: I46f1660ae78f118b54ab62504809723ca302b2ef
2012-01-05 17:21:46 -08:00
Fabrice Di Meglio
d4a69b4a1c Merge "Fix bug #5753006 Garbled Labels in Maps" 2012-01-05 15:18:52 -08:00
Guang Zhu
57420bf883 Small tweaks to Tile Benchmark test
* tag the module as 'tests' so the apk gets includes in test build
* merge the instrumentation into TileBenchmark app and eliminate
  the test apk entirely
* changed the default test suite to 'alexa25_2011' which is a suite
  of pages based on top 25 news sites from alexa, includes primarily
  english sites, and 3 CJK sites

Change-Id: Icd40a70b560bfd7c521adf8ad4b1068483698103
2012-01-05 15:16:42 -08:00
Marco Nelissen
ad35f9165e Also accept non-parenthesized genre numbers
b/5790684

Change-Id: Ia13feebeaadd45d9196486c012538c5b80840163
2012-01-05 15:15:53 -08:00
George Mount
fab67a1532 Clean up code using eclipse's automatic cleanup feature.
Bug 5826249

Change-Id: Iacd233625e144cdc522644aafee424aabd6a7f5d
2012-01-05 15:08:27 -08:00
Teng-Hui Zhu
a4ad2928eb Merge "getDuration can be only called after prepared." 2012-01-05 14:47:01 -08:00
David Hu
0df0ed5814 Merge "BandwidthTestRunner" 2012-01-05 14:39:45 -08:00
Fabrice Di Meglio
a0a117b4c1 Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long - DO NOT MERGE
- do not clear the smart pointer when the cache entry does not fit the cache size

See http://code.google.com/p/android/issues/detail?id=23337

Change-Id: Id4533d9f8a396c310c9215157ec5a4c07f30c7f2
2012-01-05 14:34:42 -08:00
Marco Nelissen
4b4d00e714 Merge "ThumbnailUtils: To fix misuse of FileInputStream." 2012-01-05 14:11:40 -08:00
Steve Block
bd47cac4df Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:07:02 -08:00
Fabrice Di Meglio
c726ff02c7 Merge "Fix bug #5822825 Paint.measureText (char[] text, int index, int count) cannot handle text more than 32K long" 2012-01-05 13:55:01 -08:00
Fabrice Di Meglio
c511bee87c Fix bug #5753006 Garbled Labels in Maps
- it was a regression introduced into this CL: https://android-git.corp.google.com/g/#/c/154240/5
- basically needed to set the GlyphID encoding to the Skia Paint as we are now using glyphID resulting
from the Harfbuzz shaping
- also define GlyphID encoding as the default on the Paint class

Change-Id: Idb7c2c57ac67595425ce3be9421258962690fcdd
2012-01-05 13:30:54 -08:00
Scott Main
d1a8229227 am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit '47228cac900cd58d0687b6e6d980381cfc8010a1':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
2012-01-05 12:09:07 -08:00
The Android Open Source Project
b1483cb9ca am d32ee5ba: Reconcile with ics-mr1-release
* commit 'd32ee5baa057992431263907ec5cf8f19b43c043':
2012-01-05 12:08:48 -08:00
Robert Greenwalt
32350c7ab2 Merge "Filter our v6 address from tethering dns." 2012-01-05 11:39:26 -08:00
Scott Main
47228cac90 am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
2012-01-05 09:45:19 -08:00
Scott Main
dacbf67ab9 Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* changes:
  docs: second set of diagram updates
  docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
2012-01-05 09:42:52 -08:00
Glenn Kasten
6b14d58580 Merge "Remove the notion of "active track" from mixer" 2012-01-05 08:20:10 -08:00
The Android Open Source Project
d32ee5baa0 Reconcile with ics-mr1-release
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
2012-01-05 07:45:28 -08:00
Glenn Kasten
a8719ad9d5 Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" 2012-01-05 07:38:29 -08:00
Glenn Kasten
e80a4ccd2b Use the standard CC_LIKELY and CC_UNLIKELY macros
Several source files privately defined macros LIKELY and UNLIKELY in terms
of __builtin_expect. But <cutils/compiler.h> already has CC_LIKELY and
CC_UNLIKELY which are intended for this purpose.  So rename the private
uses to use the standard names.

In addition, AudioFlinger was relying on the macro expanding to extra ( ).

Change-Id: I2494e087a0c0cac0ac998335f5e9c8ad02955873
2012-01-05 07:33:45 -08:00
Rajdeep Dua
cf06d7390c Bug fix for android.animation.LayoutTransition getStartDelay (int transitionType)
Bug Id : 5813366

Change-Id: Icc482ad820a91a1896c61db67bb6b95cc2ae4c5b
2012-01-05 16:27:15 +05:30
Dongwon Kang
3993818689 ThumbnailUtils: To fix misuse of FileInputStream.
We need to close it explicitly after using it. Without this, fd will be closed
non-deterministically, and that will break the decode procedure.

Bug: 5808889
Change-Id: Icf9ff9abd6e327b122c6916df9750016b3d1b616
2012-01-05 17:17:48 +09:00
Wink Saville
9a03482c66 am 3ed28036: am c697ebfd: Merge "Enhancement on ICS data stall polling logic" into ics-mr1
* commit '3ed2803691cc271fe6b893dc46d49fca2fce61df':
  Enhancement on ICS data stall polling logic
2012-01-04 21:52:13 -08:00
Wink Saville
efd617e01f am 0ad96f89: am d4d35168: Merge "Add support of dislaying Alpha tag for BIP commands" into ics-mr1
* commit '0ad96f89401920486b68d8404f6a143870d57500':
  Add support of dislaying Alpha tag for BIP commands
2012-01-04 21:52:10 -08:00
Wink Saville
7da207b574 am a3534ad4: am c97d0e43: Merge "Support suggestedRetryTime in CDMA DCT" into ics-mr1
* commit 'a3534ad4a4b936a2629f4a0b854b814b3494ac7e':
  Support suggestedRetryTime in CDMA DCT
2012-01-04 21:52:06 -08:00
Bart Sears
39f0554098 am 875b6992: (-s ours) am 705665ac: Merge "Do not allow file:// access when it is disabled. Do not merge." into ics-mr1
* commit '875b69928193e464243cf491bfe861f30644e9b4':
  Do not allow file:// access when it is disabled. Do not merge.
2012-01-04 21:52:04 -08:00