Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / bf0568468da9e02c177abaf9116f9995d53b59aa
  1. bf05684 am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev by Wei Wang · 11 years ago
  2. 058061d Merge "Fix stopBatchedScan not working for wifi" into klp-dev by Wei Wang · 11 years ago
  3. a6454cc am 49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev by Adam Powell · 11 years ago
  4. 4932530 Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev by Adam Powell · 11 years ago
  5. d181673 Fix stopBatchedScan not working for wifi by Wei Wang · 11 years ago
  6. 7d09713 am 7cd52895: am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  7. 7cd5289 am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  8. 5035fab am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  9. cecc620 am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  10. 759445c resolved conflicts for merge of c53ad4cd to jb-mr2-dev by Marco Nelissen · 11 years ago
  11. f92b007 am 52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev by Vinit Deshapnde · 11 years ago
  12. 52bc363 Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev by Vinit Deshapnde · 11 years ago
  13. 826f364 am d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  14. d16505d Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  15. c53ad4c am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  16. 072e1da am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  17. b17cf20 am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  18. 9ee72b6 am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  19. 665b075 am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  20. 81fbdad resolved conflicts for merge of 534f3e94 to jb-mr1-dev by Marco Nelissen · 11 years ago
  21. 534f3e9 am a3337bc7: Merge "Verify certificates" into jb-dev by Marco Nelissen · 11 years ago
  22. a3337bc Merge "Verify certificates" into jb-dev by Marco Nelissen · 11 years ago
  23. f503a2d Update contextual asset bar assets to avoid 9-patch artifacts by Adam Powell · 11 years ago
  24. 5a510a2 am 6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs by Adam Koch · 11 years ago
  25. e02d5a2 am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad by Scott Main · 11 years ago
  26. 6398a86 Merge "Point bitmaps training class to new samples directory." into klp-docs by Adam Koch · 11 years ago
  27. 21e3372 Point bitmaps training class to new samples directory. by Adam Koch · 11 years ago
  28. a32c437 update to wear docs. by Scott Main · 11 years ago
  29. 13bd857 am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050 by Wei Wang · 11 years ago
  30. 15a18d0 am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev by Wei Wang · 11 years ago
  31. c0384b6 DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 by Wei Wang · 11 years ago
  32. da08410 Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev by Wei Wang · 11 years ago
  33. 8e69abf am 46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService by Jim Miller · 11 years ago
  34. 46e6311 DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService by Jim Miller · 11 years ago
  35. 3705012 am a413a4ae: Fix the build. DO NOT MERGE by Jim Miller · 11 years ago
  36. a413a4a Fix the build. DO NOT MERGE by Jim Miller · 11 years ago
  37. 7c9bd98 am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev by Chris Craik · 11 years ago
  38. 375ff2c am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev by Jim Miller · 11 years ago
  39. 89513ee Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev by Chris Craik · 11 years ago
  40. 2598fbd Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev by Jim Miller · 11 years ago
  41. 4b4eebb DO NOT MERGE: Add status callback for start/stop advertising. by Wei Wang · 11 years ago
  42. cfd46dc am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  43. 610d401 am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  44. e9c7fd2 am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  45. 55371be am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  46. 754bf6a am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  47. 45b97c2 DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns by Vinit Deshapnde · 11 years ago
  48. c8868db am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  49. 737d3e5 am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  50. 6b96ecc am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  51. 32753f4 am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  52. 1888333 am d4375b47: Merge "Fix loop limits." into klp-dev by Craig Mautner · 11 years ago
  53. 3191212 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  54. d4375b4 Merge "Fix loop limits." into klp-dev by Craig Mautner · 11 years ago
  55. 6eb2810 am 183f97b7: am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  56. 183f97b am 1c12f9e7: malloc some advances by Victoria Lease · 11 years ago
  57. b4998ee Fix loop limits. by Craig Mautner · 11 years ago
  58. 0dc0848 am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev by Lajos Molnar · 11 years ago
  59. f7b33e8 Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev by Lajos Molnar · 11 years ago
  60. 0dca4fc am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev by Adam Cohen · 11 years ago
  61. cc8fbb5 am 8acbe888: Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev by Adam Cohen · 11 years ago
  62. 55b523c Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev by Adam Cohen · 11 years ago
  63. 8acbe88 Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev by Adam Cohen · 11 years ago
  64. 5d39a77 Fix projection offset caching - DO NOT MERGE by Chris Craik · 11 years ago
  65. 80af531 am f260ed09: Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev by Jeff Brown · 11 years ago
  66. f260ed0 Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev by Jeff Brown · 11 years ago
  67. 0cab07d MediaPlayer: fix int overflow issue in MediaTimeProvider by Lajos Molnar · 11 years ago
  68. 929e75e [DO NOT MERGE] Centering the crop by default in system wallpaper cropper by Michael Jurka · 11 years ago
  69. c82618c [DO NOT MERGE] Fix wallpaper cropping bugs by Michael Jurka · 11 years ago
  70. 7cf3e33 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  71. bd84f01 am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on data." into klp-dev by Robert Greenwalt · 11 years ago
  72. 5d3d4ee Merge "Handle provisioning APN by turning off/on data." into klp-dev by Robert Greenwalt · 11 years ago
  73. 95a7829 am b78dc69c: Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev by Dan Sandler · 11 years ago
  74. b78dc69 Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev by Dan Sandler · 11 years ago
  75. aba5665 Fix inverted conditional in View.setFilterTouchesWhenObscured. by Jeff Brown · 11 years ago
  76. 17e7c40 am 98a027a5: Merge "Harden NsdManager against null-dereference crashes" into klp-dev by Dave Platt · 11 years ago
  77. 98a027a Merge "Harden NsdManager against null-dereference crashes" into klp-dev by Dave Platt · 11 years ago
  78. c9a7eeb am 4cb1bc28: Merge "Refresh cast icon assets to improve visual contrast." into klp-dev by Jeff Brown · 11 years ago
  79. 4cb1bc2 Merge "Refresh cast icon assets to improve visual contrast." into klp-dev by Jeff Brown · 11 years ago
  80. 1b00756 am 9b650702: Merge "Fix state transition verification." into klp-dev by Xia Wang · 11 years ago
  81. 9b65070 Merge "Fix state transition verification." into klp-dev by Xia Wang · 11 years ago
  82. f1e8d36 Refresh cast icon assets to improve visual contrast. by Jeff Brown · 11 years ago
  83. a4a1c0d am ac275cb3: am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  84. ac275cb am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  85. 1f3186e am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  86. 67a9297 am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  87. 88da2bf am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  88. ed529a5 am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  89. 500ec9c am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  90. 25fb713 am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  91. 0b2f212 am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  92. d3da8f7 am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  93. 01f03b5 Fix state transition verification. by Xia Wang · 11 years ago
  94. c8e8e3e Handle provisioning APN by turning off/on data. by Wink Saville · 11 years ago
  95. ecba937 DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  96. 965e5e8 am ace69017: docs: Reverted ADT 22.6.1 links by Ricardo Cervera · 11 years ago
  97. ace6901 docs: Reverted ADT 22.6.1 links by Ricardo Cervera · 11 years ago
  98. 1c12f9e malloc some advances by Victoria Lease · 11 years ago
  99. f60dd6e am 50d7dc99: add ALL of the Android Wear Dev Preview docs to DAC these were built from the klp-cw-preview-release branch. by Scott Main · 11 years ago
  100. 50d7dc9 add ALL of the Android Wear Dev Preview docs to DAC by Scott Main · 11 years ago