Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / ad3947bb4376158a270ca0b87571d533dcc7f97b
  1. ad3947b Merge "Remove explicit dependencies on "core" libraries" am: 18f9a2c24d by Neil Fuller · 6 years ago
  2. d252f61 Merge "Remove explicit dependencies on "core" libraries" am: 18f9a2c24d by Neil Fuller · 6 years ago
  3. 18f9a2c Merge "Remove explicit dependencies on "core" libraries" by Neil Fuller · 6 years ago
  4. c877cf7 Merge "NetworkMonitor: add log of CaptivePortal result" am: 35d6512a5d by Chalard Jean · 6 years ago
  5. 689f888 Merge "NetworkMonitor: add log of CaptivePortal result" am: 35d6512a5d by Chalard Jean · 6 years ago
  6. f13ec86 Merge "[PT13] Simple cleanup of ProxyTracker." am: afa7fdabaa am: 0f81f1e332 by Chalard Jean · 6 years ago
  7. 35d6512 Merge "NetworkMonitor: add log of CaptivePortal result" by Chalard Jean · 6 years ago
  8. 0f81f1e Merge "[PT13] Simple cleanup of ProxyTracker." am: afa7fdabaa by Chalard Jean · 6 years ago
  9. afa7fda Merge "[PT13] Simple cleanup of ProxyTracker." by Chalard Jean · 6 years ago
  10. ae15939 Merge "Fix incorrect javadoc link" am: 293ab4941b am: d96fe8ddd0 by Nan Zhang · 6 years ago
  11. 4318ece Merge "[PT12] Factor some code into ProxyTracker." am: f24b6c77a6 am: 1a70721041 by Chalard Jean · 6 years ago
  12. d96fe8d Merge "Fix incorrect javadoc link" am: 293ab4941b by Nan Zhang · 6 years ago
  13. a305fbf [automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b am: 7656e1177f -s ours by Jeff Sharkey · 6 years ago
  14. 1a70721 Merge "[PT12] Factor some code into ProxyTracker." am: f24b6c77a6 by Chalard Jean · 6 years ago
  15. 607cdde [automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac am: af72f01db8 am: 80c65f6ce7 am: cef9bae62d -s ours by Jeff Sharkey · 6 years ago
  16. 58d1ac4 [automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c am: 893598cd4b by Jeff Sharkey · 6 years ago
  17. f85bd2b [automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac am: af72f01db8 am: 80c65f6ce7 by Jeff Sharkey · 6 years ago
  18. 7656e11 Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am: ab80221a8c by Jeff Sharkey · 6 years ago
  19. cef9bae [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac am: af72f01db8 by Jeff Sharkey · 6 years ago
  20. 893598c Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev by Jeff Sharkey · 6 years ago
  21. 80c65f6 [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am: 301d17e4dd am: 010585fe3c am: 6ef77aedac am: ae30765665 skipped: 50e06f25ac by Jeff Sharkey · 6 years ago
  22. ab80221 Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev by Jeff Sharkey · 6 years ago
  23. 293ab49 Merge "Fix incorrect javadoc link" by Treehugger Robot · 6 years ago
  24. f24b6c7 Merge "[PT12] Factor some code into ProxyTracker." by Chalard Jean · 6 years ago
  25. ff88bfd Merge "Merge "Recover shady content:// paths." into pi-dev am: 7402d7611c" into pi-dev-plus-aosp by Android Build Merger (Role) · 6 years ago
  26. 83e5229 Merge "Recover shady content:// paths." into pi-dev am: 7402d7611c by Jeff Sharkey · 6 years ago
  27. d55d5c2 Merge "Add log for debugging ConnectivityManager" am: 4b48dca2e8 am: e3c0f28a1e by Chalard Jean · 6 years ago
  28. e3c0f28 Merge "Add log for debugging ConnectivityManager" am: 4b48dca2e8 by Chalard Jean · 6 years ago
  29. 7402d76 Merge "Recover shady content:// paths." into pi-dev by TreeHugger Robot · 6 years ago
  30. 4b48dca Merge "Add log for debugging ConnectivityManager" by Chalard Jean · 6 years ago
  31. 83fb35a Merge "Fix the incorrect javadoc links" into pi-dev-plus-aosp by Nan Zhang · 6 years ago
  32. 66923b2 [automerger skipped] Merge "Add the metalava_enabled property" am: 69251fca46 by Sundong Ahn · 6 years ago
  33. 83a2bc6 Merge "Add the metalava_enabled property" am: 69251fca46 by Sundong Ahn · 6 years ago
  34. 55581d9 Fix the incorrect javadoc links by Nan Zhang · 6 years ago
  35. 69251fc Merge "Add the metalava_enabled property" by Treehugger Robot · 6 years ago
  36. 6c288ef Fix incorrect javadoc link by Nan Zhang · 6 years ago
  37. e3630c8 Merge "Introduce AlternativeNetwork APIs" am: 98966bcbb6 am: 10211c1f68 by Sooraj Sasindran · 6 years ago
  38. 10211c1 Merge "Introduce AlternativeNetwork APIs" am: 98966bcbb6 by Sooraj Sasindran · 6 years ago
  39. 98966bc Merge "Introduce AlternativeNetwork APIs" by Sooraj Sasindran · 6 years ago
  40. acca5fa Merge "Camera: Trivial doc update" am: e9f1e8c123 am: 9481340777 by Shuzhen Wang · 6 years ago
  41. 9481340 Merge "Camera: Trivial doc update" am: e9f1e8c123 by Shuzhen Wang · 6 years ago
  42. c3f2df9 Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa am: ca854cc2b9 by Jordan Liu · 6 years ago
  43. ca854cc Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa by Jordan Liu · 6 years ago
  44. e9f1e8c Merge "Camera: Trivial doc update" by Shuzhen Wang · 6 years ago
  45. 5101473 Merge "Update PROPERTY_HIGH_DEF_AUDIO API docs." am: 5674805cda am: f17f1d7cdc by Tyler Gunn · 6 years ago
  46. b8037c2 Merge changes I7070326d,I8346e53c am: 546073a5b6 am: 11e9a86034 by Janis Danisevskis · 6 years ago
  47. f17f1d7 Merge "Update PROPERTY_HIGH_DEF_AUDIO API docs." am: 5674805cda by Tyler Gunn · 6 years ago
  48. 11e9a86 Merge changes I7070326d,I8346e53c am: 546073a5b6 by Janis Danisevskis · 6 years ago
  49. bb9f855 Merge "getTelephonyProperty returns defaultVal" by Treehugger Robot · 6 years ago
  50. 5674805 Merge "Update PROPERTY_HIGH_DEF_AUDIO API docs." by Treehugger Robot · 6 years ago
  51. 546073a Merge changes I7070326d,I8346e53c by Treehugger Robot · 6 years ago
  52. 809d600 Merge "Create URI for individual user settings in SIMINFO" am: cb90628990 by Chen Xu · 6 years ago
  53. 2c0e416 Merge "Create URI for individual user settings in SIMINFO" am: cb90628990 by Chen Xu · 6 years ago
  54. cb90628 Merge "Create URI for individual user settings in SIMINFO" by Chen Xu · 6 years ago
  55. 6b6ae55 Update PROPERTY_HIGH_DEF_AUDIO API docs. by Tyler Gunn · 6 years ago
  56. 082f3e4 Merge "Remove ResponseCache from apache-http" am: 73e8858e4b am: 47fa25edbc by Neil Fuller · 6 years ago
  57. 2b3d861 Merge "Remove ResponseCache from apache-http" am: 73e8858e4b by Neil Fuller · 6 years ago
  58. ad4230a Remove ResponseCache from apache-http am: 0a7b572079 by Neil Fuller · 6 years ago
  59. 47fa25e Merge "Remove ResponseCache from apache-http" am: 73e8858e4b by Neil Fuller · 6 years ago
  60. 32e446b Introduce AlternativeNetwork APIs by Sooraj Sasindran · 6 years ago
  61. 73e8858 Merge "Remove ResponseCache from apache-http" by Treehugger Robot · 6 years ago
  62. 12e585e Merge changes Icd51c4c7,I836ecb94 am: 3590eb09ef am: b03f3c8ba2 by David Brazdil · 6 years ago
  63. 569055d Add OWNERS file to AndroidKeystoreSPI implementation by Janis Danisevskis · 6 years ago
  64. cfd0b01 Merge changes into stage-aosp-master am: 2d7b242700 by Andreas Gampe · 6 years ago
  65. 2b11fdd Camera: Trivial doc update by Shuzhen Wang · 6 years ago
  66. b03f3c8 Merge changes Icd51c4c7,I836ecb94 am: 3590eb09ef by David Brazdil · 6 years ago
  67. 9e9c3b1 Merge changes into stage-aosp-master am: 680f735ef1 by Andreas Gampe · 6 years ago
  68. 01c3c2f KeyguardStateMonitor looses connection with keystore if keystore dies by Janis Danisevskis · 6 years ago
  69. 7bd2e0c Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check" am: 9135811848 by Andreas Gampe · 6 years ago
  70. 066ca17 Remove explicit dependencies on "core" libraries by Neil Fuller · 6 years ago
  71. 2d7b242 Merge changes into stage-aosp-master by Android Build Merger (Role) · 6 years ago
  72. 680f735 Merge changes into stage-aosp-master by Android Build Merger (Role) · 6 years ago
  73. b9da528 Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check" am: 9135811848 by Andreas Gampe · 6 years ago
  74. 3590eb0 Merge changes Icd51c4c7,I836ecb94 by David Brazdil · 6 years ago
  75. 9135811 Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check" by Treehugger Robot · 6 years ago
  76. 367f6a2 [automerger skipped] Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" am: e908a1d318 -s ours by Tadashi G. Takaoka · 6 years ago
  77. f7a03e7 [automerger skipped] Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" by Tadashi G. Takaoka · 6 years ago
  78. 98ece3b Merge "Whitelist free short code batch for 2018 Q3" am: be338ad5a0 by Fabrício Ferracioli · 6 years ago
  79. 9dd53f0 Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: a3b3b6468e by Chalard Jean · 6 years ago
  80. 262153b Merge "Whitelist free short code batch for 2018 Q3" am: be338ad5a0 by Fabrício Ferracioli · 6 years ago
  81. d75467d Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" by Chalard Jean · 6 years ago
  82. e908a1d Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" by Treehugger Robot · 6 years ago
  83. be338ad Merge "Whitelist free short code batch for 2018 Q3" by Fabrício Ferracioli · 6 years ago
  84. a3b3b64 Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" by Treehugger Robot · 6 years ago
  85. a8d5543 Add entries to hidden api greylist by David Brazdil · 6 years ago
  86. 8a91d3f Add method to hidden api greylist by David Brazdil · 6 years ago
  87. ee098b5 Merge "Remove unused import" am: ab81538d6b am: 5fb271a34b by Neil Fuller · 6 years ago
  88. 5fb271a Merge "Remove unused import" am: ab81538d6b by Neil Fuller · 6 years ago
  89. ab81538 Merge "Remove unused import" by Neil Fuller · 6 years ago
  90. 18c909c Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests" by Tadashi G. Takaoka · 6 years ago
  91. 7ec816b Merge "Refactor tetherGetStats by using stable aidl structure" am: 335253df0f by Luke Huang · 6 years ago
  92. f81dce0 Merge "Refactor tetherGetStats by using stable aidl structure" am: 335253df0f by Luke Huang · 6 years ago
  93. 335253d Merge "Refactor tetherGetStats by using stable aidl structure" by Luke Huang · 6 years ago
  94. e9d3865 Merge "Merge "Do not start VrManagerService if VR is not supported" into pi-dev am: 2667c1dfa2" into pi-dev-plus-aosp by Android Build Merger (Role) · 6 years ago
  95. 04618d5 Merge "Do not start VrManagerService if VR is not supported" into pi-dev by Rick Yiu · 6 years ago
  96. 340e84d Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: cf1176073d am: 7886cfcf56 by Jack He · 6 years ago
  97. 096371b Merge changes If834d0f0,I05ec75c7 into pi-dev am: 6d61113df4 by Rick Yiu · 6 years ago
  98. 968c247 Merge "Add null check for vrManager" into pi-dev am: dd7047b4e8 by Rick Yiu · 6 years ago
  99. 7886cfc Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am: cf1176073d by Jack He · 6 years ago
  100. cf11760 Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" by Treehugger Robot · 6 years ago