Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 2add818b07cab3d2f0f73c5bac286df9f927beb5
  1. 2add818 am ea93d815: (-s ours) am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type. by Ramesh Sudini · 14 years ago
  2. 26887bd am ebcdd0ab: (-s ours) am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. by Wink Saville · 14 years ago
  3. 4f63104 am b4153830: (-s ours) am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr. by Wink Saville · 14 years ago
  4. ea93d81 am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type. by Ramesh Sudini · 14 years ago
  5. ebcdd0a am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. by Wink Saville · 14 years ago
  6. b415383 am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr. by Wink Saville · 14 years ago
  7. 285a820 am d3f4b40c: (-s ours) am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE by Wink Saville · 14 years ago
  8. f654c8f am 5b79d003: (-s ours) am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE by Wink Saville · 14 years ago
  9. e6cf4fc am c8da3ddf: (-s ours) am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE by Wink Saville · 14 years ago
  10. a961430 am 6207b8ca: (-s ours) am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE by Wink Saville · 14 years ago
  11. 284d6b62 am e1a50077: (-s ours) am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE by Wink Saville · 14 years ago
  12. 2fc175f am d9ca063d: (-s ours) am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE by Wink Saville · 14 years ago
  13. cd2294f am d7945967: (-s ours) am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE by Wink Saville · 14 years ago
  14. d3f4b40 am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE by Wink Saville · 14 years ago
  15. 5b79d00 am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE by Wink Saville · 14 years ago
  16. c8da3dd am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE by Wink Saville · 14 years ago
  17. 6207b8c am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE by Wink Saville · 14 years ago
  18. e1a5007 am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE by Wink Saville · 14 years ago
  19. d9ca063 am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE by Wink Saville · 14 years ago
  20. c06c5c1 Do not merge: Telephony: Fix config to reflect the correct CM conn type. by Ramesh Sudini · 14 years ago
  21. 124e287 Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop. by Wink Saville · 14 years ago
  22. 321b730 Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr. by Wink Saville · 14 years ago
  23. 467016e am 7069f7c0: (-s ours) am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
  24. d6398ad Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE by Wink Saville · 14 years ago
  25. d794596 am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE by Wink Saville · 14 years ago
  26. 08d79ac Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE by Wink Saville · 14 years ago
  27. 7fbae1d2 Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE by Wink Saville · 14 years ago
  28. 16b7f05 Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE by Wink Saville · 14 years ago
  29. 9e22c33 Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE by Wink Saville · 14 years ago
  30. c3853f3 Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE by Wink Saville · 14 years ago
  31. 7069f7c am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
  32. c15cf63 Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE by Wink Saville · 14 years ago
  33. 816dd3d resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
  34. 9d7d5b4 Do not merge: Fix 3G connectivity bug 3513741. by Wink Saville · 14 years ago
  35. df6542d Do not merge: RIL: Merge Issue. LTE SIM additions. by Ramesh Sudini · 14 years ago
  36. 074f835 Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer. by Ramesh Sudini · 14 years ago
  37. 75acebd Do not merge: LTE: Fix SST for CDMALTEPhone. by Ramesh Sudini · 14 years ago
  38. 88d8529 Do not merge: Clean up LTE code change by Robert Greenwalt · 14 years ago
  39. 04cac40 Do not merge: Add some input checking to prevent problems by Robert Greenwalt · 14 years ago
  40. 9d7d628 Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support" by Wink Saville · 14 years ago
  41. fd10d5c am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
  42. 6ffbe98 am 76d41f57: am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
  43. 3c03047 am f2f3627f: am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 by Gilles Debunne · 14 years ago
  44. eb30077 am 733cb79a: am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 by Eric Laurent · 14 years ago
  45. e625d9a am ad707d8f: (-s ours) am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
  46. e1068ed am 0bdf9f8c: am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
  47. 13e6c46 am 179dd46e: (-s ours) am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
  48. d1c49d6 am a64e2ad4: resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp by Nick Pelly · 14 years ago
  49. 8ecd9dc am 2d24213f: am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  50. 6325a03 Merge "resolved conflicts for merge of c761a80d to master" by Gloria Wang · 14 years ago
  51. 09ba5ce resolved conflicts for merge of c761a80d to master by Gloria Wang · 14 years ago
  52. fb89711 am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
  53. 9b1ea0b am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
  54. 76d41f5 am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp" by Kenny Root · 14 years ago
  55. e21110f Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 by Irfan Sheriff · 14 years ago
  56. 96a4323 Merge "Fix PV AAC decoder crash due to out-of-boundary array access." by James Dong · 14 years ago
  57. 9c06c0f Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread by Gilles Debunne · 14 years ago
  58. e1fb6eb Merge "Removed empty block warnings in TextView" by Gilles Debunne · 14 years ago
  59. 2b63ffc Merge "Wrong null check in TextView" by Gilles Debunne · 14 years ago
  60. f2f3627 am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 by Gilles Debunne · 14 years ago
  61. 8503af84 Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1 by Gilles Debunne · 14 years ago
  62. 733cb79 am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 by Eric Laurent · 14 years ago
  63. 3cbfd10 Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1 by Eric Laurent · 14 years ago
  64. ad707d8 am 7d93b757: (-s ours) am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into gingerbread by James Dong · 14 years ago
  65. 0bdf9f8 am e5570255: am 69e725eb: Merge "Dist com.android.nfc_extras.jar." into gingerbread by Ying Wang · 14 years ago
  66. 179dd46 am 2e741556: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread by Robert Greenwalt · 14 years ago
  67. a64e2ad4 resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp by Nick Pelly · 14 years ago
  68. a2e2996 Fix PV AAC decoder crash due to out-of-boundary array access. by James Dong · 14 years ago
  69. 2d24213 am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  70. 3ec9d06 Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  71. c761a80 am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin by Gloria Wang · 14 years ago
  72. 7ea3c7f Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 by Gloria Wang · 14 years ago
  73. 6f3a75e Merge "Throw errors on failures to set system properties." by Brad Fitzpatrick · 14 years ago
  74. 90f5d75 MtpDevice: Handle zero length packets in readResponse() by Mike Lockwood · 14 years ago
  75. 0c5820a am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  76. 9240569 am 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  77. 151c74b am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  78. 0bea34f am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  79. e976ff4 Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  80. dec0b75 Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  81. bce6f8f Add a dialog to ask user to start an application for a USB device or accessory by Mike Lockwood · 14 years ago
  82. fa64015 Partial fix for issue 3515250: video chat and SCO by Eric Laurent · 14 years ago
  83. bcc0516 MTP host: Fix problems reading large data packets by Mike Lockwood · 14 years ago
  84. 01d7457 am c37febe2: am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 by Christopher Tate · 14 years ago
  85. df35762 am ce3bcbad: am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  86. e1976e5 am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  87. 718e64b Merge "Fix some const-ness and comments" by Mathias Agopian · 14 years ago
  88. c37febe am 767d7a03: Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 by Christopher Tate · 14 years ago
  89. 767d7a0 Merge "Add a test app: quota exceeded doing a backup" into honeycomb-mr1 by Christopher Tate · 14 years ago
  90. ce3bcba am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  91. 9ff6483 Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1 by Dianne Hackborn · 14 years ago
  92. 38507bb9 Add a test app: quota exceeded doing a backup by Christopher Tate · 14 years ago
  93. a7727dc Merge "If MP3 decoder output frame size were 0, media server would crash." by James Dong · 14 years ago
  94. 3b473d9 am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  95. 9fffd9a Merge "USB: minor cleanup work" into honeycomb-mr1 by Mike Lockwood · 14 years ago
  96. 248ce94 Merge "Fix initialization order warning." by Mathias Agopian · 14 years ago
  97. f0ff906 Fix some const-ness and comments by Mathias Agopian · 14 years ago
  98. ccf94df Fix initialization order warning. by Mathias Agopian · 14 years ago
  99. d40cc3c Removed empty block warnings in TextView by Gilles Debunne · 14 years ago
  100. 86ad550 Merge "Remove unnecessary ld flags." by Ying Wang · 14 years ago