Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / a8e0dfae06298b375637813a3263a62749dd0b82
  1. a8e0dfa resolved conflicts for merge of db46fa25 to master by Robert Greenwalt · 13 years ago
  2. 677cece Merge "MediaScanner: Fix bug in "no media" handling logic" by Mike Lockwood · 13 years ago
  3. 214f9db MediaScanner: Fix bug in "no media" handling logic by Mike Lockwood · 13 years ago
  4. d713683 am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE by Irfan Sheriff · 13 years ago
  5. db46fa2 am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE by Robert Greenwalt · 13 years ago
  6. a47c401 Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE by Robert Greenwalt · 13 years ago
  7. d369d64 am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE by Irfan Sheriff · 13 years ago
  8. a0449f0 Resolve merge conflicts for merge of 21083066 to master. by Wink Saville · 13 years ago
  9. c56e87e am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState. by Wink Saville · 13 years ago
  10. 2108306 am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE by Wink Saville · 13 years ago
  11. 0fa7d10 am aa44b52e: Fix bug in RIL#getDataCallState. by Wink Saville · 13 years ago
  12. 8ab6a6d Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE by Irfan Sheriff · 13 years ago
  13. aa70f10 Add RouteInfo objects for tracking routes. by Robert Greenwalt · 13 years ago
  14. 7e74c60 Merge "Enhance AsyncChannel." into honeycomb-LTE by Wink Saville · 13 years ago
  15. 0246bbc Enhance AsyncChannel. by Wink Saville · 13 years ago
  16. 3a5c227 am a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable value" by Conley Owens · 13 years ago
  17. e814185 am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m by Conley Owens · 13 years ago
  18. f4c4a276 Merge commit 'f395e304' into m by Conley Owens · 13 years ago
  19. a31b3f2 am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" by Conley Owens · 13 years ago
  20. 981db85 am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." by Conley Owens · 13 years ago
  21. e7cb25916 am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" by Conley Owens · 13 years ago
  22. 3581c93 am 64248af3: Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp by Conley Owens · 13 years ago
  23. 4c79ca8 am c30d7676: am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal by Conley Owens · 13 years ago
  24. 1bb64f5 am faedfc1e: Ignore slide ui change because it is obselete in newly-refactored code by Conley Owens · 13 years ago
  25. 38ae12e am 238ef85e: am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" by Conley Owens · 13 years ago
  26. d89cc62 am 0921eae1: Ignore fix since it is obsolete in newly refactored code by Conley Owens · 13 years ago
  27. 0a1b746 am 92618f5f: am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" by Conley Owens · 13 years ago
  28. aa44b52 Fix bug in RIL#getDataCallState. by Wink Saville · 13 years ago
  29. 5e3357f Merge commit '5eb49e0f' into m by Conley Owens · 13 years ago
  30. 31be7cf Add DhcpStateMachine for interation with dhcpcd by Irfan Sheriff · 13 years ago
  31. f0cae1a am ba40174b: am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" by Conley Owens · 13 years ago
  32. 89dd78b am 33e86de0: Ignore broken image fix since identical change exists in internal tree by Conley Owens · 13 years ago
  33. a3dcd0a Merged "Adjust mBiggerTouchSlopSquare to the suitable value" by Conley Owens · 13 years ago
  34. dddaa56 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m by Conley Owens · 13 years ago
  35. f395e30 am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" by Conley Owens · 13 years ago
  36. 08acaec am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" by Conley Owens · 13 years ago
  37. 737b5c5 am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." by Conley Owens · 13 years ago
  38. 1eb31b4 am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" by Conley Owens · 13 years ago
  39. 64248af Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp by Conley Owens · 13 years ago
  40. c30d767 am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > by Conley Owens · 13 years ago
  41. faedfc1 Ignore slide ui change because it is obselete in newly-refactored code by Conley Owens · 13 years ago
  42. 238ef85e am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" by Conley Owens · 13 years ago
  43. 0921eae Ignore fix since it is obsolete in newly refactored code by Conley Owens · 13 years ago
  44. 92618f5 am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" by Conley Owens · 13 years ago
  45. 5eb49e0 am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()" by Conley Owens · 13 years ago
  46. ba40174 am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" by Conley Owens · 13 years ago
  47. 33e86de Ignore broken image fix since identical change exists in internal tree by Conley Owens · 13 years ago
  48. 7fba67e Merge "Fix bug 4355588 With auto inbanding the fifo didn't reserve the correct size. Caused failure on fifo wrap." by Stephen Hines · 13 years ago
  49. efc69d7 Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947" by Gloria Wang · 13 years ago
  50. eccf6c6 Fix bug 4355588 by Jason Sams · 13 years ago
  51. 3304f8f am dd177518: am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE by Wink Saville · 13 years ago
  52. dd17751 am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE by Wink Saville · 13 years ago
  53. 6e74878 Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE by Wink Saville · 13 years ago
  54. 2cf1f52 Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156." by Gloria Wang · 13 years ago
  55. bd3ddbb am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 13 years ago
  56. 19b7cd9 am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" by Conley Owens · 13 years ago
  57. 17f83df am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." by Conley Owens · 13 years ago
  58. 280a0c1 am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." by Conley Owens · 13 years ago
  59. fe96a02 am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp by Conley Owens · 13 years ago
  60. a02a9e6 am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check." by Conley Owens · 13 years ago
  61. 1b38cc3 am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references." by Conley Owens · 13 years ago
  62. 95b5339 am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." by Conley Owens · 13 years ago
  63. 3513e1c am ded7c652: am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" by Conley Owens · 13 years ago
  64. 144a288 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base by Nick Kralevich · 13 years ago
  65. f0f955e Merge "Touch exploration - nits" by Svetoslav Ganov · 13 years ago
  66. 887e1a1 Touch exploration - nits by Svetoslav Ganov · 13 years ago
  67. d2e3607 am 27ad0df0: am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 13 years ago
  68. 32a4f901 am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 13 years ago
  69. 75c78dc am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 13 years ago
  70. 511ec08 am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 13 years ago
  71. c703b49 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" by Conley Owens · 13 years ago
  72. 7dcdfd7 am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." by Conley Owens · 13 years ago
  73. 889bb20 am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." by Conley Owens · 13 years ago
  74. bb74af7 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp by Conley Owens · 13 years ago
  75. 27e8f1a am 8b22ef66: am e41d2aed: Merge "Using robust equality check." by Conley Owens · 13 years ago
  76. 27ad0df am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 13 years ago
  77. 014757e am a9517012: am 1e29552b: Merge "We don\'t need these local references." by Conley Owens · 13 years ago
  78. 49df110a am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." by Conley Owens · 13 years ago
  79. de50622 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 13 years ago
  80. ded7c65 am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" by Conley Owens · 13 years ago
  81. a1f6a09 am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 13 years ago
  82. 1462813a Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 13 years ago
  83. 3ea208a Merge "Pipe rsa function though the RS api table." by Jason Sams · 13 years ago
  84. 42f139c docs: more documentation for ProgressBar by Scott Main · 13 years ago
  85. 7da9ff5 Merge "Fix fifo size check code." by Jason Sams · 13 years ago
  86. c1f52d3 Fix fifo size check code. by Jason Sams · 13 years ago
  87. 205d6fb am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 13 years ago
  88. f181e41 am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 13 years ago
  89. be2da3c am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 13 years ago
  90. c7eb47f docs: tweak table headers for config qualifiers by Scott Main · 13 years ago
  91. 939ccad Merge "SuggestionSpans are removed around edited text." by Gilles Debunne · 13 years ago
  92. 75beb33 SuggestionSpans are removed around edited text. by Gilles Debunne · 13 years ago
  93. f0055d5 CDMALTE: Evaluate data network type in pollStateDone() by Kazuhiro Ondo · 13 years ago
  94. f16e1ab Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. by Gloria Wang · 13 years ago
  95. 7277744 am 67c92fbd: am 5f2ff42b: Add data to bugreports. by Robert Greenwalt · 13 years ago
  96. a3be387 am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value" by Conley Owens · 13 years ago
  97. b737647 am 76616b13: Merge "Scolling using arrow keys with padding" by Conley Owens · 13 years ago
  98. 19653c6 am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" by Conley Owens · 13 years ago
  99. a47c0d2 am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" by Conley Owens · 13 years ago
  100. 520dd92 am 9355a24a: Merge "Fixing wrong Japanese phone formatter." by Conley Owens · 13 years ago