Commit Graph

37474 Commits

Author SHA1 Message Date
Debashish Chatterjee
424873aa8a Merge "Step1 of renaming READ_WRITE_OWN_VOICEMAIL to ADD_VOICEMAILS." 2011-08-03 06:06:30 -07:00
Dianne Hackborn
1b123b8d19 Merge "Reduce memory usage of status bar expanded view." 2011-08-02 22:48:16 -07:00
Adam Powell
98b88724a9 Merge "Fix bug 5098288 - Rethink the suite of new themes" 2011-08-02 18:44:50 -07:00
Mathias Agopian
b7f8310d9a Merge "fix a crasher in surfaceflinger" 2011-08-02 18:31:08 -07:00
Mathias Agopian
e8067a7d99 fix a crasher in surfaceflinger
this would happen if being told to draw before a buffer
was available.

Change-Id: I46d121c73e883078cdbf952063e38b0076f79038
2011-08-02 18:29:57 -07:00
Romain Guy
87f269b406 Merge "Paint style and stroke width affect text rendering. Bug #5112207" 2011-08-02 17:34:06 -07:00
Robert Greenwalt
836d70f3d2 Merge "Reduce ConnectivityService logging" 2011-08-02 17:32:05 -07:00
Jean-Baptiste Queru
c23c64c8f0 am 3a5e36f9: (-s ours) am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '3a5e36f96bf61a8fb71c49cf93bd97c5e1d6abb4':
  Fix a compiling error when trying to use setBufferCount
2011-08-02 17:22:43 -07:00
Jean-Baptiste Queru
6b115451bf am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '98c531dca9e52af280ca002658bbe38775b3f6ae':
  Fix a compiling error when trying to use setBufferCount
2011-08-02 17:19:05 -07:00
Jean-Baptiste Queru
8fdbdf461a am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '9b0c6beed2cd5463655712ad80ed160c08611ff8':
  Fix a compiling error when trying to use setBufferCount
2011-08-02 17:15:24 -07:00
Mathias Agopian
1ad238ab92 Merge "fix an issue where the screen could be stale after a surface size change" 2011-08-02 17:09:34 -07:00
Mathias Agopian
6d30c2bdae Merge "update HWC data structures even when a layer is marked for SKIP" 2011-08-02 17:09:18 -07:00
Mathias Agopian
bc64f9ad37 Merge "Add a h/w composer API to allow the HAL to trigger a redraw" 2011-08-02 17:07:53 -07:00
Kenny Root
f3b73ee8d9 Merge "Parent's canonical path; not parent of canonical" 2011-08-02 17:05:06 -07:00
Romain Guy
67c063b1c0 Merge "Add the ability to enable/disable marquee fading per device" 2011-08-02 17:03:22 -07:00
Jean-Baptiste Queru
8fdba3dd72 Merge "Fix a compiling error when trying to use setBufferCount" 2011-08-02 17:02:48 -07:00
Dianne Hackborn
fe59ee2896 Merge "Clear the bitmap from the canvas in a lot of places." 2011-08-02 16:57:50 -07:00
Teng-Hui Zhu
697bce061c Fix a compiling error when trying to use setBufferCount
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
2011-08-02 16:57:20 -07:00
The Android Automerger
23ca1ed524 Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release 2011-08-02 16:47:53 -07:00
Philip Milne
1237c81f82 Merge "Fix for http://b/issue?id=5081478" 2011-08-02 16:22:26 -07:00
Mathias Agopian
a537c0f42e update HWC data structures even when a layer is marked for SKIP
Change-Id: I16bcf44cd617814a14a795429bde2f39f411077d
2011-08-02 15:51:37 -07:00
Robert Greenwalt
f724bd9101 Merge "Stop creating threads for each MDST." 2011-08-02 15:47:50 -07:00
Matthew Xie
ea803bc4ef Merge "Move mBluetoothService.runBluetooth after broadcasting the STATE_ON intent." 2011-08-02 15:44:28 -07:00
Mike Lockwood
5d0a790957 Merge "USB: Fix NPE that occurred when restoring default function in UsbManager.setEnabledFunctions" 2011-08-02 15:31:34 -07:00
Eric Fischer
5102d2c06c Merge "Import revised translations." 2011-08-02 15:24:05 -07:00
repo sync
7c2a9612dc Merge "Fix networktype on per process DNS setting" 2011-08-02 14:48:43 -07:00
Jeff Hamilton
f7195e7579 Merge "Remove the binder interface for LLCP." 2011-08-02 13:33:02 -07:00
Conley Owens
1cac18ccfd am 0793586b: am f8c1f129: am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '0793586bf8f4dce71d0b4d7ff2f212129b3f76fe':
  Prevent NullPointerException cases while using SipService.
2011-08-02 13:32:26 -07:00
Conley Owens
4f0dfe9a89 am f8c1f129: am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit 'f8c1f1298ac3ede518c8d29eeb6719746c6afaf0':
  Prevent NullPointerException cases while using SipService.
2011-08-02 13:30:51 -07:00
Conley Owens
526587bb72 am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit 'e1d271546767a8e2213aabba92506af9e97020b4':
  Prevent NullPointerException cases while using SipService.
2011-08-02 13:24:00 -07:00
Conley Owens
6662266a42 am f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit 'f87743e7bdfd10b9a1719036a6320a32df078879':
  Prevent NullPointerException cases while using SipService.
2011-08-02 13:21:12 -07:00
Romain Guy
a7e70cab9a Merge "Properly cancel pending buffers on window size change" 2011-08-02 13:18:51 -07:00
Conley Owens
b1d918badd Merge "Prevent NullPointerException cases while using SipService." 2011-08-02 13:08:14 -07:00
Romain Guy
949bf1c54c Merge "Copy constructors should actually copy stuff. Bug #5027094" 2011-08-02 12:38:42 -07:00
Christopher Tate
58b7d1a579 Merge "Reduce backup manager logspew" 2011-08-02 12:18:40 -07:00
Amith Yamasani
bc24d0d731 Merge "Volume panel changes." 2011-08-02 11:51:57 -07:00
Xavier Ducrohet
0ee5e7c153 Merge "Layoutlib: simple comment fix." 2011-08-02 11:48:23 -07:00
Martijn Coenen
17f9922b8a Merge "Removed unused import from AnimatorSet." 2011-08-02 11:44:23 -07:00
Romain Guy
1df4ed6d28 Merge "Prevent crash with NPE in HardwareRenderer Bug #5109839" 2011-08-02 11:33:57 -07:00
Jaikumar Ganesh
e9708fb6d6 Merge "Fix tethering using BT." 2011-08-02 11:25:13 -07:00
Gilles Debunne
9cb9ac7fd4 Merge "Bug 4280211: permission green checkboxes removed" 2011-08-02 10:58:42 -07:00
Hugo Hudson
55fadfec23 Merge "Add OpenableColumns to the Voicemail table." 2011-08-02 10:55:13 -07:00
Xavier Ducrohet
23a6cdacd2 Merge "Misc layoutlib fix in preparation of the access change in framework code." 2011-08-02 10:43:45 -07:00
Derek Sollenberger
605fa9f3ed Merge "Reverting until we can find a better way to address this issue without affecting nine-patches with large stretchable areas." 2011-08-02 10:39:43 -07:00
Martijn Coenen
73e5c236c8 Merge "Fix ConcurrentModificationException in AnimatorSet." 2011-08-02 10:39:34 -07:00
James Dong
bfd16c0347 Merge "Start thread pool for binder calls" 2011-08-02 10:36:44 -07:00
Eric Fischer
b2b544ba6d Merge "Restore deleted string still referenced from a layout." 2011-08-02 10:29:12 -07:00
Mike Lockwood
1e2ac3ced7 Merge "UsbManager: add getDefaultFunction()" 2011-08-02 10:01:53 -07:00
Gloria Wang
59462e25b8 Merge "Re-calculate mCurrentTimeUs for MP3 CBR seek because we might have called Resync() which changes mCurrentPos. For bug 4869063." 2011-08-02 09:56:51 -07:00
Gloria Wang
f5417d53e8 Merge "Fix ordering assumption of argument evaluation." 2011-08-02 09:22:05 -07:00