Chet Haase
63c3ffac6b
am f425ca97: Merge "Fix display list issue that was crashing an external app."
...
* commit 'f425ca9772d5f722fc9a2569b474eb880fd89569':
Fix display list issue that was crashing an external app.
2011-09-26 14:48:20 -07:00
Chet Haase
f425ca9772
Merge "Fix display list issue that was crashing an external app."
2011-09-26 14:46:19 -07:00
Justin Ho
2e8e57eb3f
Fixed alignment on home icon
...
Bug: 5348452
Change-Id: I14fe5d27a7e9b6c1f9c9924cbcc30f9202dafa44
2011-09-26 14:46:06 -07:00
Tsu Chiang Chuang
9cf416fde6
adding packet count and removing extra uid stats that were used for debugging.
...
Change-Id: I19664ee991760b9515fc129be50be68579f8ce93
2011-09-26 14:33:24 -07:00
Chet Haase
6e6db61809
Fix display list issue that was crashing an external app.
...
The app was removing a View whilst in its onDraw() method. This meant
that we asked it for its display list and it invalidated that display list
(by removing itself) before it returned from onDraw(). We later attempted to
draw that invalid display list into its parent nad died in native code.
The fix is to check the state of the display list after the call to getDisplayList()
and to avoid doing further work with it if it's invalid.
Change-Id: I14a342b4fe79c8dce2626ff61237b447040e7f42
2011-09-26 14:32:26 -07:00
Gilles Debunne
a61fd5eb71
am 52edaa9c: Merge "Bug 5250788: TextView gets slower as the text length grows"
...
* commit '52edaa9cfb612bd20b0f718dc95e576f55d9367e':
Bug 5250788: TextView gets slower as the text length grows
2011-09-26 14:20:56 -07:00
Gilles Debunne
52edaa9cfb
Merge "Bug 5250788: TextView gets slower as the text length grows"
2011-09-26 14:18:14 -07:00
Christopher Tate
5f2f41350e
Don't hang in restore if the transport reports failure
...
Casualty of the recent refactoring: in this particular error case,
the restore sequence wasn't being directed into the finalization
state. Fixes bug 5336295.
Change-Id: Ibf5570cd1003e123da8b561685de8479663340ce
2011-09-26 13:10:38 -07:00
Daniel Sandler
e213afdbcc
am 71bfec44: am 61b645ab: Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
...
* commit '71bfec448847d8585c8a789596525dc729350877':
Update all RSSIs whenever the connectivity changes.
2011-09-26 12:41:24 -07:00
Daniel Sandler
71bfec4488
am 61b645ab: Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
...
* commit '61b645ab86ace1511593f1f1f46dfb62bf0ae8b9':
Update all RSSIs whenever the connectivity changes.
2011-09-26 12:39:01 -07:00
Daniel Sandler
61b645ab86
Merge "Update all RSSIs whenever the connectivity changes." into ics-factoryrom
2011-09-26 12:37:29 -07:00
Fabrice Di Meglio
98db742abc
am 8013290d: Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE"
...
* commit '8013290dd0e9d3eabc3611d7eca47aa50bdceed0':
Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE
2011-09-26 12:19:10 -07:00
Fabrice Di Meglio
4dad016de3
am 8eb34ed8: Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak"
...
* commit '8eb34ed88cdc43408bb73a806d6e998782d5c9b9':
Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak
2011-09-26 12:19:08 -07:00
Fabrice Di Meglio
8013290dd0
Merge "Fix bug #5366547 TruncateAt.MARQUEE should be replaces with "two dot" ellipsis on hardware that dont support MARQUEE"
2011-09-26 12:16:41 -07:00
Fabrice Di Meglio
8eb34ed88c
Merge "Fix bug #5344067 android.text.DynamicLayout.sStaticLayout can hold onto an Activity, potential memory leak"
2011-09-26 12:16:30 -07:00
The Android Open Source Project
0660e50294
am 4da465a0: Reconcile with ics-factoryrom-release
...
* commit '4da465a056f7a7322a5a4a0f235fe20e525a6eae':
Don't crash during full backup when CheckJNI is enabled
2011-09-26 12:13:33 -07:00
The Android Open Source Project
4da465a056
Reconcile with ics-factoryrom-release
...
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
2011-09-26 12:11:29 -07:00
Ben Komalo
8725bb592e
am 8154495f: am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
...
* commit '8154495fc7b09938709ded2d07e8f9419cc94be7':
Enter minimal boot mode when booting encrypted
2011-09-26 12:05:15 -07:00
Ben Komalo
8154495fc7
am 69a6d537: Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
...
* commit '69a6d537e6f29683f685ecb688f0b06b1c0b2b15':
Enter minimal boot mode when booting encrypted
2011-09-26 12:02:19 -07:00
Ben Komalo
69a6d537e6
Merge "Enter minimal boot mode when booting encrypted" into ics-factoryrom
2011-09-26 12:01:01 -07:00
Jason Sams
dca3baebf2
am d1a2f36b: Merge "Remove unused fields in ProgramRaster"
...
* commit 'd1a2f36b834534f422a17fc2324f5af839f29862':
Remove unused fields in ProgramRaster
2011-09-26 11:58:45 -07:00
Jason Sams
d1a2f36b83
Merge "Remove unused fields in ProgramRaster"
2011-09-26 11:57:41 -07:00
Andreas Huber
b1b8d56b75
am d359b575: Merge "Properly connect to surface flinger in our shell tools"
...
* commit 'd359b575f7cc0ac36caacf7bbdcaef3394830a25':
Properly connect to surface flinger in our shell tools
2011-09-26 11:28:19 -07:00
Andreas Huber
d359b575f7
Merge "Properly connect to surface flinger in our shell tools"
2011-09-26 11:26:59 -07:00
Andreas Huber
e9ee8a90e9
am 48719dc6: Merge "Propagate error signalled by the source all the way to the output EOS notification."
...
* commit '48719dc6221fdfbc3cc49a21166b136577fe37b9':
Propagate error signalled by the source all the way to the output EOS notification.
2011-09-26 11:04:49 -07:00
Andreas Huber
48719dc622
Merge "Propagate error signalled by the source all the way to the output EOS notification."
2011-09-26 11:03:05 -07:00
Andreas Huber
928baf1f54
Propagate error signalled by the source all the way to the output EOS notification.
...
Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug: 5372901
2011-09-26 10:53:29 -07:00
Jeff Sharkey
630a171216
Overlay to configure data usage network types.
...
Specify which network types should be counted when computing data
usage totals.
Bug: 5361005
Change-Id: I830caed1a29199892d209a692b50f8b3e144cafe
2011-09-26 10:50:30 -07:00
Gilles Debunne
60e10f2494
am ea1c7f3c: Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
...
* commit 'ea1c7f3c5175f6e83dddd381b9a809ec52a9320f':
Bug 5248215: Even though I turned off the Spelling correction, it still shows up
2011-09-26 10:40:27 -07:00
Gilles Debunne
ea1c7f3c51
Merge "Bug 5248215: Even though I turned off the Spelling correction, it still shows up"
2011-09-26 10:38:58 -07:00
Wink Saville
163a2e2c41
am 97224425: am 2783e1ce: Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
...
* commit '972244251add94f9906ac5ab6b25dd441ea7d8db':
Remove unused persist.radio.imsregrequired.
2011-09-26 10:29:18 -07:00
Wink Saville
972244251a
am 2783e1ce: Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
...
* commit '2783e1ce7a9b2c82983223754228c06be6713a0f':
Remove unused persist.radio.imsregrequired.
2011-09-26 10:27:16 -07:00
Wink Saville
2783e1ce7a
Merge "Remove unused persist.radio.imsregrequired." into ics-factoryrom
2011-09-26 10:25:21 -07:00
Kenny Root
59ad0330ac
am 8a663c89: Merge "Allow non-required package verifiers"
...
* commit '8a663c89a3b5bda4e749a58d0434b130260eabb2':
Allow non-required package verifiers
2011-09-26 09:55:56 -07:00
Kenny Root
8a663c89a3
Merge "Allow non-required package verifiers"
2011-09-26 09:53:06 -07:00
Justin Ho
c13d4e9552
am 3eb34a9c: am 48704d49: Updated key and effect sounds
...
* commit '3eb34a9cd779a0a2dd1a402e606a45da016352bf':
Updated key and effect sounds
2011-09-26 09:52:09 -07:00
Justin Ho
3eb34a9cd7
am 48704d49: Updated key and effect sounds
...
* commit '48704d4962f2120c62726eaa8bc6ec2d8a71071d':
Updated key and effect sounds
2011-09-26 09:50:01 -07:00
Justin Ho
48704d4962
Updated key and effect sounds
...
Change-Id: Ia7c771ed59bf1803ed7ff25d338a412906cf59c0
2011-09-26 09:47:18 -07:00
Wink Saville
9e2cc044fd
Remove unused persist.radio.imsregrequired.
...
Change-Id: I49a2360260917f3e1034c1106ff139375fa1c9ed
2011-09-26 09:36:28 -07:00
Steve Block
e0047612e4
am 2cdbe2f1: Merge "Update the error for WebView thread violations to make clear that it\'s not fatal"
...
* commit '2cdbe2f1cf0157bf49913c46cc806169e0f9ecc6':
Update the error for WebView thread violations to make clear that it's not fatal
2011-09-26 08:42:29 -07:00
Steve Block
2cdbe2f1cf
Merge "Update the error for WebView thread violations to make clear that it's not fatal"
2011-09-26 08:41:09 -07:00
Andreas Huber
16c519480f
am 3bade950: Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
...
* commit '3bade9504a648ce7606b876dc7d71b4684e279c9':
Support even more .avi files with .mp3 content not aligned to chunk boundaries
2011-09-26 08:10:51 -07:00
Andreas Huber
3bade9504a
Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
2011-09-26 08:09:11 -07:00
Steve Block
7a01d94c5e
Update the error for WebView thread violations to make clear that it's not fatal
...
- Update the description
- Use Throwable rather than RuntimeException
- Log as a warning rather than an error
Bug: 5313494
Change-Id: If13ce2088e7080122db14e5e0565f64e6d6f4320
2011-09-26 14:59:12 +01:00
Ben Murdoch
409af6c487
am e0b0578a: Merge "Force a WebView pictureset invalidation on screen rotation."
...
* commit 'e0b0578a1efe6dc3ed259835ce0ceb939a0ecee6':
Force a WebView pictureset invalidation on screen rotation.
2011-09-26 06:21:07 -07:00
Ben Murdoch
e0b0578a1e
Merge "Force a WebView pictureset invalidation on screen rotation."
2011-09-26 06:19:56 -07:00
Brian Colonna
cdf5eec7d9
am 0e86bc07: Merge "FaceLock is now closed if emergency dial button is pressed"
...
* commit '0e86bc07886bbd7e2b9166d1e6c7b5dc94d14217':
FaceLock is now closed if emergency dial button is pressed
2011-09-26 06:04:51 -07:00
Brian Colonna
0e86bc0788
Merge "FaceLock is now closed if emergency dial button is pressed"
2011-09-26 06:03:02 -07:00
Roman Nurik
99bc305c5a
am b75fd7ad: Merge "Update supported media formats doc for ICS"
...
* commit 'b75fd7ad4e575cf9bd6ca02cb14bce087869e82c':
Update supported media formats doc for ICS
2011-09-26 00:18:29 -07:00
Roman Nurik
b75fd7ad4e
Merge "Update supported media formats doc for ICS"
2011-09-26 00:16:40 -07:00