Commit Graph

37356 Commits

Author SHA1 Message Date
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
Dianne Hackborn
fe59ee2896 Merge "Clear the bitmap from the canvas in a lot of places." 2011-08-02 16:57:50 -07:00
Philip Milne
1237c81f82 Merge "Fix for http://b/issue?id=5081478" 2011-08-02 16:22:26 -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
Gloria Wang
4d432b0bb2 Merge "Fix ordering assumption of argument evaluation." 2011-08-02 09:21:53 -07:00
Yu Shan Emily Lau
37b8984d78 Merge "Replace the hard coded video recording properties with media profile." 2011-08-02 08:39:01 -07:00
Justin Ho
27f134d248 Merge "Updated btn_default and btn_toggle assets Bug: 5076695" 2011-08-02 07:27:38 -07:00
Justin Ho
c392872db4 Merge "Updated scrollbars and fast scroller assets. Bug: 5076695" 2011-08-02 07:27:22 -07:00
Justin Ho
d35d6554c8 Merge "Updated progress bar and scrubbers, adding xhdpi Bug: 5076695" 2011-08-02 07:27:12 -07:00
Justin Ho
9425554908 Merge "Updated spinners Bug: 5076695" 2011-08-02 07:27:03 -07:00
Daniel Sandler
c3799272d4 Merge "Refresh tablet notification drawer." 2011-08-02 04:39:46 -07:00
Daniel Sandler
d55cf5be99 Merge "Merging ongoing + latest notifications on phone UI to match tablets." 2011-08-02 04:39:35 -07:00
Wu-cheng Li
d93f941b4e Merge "Add camera recording hint parameter." 2011-08-02 00:16:28 -07:00
satok
4d68430af4 Merge "Move SpellCheckerSession" 2011-08-02 00:11:06 -07:00
Shih-wei Liao
a9d018f97a Merge "Finish the refactor work of bccPrepareExecutable" 2011-08-01 23:26:39 -07:00
satok
ba2f168c1c Merge "Add a method to set the current spell checker" 2011-08-01 19:49:37 -07:00
Dianne Hackborn
f914dce14c Merge "Move ImageWallpaper to SystemUI process." 2011-08-01 18:59:58 -07:00
Romain Guy
05f8263fbe Merge "Reduce the amount of data cached by the gradients cache." 2011-08-01 18:57:43 -07:00
Adam Powell
20c286de4d Merge "Fix bug 5105394 - Get rid of btn_default_small" 2011-08-01 18:31:40 -07:00
Jeff Brown
ecc0e1014f Merge "Refactor input reader to add stylus support. Bug: 5064702" 2011-08-01 17:48:21 -07:00
Romain Guy
6f12148de0 Merge "Allow Canvas.setBitmap() to receive a null Bitmap." 2011-08-01 17:42:36 -07:00