Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_frameworks_base / b80adb5dbdaac41893484c47c48c294149386cc6
  1. b80adb5 am 105c4792: am 10a07a04: Merge "Verify certificates" into klp-dev by Marco Nelissen · 11 years ago
  2. 105c479 am 10a07a04: Merge "Verify certificates" into klp-dev by Marco Nelissen · 11 years ago
  3. 20bba89 am 4111e7e1: am 09421fab: Re-initialize error after attach by Daniel 2 Olofsson · 11 years ago
  4. 4111e7e am 09421fab: Re-initialize error after attach by Daniel 2 Olofsson · 11 years ago
  5. 10a07a0 Merge "Verify certificates" into klp-dev by Marco Nelissen · 11 years ago
  6. 09421fa Re-initialize error after attach by Daniel 2 Olofsson · 11 years ago
  7. 0d70d33 am 788fb96d: am 47653f2d: Merge "Move options buffers to top scope" by Dave Allison · 11 years ago
  8. 788fb96 am 47653f2d: Merge "Move options buffers to top scope" by Dave Allison · 11 years ago
  9. 47653f2 Merge "Move options buffers to top scope" by Dave Allison · 11 years ago
  10. 07a1e23 Move options buffers to top scope by Dave Allison · 11 years ago
  11. 47a0230 am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height by Selim Cinek · 11 years ago
  12. 9c3fc0c am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height by Selim Cinek · 11 years ago
  13. eb95e74 DO NOT MERGE - Fixed crash for odd image width/height by Selim Cinek · 11 years ago
  14. 713cd79 am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge by Craig Mautner · 11 years ago
  15. daf27b8 am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls by Yohei Yukawa · 11 years ago
  16. e041700 am a921d8b6: am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev by Craig Mautner · 11 years ago
  17. 80f9355 am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev by Mike Lockwood · 11 years ago
  18. 2ecd61c am 1365d982: am 4cde7734: Merge "remove unnecessary switchUser call" by Victoria Lease · 11 years ago
  19. 1365d98 am 4cde7734: Merge "remove unnecessary switchUser call" by Victoria Lease · 11 years ago
  20. 4cde773 Merge "remove unnecessary switchUser call" by Victoria Lease · 11 years ago
  21. bd5e61f am c0232642: am 629daddd: Merge "Fix layoutlib build." by Narayan Kamath · 11 years ago
  22. c023264 am 629daddd: Merge "Fix layoutlib build." by Narayan Kamath · 11 years ago
  23. 629dadd Merge "Fix layoutlib build." by Narayan Kamath · 11 years ago
  24. c73991b Fix layoutlib build. by Narayan Kamath · 11 years ago
  25. 00c7d34 am ff89d589: Merge commit \'3b9de0a4\' into manualmerge by Craig Mautner · 11 years ago
  26. 6a02c9d am 50694917: am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs by Ricardo Cervera · 11 years ago
  27. da35565 am 8bb11153: am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs by Joe Fernandez · 11 years ago
  28. 6d03139 am ad66c27b: am 6d9b034c: Fix typo in public logcat page. by John Spurlock · 11 years ago
  29. 937503a am 8714a343: am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs by Ricardo Cervera · 11 years ago
  30. 3e041ec am b681794d: am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs by Katie McCormick · 11 years ago
  31. 919fc36 am 62826f55: am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs by John Spurlock · 11 years ago
  32. e67658d am 4ecd833e: am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev by JP Abgrall · 11 years ago
  33. e0627cf am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev by Chad Brubaker · 11 years ago
  34. eccd4a5 am fc1d0471: am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev by Svetoslav · 11 years ago
  35. e2c6391 am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev by Adrian Roos · 11 years ago
  36. 50ff2f4 am a5a921e3: (-s ours) am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  37. d553313 am e5191aab: am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev by Dianne Hackborn · 11 years ago
  38. ba6b897 resolved conflicts for merge of 825dd9dd to klp-dev-plus-aosp by Jeff Brown · 11 years ago
  39. ff89d58 Merge commit '3b9de0a4' into manualmerge by Craig Mautner · 11 years ago
  40. fd2f8d4 am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls by Yohei Yukawa · 11 years ago
  41. 51b921d DO NOT MERGE - Preserve the order of InputMethodManager method calls by Yohei Yukawa · 11 years ago
  42. 3b9de0a am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev by Craig Mautner · 11 years ago
  43. 00e12e6 am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev by Craig Mautner · 11 years ago
  44. a921d8b am 3217cc6f: Merge "Fix activities appearing behind launcher icons" into klp-dev by Craig Mautner · 11 years ago
  45. cb6cd53 am bdd4c31a: am 60d7c995: Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev by Zhihai Xu · 11 years ago
  46. 3217cc6 Merge "Fix activities appearing behind launcher icons" into klp-dev by Craig Mautner · 11 years ago
  47. ad97aa8 am db3146c0: am 15258ac8: Fix power manager display wake lock bugs. (DO NOT MERGE) by Jeff Brown · 11 years ago
  48. b61d399 am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev by Adam Powell · 11 years ago
  49. dec3c62 am 21384faa: am f3a2895a: Merge "NsdService does not clean up after exiting clients" by Dave Platt · 11 years ago
  50. 21384fa am f3a2895a: Merge "NsdService does not clean up after exiting clients" by Dave Platt · 11 years ago
  51. f3a2895 Merge "NsdService does not clean up after exiting clients" by Dave Platt · 11 years ago
  52. ff64f5e am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev by Mike Lockwood · 11 years ago
  53. 381374b Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev by Mike Lockwood · 11 years ago
  54. f31760c NsdService does not clean up after exiting clients by Dave Platt · 11 years ago
  55. e066359 Fix activities appearing behind launcher icons by Craig Mautner · 11 years ago
  56. 22abe38 resolved conflicts for merge of 9af19bee to klp-dev-plus-aosp by Brian Carlstrom · 11 years ago
  57. 5069491 am 7e566239: Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs by Ricardo Cervera · 11 years ago
  58. 7e56623 Merge "docs: Updated Building your First App tutorial. Bug: 13429905" into klp-docs by Ricardo Cervera · 11 years ago
  59. 8bb1115 am f7267c8b: Merge "Doc change: Update developer video on home page carousel." into klp-docs by Joe Fernandez · 11 years ago
  60. ad66c27 am 6d9b034c: Fix typo in public logcat page. by John Spurlock · 11 years ago
  61. 8714a34 am ef6c9470: Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs by Ricardo Cervera · 11 years ago
  62. b681794 am 07c0ad97: Merge "Doc update: new doc studio layout editor" into klp-docs by Katie McCormick · 11 years ago
  63. 62826f5 am f6228d95: Merge "Fix doc typos in AppOpsManager.java" into klp-docs by John Spurlock · 11 years ago
  64. 420d97f docs: Updated Building your First App tutorial. Bug: 13429905 by Ricardo Cervera · 11 years ago
  65. 7e435a0 Verify certificates by Marco Nelissen · 11 years ago
  66. 4ecd833 am 7baa7c80: Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev by JP Abgrall · 11 years ago
  67. 7baa7c8 Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev by JP Abgrall · 11 years ago
  68. 1066fc6 Resolved conflicts for merge of ad63d914 to jb-mr2-dev by Craig Mautner · 11 years ago
  69. 78f204a am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev by Chad Brubaker · 11 years ago
  70. 8e240af Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev by Chad Brubaker · 11 years ago
  71. ad63d91 am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top by Craig Mautner · 11 years ago
  72. 20a4f49 am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top by Craig Mautner · 11 years ago
  73. 817f558 am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top by Craig Mautner · 11 years ago
  74. 3d958f8 am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top by Craig Mautner · 11 years ago
  75. 468e8e9 am 1f52437d: Show the keyguard if unsecure window on top by Craig Mautner · 11 years ago
  76. fc1d047 am 11b7d9fa: Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev by Svetoslav · 11 years ago
  77. 11b7d9f Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev by Svetoslav · 11 years ago
  78. 1685816 am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev by Adrian Roos · 11 years ago
  79. cd0d8cb Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev by Adrian Roos · 11 years ago
  80. f7267c8 Merge "Doc change: Update developer video on home page carousel." into klp-docs by Joe Fernandez · 11 years ago
  81. 6d9b034 Fix typo in public logcat page. by John Spurlock · 11 years ago
  82. a5a921e am 4545b1d2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  83. ef6c947 Merge "docs: Added step to get JDK to the Android Studio install instructions." into klp-docs by Ricardo Cervera · 11 years ago
  84. 4545b1d Merge "Import translations. DO NOT MERGE" into klp-dev by Baligh Uddin · 11 years ago
  85. 91c9561 DO NOT MERGE - Fix keyguard pattern lockout bug by Adrian Roos · 11 years ago
  86. e5ad073 resolved conflicts for merge of c76345a3 to klp-dev-plus-aosp by Deepanshu Gupta · 11 years ago
  87. 3f7f322 ConnectivityService: add support to set TCP initial rwnd by JP Abgrall · 11 years ago
  88. acccf83 am b071a07d: am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." by Narayan Kamath · 11 years ago
  89. 6934a16 am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." by Narayan Kamath · 11 years ago
  90. 8d377b3 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" by Jeff Brown · 11 years ago
  91. 932d98a am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" by Jeff Brown · 11 years ago
  92. 2c5429f am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" by Jeff Brown · 11 years ago
  93. c91aae2 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" by Jeff Brown · 11 years ago
  94. e5191aa am a796168d: Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev by Dianne Hackborn · 11 years ago
  95. a796168 Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev by Dianne Hackborn · 11 years ago
  96. d5c6946 remove unnecessary switchUser call by Jianzheng Zhou · 11 years ago
  97. e11f4c5 Doc change: Update developer video on home page carousel. by Dirk Dougherty · 11 years ago
  98. 825dd9d am 73bd57f7: Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev by Jeff Brown · 11 years ago
  99. 73bd57f Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev by Jeff Brown · 11 years ago
  100. 0577d5e docs: Added step to get JDK to the Android Studio install instructions. by Ricardo Cervera · 11 years ago