Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / ab96721a57637cc9132bddb09f407d2a9976dce8
  1. ab96721 resolve merge conflicts of 4b39c15da0f5 to nyc-mr2-dev-plus-aosp by Ajay Panicker · 7 years ago
  2. 4b39c15 Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a am: 89d2b46a4a by Marie Janssen · 7 years ago
  3. c1a5939 Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c am: 4034a9a96a by Marie Janssen · 7 years ago
  4. 89d2b46 Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c by Marie Janssen · 7 years ago
  5. 5cd3bb9 Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" am: 14c7e67da8 by Svetoslav Ganov · 7 years ago
  6. 6006d68 Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" by Svetoslav Ganov · 7 years ago
  7. 14c7e67 Merge "fix IndexOutOfBoundsException in AccessibilityManagerService..manageServicesLocked" by Svetoslav Ganov · 7 years ago
  8. 4034a9a Merge commit 'faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c by Marie Janssen · 7 years ago
  9. b81a0cb Merge changes from topics 'Passpoint API update', 'Passpoint intent update' am: 5df03b3d74 by Peter Qiu · 7 years ago
  10. a21dbef hotspot2: hide validate method for Passpoint configuration am: b5ca6f36b5 by Peter Qiu · 7 years ago
  11. ff5be64 Osu: temporarily comment out the usage of deprecated intent definitions am: 06b63dcb9f by Peter Qiu · 7 years ago
  12. d26acda hotspot2: update Passpoint intent definitions am: 5679145d9a am: c4d5850d3e by Peter Qiu · 7 years ago
  13. 39df78e Merge changes from topics 'Passpoint API update', 'Passpoint intent update' by Peter Qiu · 7 years ago
  14. 9c0f6f3d hotspot2: hide validate method for Passpoint configuration am: b5ca6f36b5 by Peter Qiu · 7 years ago
  15. de91bfd Osu: temporarily comment out the usage of deprecated intent definitions by Peter Qiu · 7 years ago
  16. c4d5850 hotspot2: update Passpoint intent definitions am: 5679145d9a by Peter Qiu · 7 years ago
  17. 5df03b3 Merge changes from topics 'Passpoint API update', 'Passpoint intent update' by Treehugger Robot · 7 years ago
  18. faf4070 Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-dev by Marie Janssen · 7 years ago
  19. 9b9158f Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0 am: 11c5ff0399 by Kenny Guy · 7 years ago
  20. d49386ea Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0 by Kenny Guy · 7 years ago
  21. 11c5ff0 Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 by Kenny Guy · 7 years ago
  22. 00b77ed Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 by Kenny Guy · 7 years ago
  23. c5d8673 Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev by Kenny Guy · 7 years ago
  24. 2df7f9f Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev by Kenny Guy · 7 years ago
  25. eb04c52 Merge "Address some comments on IpManagerTest" am: b2afa1ede5 am: dea2371e71 by Erik Kline · 7 years ago
  26. dea2371 Merge "Address some comments on IpManagerTest" am: b2afa1ede5 by Erik Kline · 7 years ago
  27. b2afa1e Merge "Address some comments on IpManagerTest" by Treehugger Robot · 7 years ago
  28. 246bc1f Address some comments on IpManagerTest by Erik Kline · 7 years ago
  29. 4e8ae3e Merge "Skeleton of an IpManagerTest" am: db4333a2c2 am: cf07e0d541 by Erik Kline · 7 years ago
  30. cf07e0d Merge "Skeleton of an IpManagerTest" am: db4333a2c2 by Erik Kline · 7 years ago
  31. db4333a Merge "Skeleton of an IpManagerTest" by Treehugger Robot · 7 years ago
  32. aa95ae5 Skeleton of an IpManagerTest by Erik Kline · 7 years ago
  33. 7c825ee Merge "carrier default app notification polish" am: b2bb98e62d am: 921a49f7f8 by fionaxu · 7 years ago
  34. 921a49f Merge "carrier default app notification polish" am: b2bb98e62d by fionaxu · 7 years ago
  35. b2bb98e Merge "carrier default app notification polish" by Treehugger Robot · 7 years ago
  36. 7c4ad78 carrier default app notification polish by fionaxu · 7 years ago
  37. 3efd531 hotspot2: update Passpoint configuration management APIs by Peter Qiu · 8 years ago
  38. b5ca6f3 hotspot2: hide validate method for Passpoint configuration by Peter Qiu · 8 years ago
  39. 06b63dc Osu: temporarily comment out the usage of deprecated intent definitions by Peter Qiu · 7 years ago
  40. 2ebaf34 Merge "Bluetooth 5 spelling fixes" am: 5465fe0a2d am: 58569de4de by Jakub Pawlowski · 7 years ago
  41. 58569de Merge "Bluetooth 5 spelling fixes" am: 5465fe0a2d by Jakub Pawlowski · 7 years ago
  42. 5465fe0 Merge "Bluetooth 5 spelling fixes" by Jakub Pawlowski · 7 years ago
  43. 4c618d8 Merge "Fix the reset of boosted zygote thread priority." am: 83aceea07d by Hiroshi Yamauchi · 7 years ago
  44. bc2991e Bluetooth 5 spelling fixes by Jakub Pawlowski · 7 years ago
  45. 55310df Merge "Fix the reset of boosted zygote thread priority." am: 83aceea07d by Hiroshi Yamauchi · 7 years ago
  46. 5679145 hotspot2: update Passpoint intent definitions by Peter Qiu · 8 years ago
  47. 83aceea0 Merge "Fix the reset of boosted zygote thread priority." by Hiroshi Yamauchi · 7 years ago
  48. 04ed650 Fix the reset of boosted zygote thread priority. by Hiroshi Yamauchi · 8 years ago
  49. 3d61c89 Merge "Minor formatting cleanup to remove overlong line" am: d6998d4bd6 by Hugo Benichi · 7 years ago
  50. cc935f5 Merge "Minor formatting cleanup to remove overlong line" am: d6998d4bd6 by Hugo Benichi · 7 years ago
  51. d6998d4 Merge "Minor formatting cleanup to remove overlong line" by Hugo Benichi · 7 years ago
  52. 1673f71 Merge "ConnectivityManager: unhide methods with Handler argument" am: e940d5458d by Hugo Benichi · 7 years ago
  53. 5c5850d Merge "ConnectivityManager: unhide methods with Handler argument" am: e940d5458d by Hugo Benichi · 7 years ago
  54. e940d54 Merge "ConnectivityManager: unhide methods with Handler argument" by Hugo Benichi · 7 years ago
  55. bc559ba Merge "Simple cleanups to Tethering" am: 7eaa2ad172 am: 921c40c0ce by Hugo Benichi · 7 years ago
  56. 921c40c Merge "Simple cleanups to Tethering" am: 7eaa2ad172 by Hugo Benichi · 7 years ago
  57. 7eaa2ad Merge "Simple cleanups to Tethering" by Hugo Benichi · 7 years ago
  58. 7f96308 Merge "Move mac_permissions to etc/selinux" am: b063fe384f am: 1376b937ed by Jeff Vander Stoep · 7 years ago
  59. 1376b93 Merge "Move mac_permissions to etc/selinux" am: b063fe384f by Jeff Vander Stoep · 7 years ago
  60. b063fe3 Merge "Move mac_permissions to etc/selinux" by Treehugger Robot · 7 years ago
  61. d2820e4 Move mac_permissions to etc/selinux by Jeff Vander Stoep · 7 years ago
  62. bb76af7 Merge "Add a config for WiFi exponential backoff scan base interval" am: c25e2b79b1 by Randy Pan · 7 years ago
  63. aa72261 Merge "Add a config for WiFi exponential backoff scan base interval" by Randy Pan · 7 years ago
  64. c25e2b7 Merge "Add a config for WiFi exponential backoff scan base interval" by Treehugger Robot · 7 years ago
  65. ac4eac8 Merge "Refactor code incompatible with Mockito 2.7.13" am: 2a3a4f81f9 by Paul Duffin · 7 years ago
  66. 17e5a2d Merge "Refactor code incompatible with Mockito 2.7.13" am: 2a3a4f81f9 by Paul Duffin · 7 years ago
  67. 2a3a4f8 Merge "Refactor code incompatible with Mockito 2.7.13" by Paul Duffin · 7 years ago
  68. 9c0c173 Add a config for WiFi exponential backoff scan base interval by Randy Pan · 7 years ago
  69. dff2c71 Merge "[AWARE] Update network API: make open/encrypted explicit" am: 3dee29581e by Etan Cohen · 7 years ago
  70. 652aa82 Merge "[AWARE] Update network API: make open/encrypted explicit" am: 3dee29581e by Etan Cohen · 7 years ago
  71. 3dee295 Merge "[AWARE] Update network API: make open/encrypted explicit" by Etan Cohen · 7 years ago
  72. 26e81d2 Refactor code incompatible with Mockito 2.7.13 by Paul Duffin · 8 years ago
  73. b920519 Merge "polish the notification of the default carrier app" am: b224b318a0 by fionaxu · 8 years ago
  74. 64e0d45 Merge "polish the notification of the default carrier app" am: b224b318a0 by fionaxu · 8 years ago
  75. 780c1cc Merge "decouple carrierdefaultapp from phone process" am: e32fc81c5d by fionaxu · 8 years ago
  76. b224b31 Merge "polish the notification of the default carrier app" by Treehugger Robot · 8 years ago
  77. 1fdd29d Merge "decouple carrierdefaultapp from phone process" am: e32fc81c5d by fionaxu · 8 years ago
  78. e32fc81 Merge "decouple carrierdefaultapp from phone process" by Treehugger Robot · 8 years ago
  79. 9100932 decouple carrierdefaultapp from phone process by fionaxu · 8 years ago
  80. b55fb22 Simple cleanups to Tethering by Hugo Benichi · 8 years ago
  81. ff22f82 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1 am: 6ca67f067a am: e385c8a0b9 by Fyodor Kupolov · 8 years ago
  82. aeb33eb Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1 am: 6ca67f067a by Fyodor Kupolov · 8 years ago
  83. e385c8a Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a am: ff5be765b1 by Fyodor Kupolov · 8 years ago
  84. 6ca67f0 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours am: 1fd70c201a by Fyodor Kupolov · 8 years ago
  85. ff5be76 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f am: f7cde31747 -s ours by Fyodor Kupolov · 8 years ago
  86. 1fd70c2 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 am: f937aabb0f by Fyodor Kupolov · 8 years ago
  87. f7cde31 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 am: 9e2cf8e5c4 by Fyodor Kupolov · 8 years ago
  88. f937aab Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours am: aa0b718886 by Fyodor Kupolov · 8 years ago
  89. 1bba0ba Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f am: a1aa5cb34a am: e3e01cc375 am: 6ce5879e11 by Fyodor Kupolov · 8 years ago
  90. 15cf9d5 [DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours am: 567e742daf am: 5a16e06272 am: 73ceabb948 am: e2aeaa9998 by Fyodor Kupolov · 8 years ago
  91. 9e2cf8e Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 am: 2411b4f774 -s ours by Fyodor Kupolov · 8 years ago
  92. 68b9522 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f am: a1aa5cb34a am: e3e01cc375 by Fyodor Kupolov · 8 years ago
  93. aa0b718 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours am: 2c112c4ad2 by Fyodor Kupolov · 8 years ago
  94. 52a0172 [DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours am: 567e742daf am: 5a16e06272 am: 73ceabb948 by Fyodor Kupolov · 8 years ago
  95. 2411b4f Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours am: de9cb7ed68 -s ours by Fyodor Kupolov · 8 years ago
  96. 6ce5879 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f am: a1aa5cb34a by Fyodor Kupolov · 8 years ago
  97. e2aeaa9 [DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours am: 1c732801ab am: 78861ad53e -s ours am: 13df27e68b am: a3912b6a1b am: 0766ba70c0 am: 46dbe6a7d0 -s ours am: 567e742daf am: 5a16e06272 by Fyodor Kupolov · 8 years ago
  98. 2c112c4 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours by Fyodor Kupolov · 8 years ago
  99. e3e01cc Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am: d2e8e1488a -s ours am: 1e6d3f904e am: ce677737ec -s ours am: b76704bf25 am: ad386addb9 am: bbb7ae05d4 am: 1aaef53444 -s ours am: 9c4d89c55f by Fyodor Kupolov · 8 years ago
  100. 59ac10e Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 am: 105b0ff30c -s ours am: 677a8879c0 am: 360cb87db4 am: 109ac1c0b6 am: 48a36cdade -s ours am: e8fb34b44c am: c4054a8b7f am: 885acaff75 am: 4d1253afcc by Fyodor Kupolov · 8 years ago