Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 353dec9aa622738f68684234536fc5045cd38de6
  1. 353dec9 Merge "Shuffle FD ownership? \noideadog" am: 46331602ae am: d2c9fc5190 by Jeff Sharkey · 7 years ago
  2. f6604e9 Merge "Shuffle FD ownership? \noideadog" am: 46331602ae am: d2c9fc5190 by Jeff Sharkey · 7 years ago
  3. d2c9fc5 Merge "Shuffle FD ownership? \noideadog" am: 46331602ae by Jeff Sharkey · 7 years ago
  4. 2810a9b Merge "Work around b/70221552" am: f06d3a9857 am: b2432b2ab3 am: 9cd6280f6b by Alex Light · 7 years ago
  5. 9cd6280 Merge "Work around b/70221552" am: f06d3a9857 am: b2432b2ab3 by Alex Light · 7 years ago
  6. b2432b2 Merge "Work around b/70221552" am: f06d3a9857 by Alex Light · 7 years ago
  7. 4633160 Merge "Shuffle FD ownership? \noideadog" by Treehugger Robot · 7 years ago
  8. 09663b4 Merge "Add a hidden API for fgetfilecon(3)" am: 9b04b2fd0b am: c5d7fdef72 by Makoto Onuki · 7 years ago
  9. 6d915c7 Merge "VPN: Implement toString for VpnConfig." am: c874462c2d am: 52f56a2948 by Hugo Benichi · 7 years ago
  10. f76484a Merge "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c am: a96779b592 by Remi NGUYEN VAN · 7 years ago
  11. 39ddb13 Merge "Add a hidden API for fgetfilecon(3)" am: 9b04b2fd0b am: c5d7fdef72 by Makoto Onuki · 7 years ago
  12. f06d3a9 Merge "Work around b/70221552" by Treehugger Robot · 7 years ago
  13. e4e1ab8 Merge "VPN: Implement toString for VpnConfig." am: c874462c2d am: 52f56a2948 by Hugo Benichi · 7 years ago
  14. b6cbc78 Merge "Add tests for NetworkMonitor isCaptivePortal" am: 97ff63812c am: aebb44fd8e by Remi NGUYEN VAN · 7 years ago
  15. fb9247e Merge "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c by Remi NGUYEN VAN · 7 years ago
  16. 19dd987 Merge "Use fdeCheckPassword error code to indicate pw failure" am: d3d564a802 am: ccce8813bf by Paul Crowley · 7 years ago
  17. 238f479 Merge "Add tests for NetworkMonitor isCaptivePortal" am: 97ff63812c by Remi NGUYEN VAN · 7 years ago
  18. c5d7fde Merge "Add a hidden API for fgetfilecon(3)" am: 9b04b2fd0b by Makoto Onuki · 7 years ago
  19. 86aaaca Merge "Use fdeCheckPassword error code to indicate pw failure" am: d3d564a802 by Paul Crowley · 7 years ago
  20. 52f56a2 Merge "VPN: Implement toString for VpnConfig." am: c874462c2d by Hugo Benichi · 7 years ago
  21. 344960b Shuffle FD ownership? \noideadog by Jeff Sharkey · 7 years ago
  22. a96779b Merge "Add codewiz@, reminv@ to OWNERS for connectivity" am: 76f081be5c by Remi NGUYEN VAN · 7 years ago
  23. aebb44f Merge "Add tests for NetworkMonitor isCaptivePortal" am: 97ff63812c by Remi NGUYEN VAN · 7 years ago
  24. ccce881 Merge "Use fdeCheckPassword error code to indicate pw failure" am: d3d564a802 by Paul Crowley · 7 years ago
  25. 9fcf5fd Merge "HwBinder: IWYU IPCThreadState" am: 8f99093583 am: 272c444496 by Steven Moreland · 7 years ago
  26. 55ffb42 Merge "HwBinder: IWYU IPCThreadState" am: 8f99093583 am: 272c444496 by Steven Moreland · 7 years ago
  27. 272c444 Merge "HwBinder: IWYU IPCThreadState" am: 8f99093583 by Steven Moreland · 7 years ago
  28. 159799d Work around b/70221552 by Alex Light · 7 years ago
  29. 9b04b2f Merge "Add a hidden API for fgetfilecon(3)" by Makoto Onuki · 7 years ago
  30. c874462 Merge "VPN: Implement toString for VpnConfig." by Hugo Benichi · 7 years ago
  31. 76f081b Merge "Add codewiz@, reminv@ to OWNERS for connectivity" by Remi NGUYEN VAN · 7 years ago
  32. 97ff638 Merge "Add tests for NetworkMonitor isCaptivePortal" by Remi NGUYEN VAN · 7 years ago
  33. 0370e00 Merge "Merge Android Pie into master" am: e80b455065 am: 4464c9d05b by Xin Li · 7 years ago
  34. d2cb322 Add codewiz@, reminv@ to OWNERS for connectivity by Remi NGUYEN VAN · 7 years ago
  35. 31a9cc6 Merge "Merge Android Pie into master" am: e80b455065 am: 4464c9d05b by Xin Li · 7 years ago
  36. 312f37e Merge "Fix to mark disableApkUnlessMatchedSku hidden for all users" into pi-dev by Ruchi Kandoi · 7 years ago
  37. fd24585 Merge "Fix to mark disableApkUnlessMatchedSku hidden for all users" into pi-dev by TreeHugger Robot · 7 years ago
  38. a04c800 Fix to mark disableApkUnlessMatchedSku hidden for all users by Ruchi Kandoi · 7 years ago
  39. d3d564a Merge "Use fdeCheckPassword error code to indicate pw failure" by Treehugger Robot · 7 years ago
  40. 8f99093 Merge "HwBinder: IWYU IPCThreadState" by Steven Moreland · 7 years ago
  41. 4464c9d Merge "Merge Android Pie into master" am: e80b455065 by Xin Li · 7 years ago
  42. 28ff310 Merge "docs: Adding links to "about version" pages" into pi-dev am: 97229ed3e8 by Andrew Solovay · 7 years ago
  43. 97229ed Merge "docs: Adding links to "about version" pages" into pi-dev by Andrew Solovay · 7 years ago
  44. 003a46d Merge "wifi.proto: Add metric for installed passpoint profile type" into pi-dev by Ecco Park · 7 years ago
  45. 8f93809 Merge "wifi.proto: Add metric for installed passpoint profile type" into pi-dev by TreeHugger Robot · 7 years ago
  46. d20922c8 Merge "Add getter for X509 certificate" am: 38c9e614af am: 8547723200 by Adam Vartanian · 7 years ago
  47. b84bf6bc Merge "Add getter for X509 certificate" am: 38c9e614af am: 8547723200 by Adam Vartanian · 7 years ago
  48. fc0b519 Use fdeCheckPassword error code to indicate pw failure by Paul Crowley · 7 years ago
  49. e80b455 Merge "Merge Android Pie into master" by Xin Li · 7 years ago
  50. 8547723 Merge "Add getter for X509 certificate" am: 38c9e614af by Adam Vartanian · 7 years ago
  51. 38c9e61 Merge "Add getter for X509 certificate" by Treehugger Robot · 7 years ago
  52. d9a1cd7 Add tests for NetworkMonitor isCaptivePortal by Remi NGUYEN VAN · 7 years ago
  53. 30d7f75 Merge "Add logging for private DNS probes" am: 10c593cf7f am: 7eaf659610 by Remi NGUYEN VAN · 7 years ago
  54. bbb1de4 Merge "Add logging for private DNS probes" am: 10c593cf7f am: 7eaf659610 by Remi NGUYEN VAN · 7 years ago
  55. 7eaf659 Merge "Add logging for private DNS probes" am: 10c593cf7f by Remi NGUYEN VAN · 7 years ago
  56. 8d3cf32 Merge changes from topic "offlinesdk-docs" am: 003f49cf0c am: 7e1e76a6dc by Nan Zhang · 7 years ago
  57. 94c2c3f [automerger skipped] Add offline/online-sdk-docs in Soong. am: c3ce78d660 -s ours am: 361efeed1b -s ours by Nan Zhang · 7 years ago
  58. 02857a7 Merge Android Pie into master by Xin Li · 7 years ago
  59. bd2aeee Merge changes from topic "offlinesdk-docs" am: 003f49cf0c am: 7e1e76a6dc by Nan Zhang · 7 years ago
  60. cb3473c [automerger skipped] Add offline/online-sdk-docs in Soong. am: c3ce78d660 -s ours by Nan Zhang · 7 years ago
  61. bc442a8 Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs" am: f8e12c51d4 am: d9cb1b429a by Nan Zhang · 7 years ago
  62. 7e1e76a Merge changes from topic "offlinesdk-docs" am: 003f49cf0c by Nan Zhang · 7 years ago
  63. 361efee [automerger skipped] Add offline/online-sdk-docs in Soong. by Nan Zhang · 7 years ago
  64. 88a149e Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs" am: f8e12c51d4 by Nan Zhang · 7 years ago
  65. d9cb1b4 Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs" by Nan Zhang · 7 years ago
  66. c8ae454 Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master am: d18450d240 by Xin Li · 7 years ago
  67. 10c593c Merge "Add logging for private DNS probes" by Remi NGUYEN VAN · 7 years ago
  68. 86983ac Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master by Xin Li · 7 years ago
  69. d18450d Merge branch 'mirror-aosp-master' of sso://googleplex-android/platform/frameworks/base into stage-aosp-master by Xin Li · 7 years ago
  70. 003f49c Merge changes from topic "offlinesdk-docs" by Nan Zhang · 7 years ago
  71. f8e12c51 Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs" by Nan Zhang · 7 years ago
  72. 93b26da Merge "Don't insert certain numbers into the call log" into pi-dev by Hall Liu · 7 years ago
  73. a861ff7 docs: Adding links to "about version" pages by Andrew Solovay · 7 years ago
  74. b9d13df Merge "Remove public API methods from hiddenapi-light-greylist.txt" am: 88994b26cc am: 61f6dc4c24 by David Brazdil · 7 years ago
  75. 4deb593 Merge "Don't insert certain numbers into the call log" into pi-dev by Hall Liu · 7 years ago
  76. b80a1c4 Merge "Remove public API methods from hiddenapi-light-greylist.txt" am: 88994b26cc by David Brazdil · 7 years ago
  77. 61f6dc4 Merge "Remove public API methods from hiddenapi-light-greylist.txt" by David Brazdil · 7 years ago
  78. 9700015b Add a hidden API for fgetfilecon(3) by Makoto Onuki · 7 years ago
  79. 16ad2ab Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." am: 56104e6fb8 am: 212d9f76ba by rleix · 7 years ago
  80. 88994b26 Merge "Remove public API methods from hiddenapi-light-greylist.txt" by David Brazdil · 7 years ago
  81. 131b3b3 Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." am: 56104e6fb8 by rleix · 7 years ago
  82. 212d9f7 Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." by rleix · 7 years ago
  83. d73f82a [automerger skipped] Merge "Clean up MediaMetadataRetriever use" am: 9c7e9034ab -s ours am: 906b37ec09 -s ours by Hans Boehm · 7 years ago
  84. 2e966dc Merge "Clarify which methods return connected sockets" am: bce398bfd3 am: a618570424 by Adam Vartanian · 7 years ago
  85. 46da5c1 Merge "Add libcore as owners of relevant android/net files" am: 24f3809258 am: 484a866b19 by Adam Vartanian · 7 years ago
  86. 50ee0fb Merge "Add @UnsupportedAppUsage annotations" am: 44091cdb47 am: ec3f7c80ce by Mathew Inwood · 7 years ago
  87. 0da4e3b [automerger skipped] Merge "Clean up MediaMetadataRetriever use" am: 9c7e9034ab -s ours by Hans Boehm · 7 years ago
  88. cc46409 Merge "Add @UnsupportedAppUsage annotations" am: f336c03135 am: 230017d9b9 by Mathew Inwood · 7 years ago
  89. be6676d Merge "Clarify which methods return connected sockets" am: bce398bfd3 by Adam Vartanian · 7 years ago
  90. fb1d12a Merge "Add libcore as owners of relevant android/net files" am: 24f3809258 by Adam Vartanian · 7 years ago
  91. c7619a1 Merge "Add @UnsupportedAppUsage annotations" am: 3d05f769a3 am: 1d526c114f by Mathew Inwood · 7 years ago
  92. 9eb284c Merge "Add @UnsupportedAppUsage annotations" am: 44091cdb47 am: ec3f7c80ce by Mathew Inwood · 7 years ago
  93. f8397b2 Merge "Add @UnsupportedAppUsage annotations" am: f336c03135 am: 230017d9b9 by Mathew Inwood · 7 years ago
  94. 0a56b25 Merge "Add utils to convert Inet4Address <-> int" am: 5caebe3415 am: 2595e68176 by Remi NGUYEN VAN · 7 years ago
  95. 92019fc3 Merge "Add @UnsupportedAppUsage annotations" am: 3d05f769a3 am: 1d526c114f by Mathew Inwood · 7 years ago
  96. 004c334 Merge "Add utils to convert Inet4Address <-> int" am: 5caebe3415 am: 2595e68176 by Remi NGUYEN VAN · 7 years ago
  97. d4e9007 resolve merge conflicts of 627a84c26a84493ec675360b0aba56cde61e1482 to stage-dr1-aosp-master by David Brazdil · 7 years ago
  98. e6e6ec4 Don't insert certain numbers into the call log by Hall Liu · 7 years ago
  99. 906b37e [automerger skipped] Merge "Clean up MediaMetadataRetriever use" by Hans Boehm · 7 years ago
  100. 56104e6 Merge "Fix the system_error while calling thread::join() in NativeCallbackThread." by Treehugger Robot · 7 years ago