Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / 6a5fe34edfa75c4282db6fade142d582b0c8cd92
  1. 6a5fe34 resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master am: 8228eb3446 by Lorenzo Colitti · 7 years ago
  2. 8228eb3 resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master by Lorenzo Colitti · 7 years ago
  3. f947a12 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 am: 713a5420dd by Phil Weaver · 7 years ago
  4. 80c2eee Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 am: fef2328f35 by Phil Weaver · 7 years ago
  5. fd3f7f3 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 am: cfbe89ad32 -s ours by Phil Weaver · 7 years ago
  6. 713a542 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours am: 2a93c3d390 by Phil Weaver · 7 years ago
  7. fef2328 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 am: 4fa8b51c0c -s ours by Phil Weaver · 7 years ago
  8. 442fc85 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f am: ac700bc3c7 by Phil Weaver · 7 years ago
  9. ad09c7e DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a am: 982cf0d212 -s ours by Phil Weaver · 7 years ago
  10. 2a93c3d Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 by Phil Weaver · 7 years ago
  11. cfbe89a Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c am: b2e3fb162f by Phil Weaver · 7 years ago
  12. 4607ec8 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db am: d2c4007d8a by Phil Weaver · 7 years ago
  13. 4fa8b51 Merge "Back-port fixes for b/62196835" into nyc-dev am: 0b0834fbe8 by Phil Weaver · 7 years ago
  14. 982cf0d DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 am: 783253f6db by Phil Weaver · 7 years ago
  15. ac700bc Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f am: 27ad1fbc2c by Phil Weaver · 7 years ago
  16. b086ea5 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f am: faded53018 by Phil Weaver · 7 years ago
  17. 3700014 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 am: 79c476704f by Phil Weaver · 7 years ago
  18. b2e3fb1 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours am: bbb567757f by Phil Weaver · 7 years ago
  19. d2c4007 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae am: aa8976fa69 by Phil Weaver · 7 years ago
  20. 0b0834f Merge "Back-port fixes for b/62196835" into nyc-dev by Phil Weaver · 7 years ago
  21. faded53 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e am: a1dca32957 by Phil Weaver · 7 years ago
  22. 27ad1fb Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 am: 7e82d6204f -s ours by Phil Weaver · 7 years ago
  23. 783253f DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours am: f44b48acae by Phil Weaver · 7 years ago
  24. 79c4767 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c am: b968d99e3e by Phil Weaver · 7 years ago
  25. aa8976f DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d am: cf7ce06abd -s ours by Phil Weaver · 7 years ago
  26. bbb5677 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 am: 5264237c94 by Phil Weaver · 7 years ago
  27. a1dca32 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 am: 83261a8b5c by Phil Weaver · 7 years ago
  28. f44b48a DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb am: f05a6fc52d by Phil Weaver · 7 years ago
  29. 7e82d62 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c am: 68f7106cf4 by Phil Weaver · 7 years ago
  30. b968d99 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed am: 62eca82f89 by Phil Weaver · 7 years ago
  31. 83261a8 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e am: e11e076fed by Phil Weaver · 7 years ago
  32. cf7ce06 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 am: 219d9b5dfb by Phil Weaver · 7 years ago
  33. 5264237 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours am: 5d46833d9c by Phil Weaver · 7 years ago
  34. 62eca82 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 am: e06843fe7e by Phil Weaver · 7 years ago
  35. f05a6fc DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours am: 76007bb240 by Phil Weaver · 7 years ago
  36. 68f7106 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e am: 37cf6265db -s ours by Phil Weaver · 7 years ago
  37. e11e076 Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours am: 68efc2e5b5 by Phil Weaver · 7 years ago
  38. 219d9b5 DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 am: ccbac7e9e0 -s ours by Phil Weaver · 7 years ago
  39. e06843f Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours by Phil Weaver · 7 years ago
  40. 5d46833 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours am: 954deb1c6e by Phil Weaver · 7 years ago
  41. cd3633f Merge "Launch NetD in a different thread" am: c721dce3fc am: 709f3c1d46 by nharold · 7 years ago
  42. 76007bb DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1 by Phil Weaver · 7 years ago
  43. 68efc2e Back-port fixes for b/62196835 am: fd0ca151a6 am: 3c4d24923c -s ours by Phil Weaver · 7 years ago
  44. 597556e Merge "Remove ALOGD_IF_SLOW" am: b793aa8c81 -s ours am: 3ed109136c -s ours by Tom Cherry · 7 years ago
  45. 70267e2 Merge "Remove a TODO associate with starting a thread" am: c685e1e4a1 by Neil Fuller · 7 years ago
  46. 709f3c1 Merge "Launch NetD in a different thread" am: c721dce3fc by nharold · 7 years ago
  47. 238be4a Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 am: d2bf323c40 by Steven Moreland · 7 years ago
  48. 3ed1091 Merge "Remove ALOGD_IF_SLOW" am: b793aa8c81 -s ours by Tom Cherry · 7 years ago
  49. d61516d Merge "Remove a TODO associate with starting a thread" am: c685e1e4a1 by Neil Fuller · 7 years ago
  50. d2bf323 Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23c5 by Steven Moreland · 7 years ago
  51. a1d67fb Merge changes from topic 'tether-offload-cherrypick' by Lorenzo Colitti · 7 years ago
  52. 37cf626 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 -s ours by Phil Weaver · 7 years ago
  53. 954deb1 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev by Phil Weaver · 7 years ago
  54. ccbac7e DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours by Phil Weaver · 7 years ago
  55. 3c4d249 Back-port fixes for b/62196835 am: fd0ca151a6 by Phil Weaver · 7 years ago
  56. ff115bf DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours by Phil Weaver · 7 years ago
  57. a620b21 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev by Phil Weaver · 7 years ago
  58. c721dce Merge "Launch NetD in a different thread" by nharold · 7 years ago
  59. b793aa8 Merge "Remove ALOGD_IF_SLOW" by Tom Cherry · 7 years ago
  60. 7a23705 Back-port fixes for b/62196835 by Phil Weaver · 7 years ago
  61. d17160b Add code to dump OffloadController state. by Lorenzo Colitti · 7 years ago
  62. 4ca0ba8 Fetch tethering offload stats. by Lorenzo Colitti · 7 years ago
  63. 07f1304 Allow more than one source of tethering statistics. by Lorenzo Colitti · 7 years ago
  64. c685e1e Merge "Remove a TODO associate with starting a thread" by Treehugger Robot · 7 years ago
  65. 17ee5db Remove a TODO associate with starting a thread by Neil Fuller · 7 years ago
  66. 042534c Update JNI code in preparation for ICU 59 switching to C++11 char16_t. by Fredrik Roubert · 7 years ago
  67. 253e515 Update JNI code in preparation for ICU 59 switching to C++11 char16_t. by Fredrik Roubert · 7 years ago
  68. b0e0508 Launch NetD in a different thread by Nathan Harold · 7 years ago
  69. 899a1f2 Merge "Reference nativehelper/jni.h as jni.h" by Treehugger Robot · 7 years ago
  70. be25a82 Merge "BootReceiver: check console-ramoops-0" am: a09784ac75 am: e7715b35ea by Mark Salyzyn · 7 years ago
  71. 1a35cf3 Merge "Address post-commit review comments" am: 858634e4ec am: 5c15f6d6b1 by Neil Fuller · 7 years ago
  72. c8eaf5a Merge "Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b" into oc-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  73. bae79da Merge "Remove unnecessary TODOs" am: a5c96cf4bf am: 08cff4c76b by Neil Fuller · 7 years ago
  74. 84a4d3d Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev by Benjamin Miller · 7 years ago
  75. e7715b3 Merge "BootReceiver: check console-ramoops-0" am: a09784ac75 by Mark Salyzyn · 7 years ago
  76. 444616f Merge "Remove TODOs that are not needed" am: 0f9842304a am: 5c2cfc51c5 by Neil Fuller · 7 years ago
  77. 5c15f6d Merge "Address post-commit review comments" am: 858634e4ec by Neil Fuller · 7 years ago
  78. d726ff9 Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev by TreeHugger Robot · 7 years ago
  79. 08cff4c Merge "Remove unnecessary TODOs" am: a5c96cf4bf by Neil Fuller · 7 years ago
  80. a09784a Merge "BootReceiver: check console-ramoops-0" by Treehugger Robot · 7 years ago
  81. 5c2cfc5 Merge "Remove TODOs that are not needed" am: 0f9842304a by Neil Fuller · 7 years ago
  82. 858634e Merge "Address post-commit review comments" by Neil Fuller · 7 years ago
  83. a5c96cf Merge "Remove unnecessary TODOs" by Neil Fuller · 7 years ago
  84. 0f98423 Merge "Remove TODOs that are not needed" by Neil Fuller · 7 years ago
  85. cf6e784 Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." am: 66af025fea by xutianguo · 7 years ago
  86. 75bd16d Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." by xutianguo · 7 years ago
  87. 66af025 Merge "Make BluetoothStateChangeCallback oneway to prevent waiting on response." by Treehugger Robot · 7 years ago
  88. 18c139c BootReceiver: check console-ramoops-0 by Mark Salyzyn · 7 years ago
  89. 94f7e0f Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master am: d600905e4a by Tom Cherry · 7 years ago
  90. d600905 Merge "Remove ALOGD_IF_SLOW" into stage-aosp-master by Tom Cherry · 7 years ago
  91. 889f995 Reference nativehelper/jni.h as jni.h by Steven Moreland · 7 years ago
  92. a5325e1 Make BluetoothStateChangeCallback oneway to prevent waiting on response. by xutianguo · 7 years ago
  93. 7afa84c Docs-change: clarification of LauncherApps.getApplicationInfo() by Benjamin Miller · 7 years ago
  94. 43d17a6 Merge "Check ManagedResource is NonNull before Checking Owner" am: d1ffb13437 by nharold · 7 years ago
  95. 28f6784 Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." am: 0f3d90eec8 -s ours by Fredrik Roubert · 7 years ago
  96. e38e57c Merge "Check ManagedResource is NonNull before Checking Owner" am: d1ffb13437 by nharold · 7 years ago
  97. cd53e91 Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." by Fredrik Roubert · 7 years ago
  98. 8f4a536 Remove unnecessary TODOs by Neil Fuller · 7 years ago
  99. a9f0eeb Remove TODOs that are not needed by Neil Fuller · 7 years ago
  100. d1ffb13 Merge "Check ManagedResource is NonNull before Checking Owner" by nharold · 7 years ago