Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 9fb42f07784ac9e1ab29fa7d5bcda6c3081d238f
  1. 9fb42f0 resolved conflicts for merge of a75b0ad3 to master by John Reck · 10 years ago
  2. a75b0ad resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp by John Reck · 10 years ago
  3. e1a96f7 am 1c88fc00: am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev by Winson Chung · 10 years ago
  4. 1568aa6 am d205d407: am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev by Jim Miller · 10 years ago
  5. a766b75 am c377c360: am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev by xinhe · 10 years ago
  6. 6abe46c am 58a3561f: am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev by Wink Saville · 10 years ago
  7. 1d94907 am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev by Christopher Tate · 10 years ago
  8. 1c88fc0 am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev by Winson Chung · 10 years ago
  9. d205d40 am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev by Jim Miller · 10 years ago
  10. c377c36 am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev by xinhe · 10 years ago
  11. 58a3561 am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev by Wink Saville · 10 years ago
  12. dff5580 am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev by Christopher Tate · 10 years ago
  13. afda110 am 348b03bf: (-s ours) am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  14. 41398aa am a79eea5c: (-s ours) am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  15. a0e6d49 am a786837b: (-s ours) am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  16. 48af2cf am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev by Robert Greenwalt · 10 years ago
  17. 1aef3b1 am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev by Eino-Ville Talvala · 10 years ago
  18. c22369b am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  19. 1a1b894 am 979ed514: am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev by Alan Viverette · 10 years ago
  20. 722dee3e am 11bee890: am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  21. e01ae15 am e168dd28: am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev by Yin-Chia Yeh · 10 years ago
  22. 348b03b am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  23. a79eea5 am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  24. a786837 am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  25. 83c0b096 am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev by Robert Greenwalt · 10 years ago
  26. 431b65d am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev by Eino-Ville Talvala · 10 years ago
  27. 3c8a439 am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  28. 979ed51 am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev by Alan Viverette · 10 years ago
  29. 11bee89 am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  30. e168dd2 am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev by Yin-Chia Yeh · 10 years ago
  31. 0dd0233 am b3c60bcb: am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" by Craig Mautner · 10 years ago
  32. f597aae am e762f986: am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" by Chih-hung Hsieh · 10 years ago
  33. b3c60bc am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" by Craig Mautner · 10 years ago
  34. e762f98 am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" by Chih-hung Hsieh · 10 years ago
  35. 3ce8733 Merge "Update accessibility event constants in the service registration XML." by Svet Ganov · 10 years ago
  36. 6337740 am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" by Adam Lesinski · 10 years ago
  37. 8e8a24d am c0707c00: am 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev by Michael Wright · 10 years ago
  38. 976cf9d am fc09908b: (-s ours) am 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev by Michael Wright · 10 years ago
  39. 6465980 am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed" by Craig Mautner · 10 years ago
  40. 0ebbfae am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" by Chih-hung Hsieh · 10 years ago
  41. a51a090 am bd15e4f5: Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev by John Reck · 10 years ago
  42. 4eb896e am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev by Winson Chung · 10 years ago
  43. f2b934b am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev by Jim Miller · 10 years ago
  44. 9a4472b am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev by xinhe · 10 years ago
  45. 0304c52 am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev by Wink Saville · 10 years ago
  46. e808d2d am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev by Christopher Tate · 10 years ago
  47. e1c0032 Merge "Allow compilation with Jack." by Yohann Roussel · 10 years ago
  48. 8e5362f am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" by Adam Lesinski · 10 years ago
  49. 48d196b Merge "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  50. 2dadff7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  51. 4d69f10 Merge "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  52. 3b05d2b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  53. 09a45a2 Merge "Import translations. DO NOT MERGE" by Geoff Mendal · 10 years ago
  54. 2253b8c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev by Geoff Mendal · 10 years ago
  55. e879b2ae Merge "Prevent ANR when broadcast receiver is killed" by Craig Mautner · 10 years ago
  56. 4472fa97 Prevent ANR when broadcast receiver is killed by Kenji Sugimoto · 10 years ago
  57. fdd2442 Update accessibility event constants in the service registration XML. by Svet Ganov · 10 years ago
  58. ccce6e0 Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS" by Chih-hung Hsieh · 10 years ago
  59. bd15e4f Merge "Resume RT-animations after a pauseSurface" into lmp-mr1-dev by John Reck · 10 years ago
  60. ba1307b Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev by Winson Chung · 10 years ago
  61. 3ea6824 Merge "Stop keyguard from spamming the log" into lmp-mr1-dev by Jim Miller · 10 years ago
  62. 8f61e75 Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev by xinhe · 10 years ago
  63. 18b9c3c Unable to unlock SIM with a PIN/PUK by xinhe · 10 years ago
  64. 8b6bd4d Stop keyguard from spamming the log by Jim Miller · 10 years ago
  65. 82611e6 Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev by Wink Saville · 10 years ago
  66. 758f4521 Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev by Christopher Tate · 10 years ago
  67. 98f8118 am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev by Robert Greenwalt · 10 years ago
  68. 6e21817 am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev by Eino-Ville Talvala · 10 years ago
  69. 647b437 Merge "Separate voice/data roaming state and type" into lmp-mr1-dev by Robert Greenwalt · 10 years ago
  70. d23f8b4 Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev by Eino-Ville Talvala · 10 years ago
  71. c676866 am c9b862cf: am 06eaac44: am cdf7f984: Merge "Doze: Fast path for pickup pulses." into lmp-mr1-dev by John Spurlock · 10 years ago
  72. 16d7574 am 3a8fbb80: am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-dev by Sreeram Ramachandran · 10 years ago
  73. 64d3c14 am a2ab707c: am 89b55fc5: am 7ab0ad1f: Add a global override for VoLTE calls (which leaves user setting in place) by Etan Cohen · 10 years ago
  74. 07b2b9f am 62a7022f: am 56f10c26: am a9355bd1: Merge "Handle keyguard dismiss flags correctly" into lmp-mr1-dev by Craig Mautner · 10 years ago
  75. ea28e5f am 8e78f0a7: am 9aa9e46b: am 5244ab68: am b769fc0c: am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs by Trevor Johns · 10 years ago
  76. 4888e33 am d0dca6f3: am f560f334: am e218d0d3: am 25bc6be2: am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs by Trevor Johns · 10 years ago
  77. 1e24dfb am 8db20dc1: am 2047e6a0: am 4360c12b: am 740b22a5: am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs by Trevor Johns · 10 years ago
  78. 3b8887d am fee5e3d3: am 50511096: am de9848c6: Merge "Initial changes to add callback on task stack changes. (Bug 17672056, Bug 18291345)" into lmp-mr1-dev by Winson Chung · 10 years ago
  79. f50d111 am c0362c5d: am 10dff0a7: am 5ce118d1: Merge "Re-add Connection.getCallCapabilities" into lmp-mr1-dev by Evan Charlton · 10 years ago
  80. ba6f884 am 5125dc1c: am a1163d57: am 6963ff0e: Merge "Change a semi-colon to a colon in AudioState logging." into lmp-mr1-dev by Nancy Chen · 10 years ago
  81. 97af724 am 3249d637: am 3107a9ad: am f805ba7d: Merge "Retry failed network validation every 10 minutes." into lmp-mr1-dev by Paul Jensen · 10 years ago
  82. 11cf12f am 455550d5: am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to Proguard Keep set" into lmp-mr1-dev by Adam Lesinski · 10 years ago
  83. 98866d1 am b46e9da6: am bedd1744: am ef44c051: Merge "Work on issue #18572506: AppOps in-memory state is invalid after..." into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  84. e4657d4 am bf6f7960: am b67d8ef6: am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev by Adrian Roos · 10 years ago
  85. b9f2345 am dc026baf: am 5303451e: am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev by Svetoslav · 10 years ago
  86. 22c6550 am 5a938481: am d6b001f1: am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev by Jason Monk · 10 years ago
  87. 8dd5cd7 am 23d7930c: am b0607472: am 195c4388: Fixing bugs in the LLand. by Daniel Sandler · 10 years ago
  88. 0ad1202 am dfa931b4: am 5f23693b: am 3f6755f5: CEC: Check command type for power status monitor action by Jinsuk Kim · 10 years ago
  89. 596be3a am a34a7d21: am 418eecb6: am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev by Craig Mautner · 10 years ago
  90. 41762ec am 45cd4df6: am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev by Lorenzo Colitti · 10 years ago
  91. 9da0c5e am 35a2d360: am 0821a566: am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev by Filip Gruszczynski · 10 years ago
  92. 43a5124 am c0ab1086: am 25a05188: am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev by Dongwon Kang · 10 years ago
  93. b255e49 Ensuring that the alpha and translation animation durations are the same. (Bug 18609321) by Winson Chung · 10 years ago
  94. e6333e5 am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  95. f696efa Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  96. fc33cdf Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776) by Winson Chung · 10 years ago
  97. 3977137 am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev by Alan Viverette · 10 years ago
  98. 4c4e468 am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev by Dianne Hackborn · 10 years ago
  99. d3adf09 Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev by Alan Viverette · 10 years ago
  100. 31f2569 Adjust wallpaper-restore acceptance criteria by Christopher Tate · 10 years ago