1. 6e4da21 DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master by Xin Li · 5 years ago main master android-o-mr1-iot-release-1.0.13 android-o-mr1-iot-release-1.0.14
  2. 0a029e8 [automerger skipped] DO NOT MERGE am: 228fddfc05 -s ours by Xin Li · 5 years ago
  3. 38fd604 [automerger skipped] DO NOT MERGE am: 228fddfc05 -s ours by Xin Li · 5 years ago
  4. 228fddf DO NOT MERGE by Xin Li · 5 years ago oreo-mr1-iot-release android-o-mr1-iot-release-1.0.10 android-o-mr1-iot-release-1.0.12 android-o-mr1-iot-release-1.0.7 android-o-mr1-iot-release-1.0.8 android-q-preview-1 android-q-preview-2.5 android-q-preview-4 android-q-preview-5 android-q-preview-6
  5. 2bcda45 Snap for 4496165 from 83c1d9346149bb1615328a13d15873a455754633 to pi-release by android-build-team Robot · 6 years ago pie-cts-release pie-cuttlefish-testing pie-gsi pie-platform-release pie-r2-release pie-r2-s1-release pie-r2-s2-release pie-release pie-release-2 pie-s2-release pie-security-release pie-vts-release security-pi-release android-9.0.0_r1 android-9.0.0_r10 android-9.0.0_r17 android-9.0.0_r18 android-9.0.0_r2 android-9.0.0_r3 android-9.0.0_r48 android-9.0.0_r49 android-9.0.0_r5 android-9.0.0_r50 android-9.0.0_r51 android-9.0.0_r52 android-9.0.0_r53 android-9.0.0_r54 android-9.0.0_r55 android-9.0.0_r56 android-9.0.0_r57 android-9.0.0_r58 android-9.0.0_r59 android-9.0.0_r6 android-9.0.0_r60 android-9.0.0_r61 android-9.0.0_r7 android-9.0.0_r8 android-9.0.0_r9 android-cts-9.0_r1 android-cts-9.0_r10 android-cts-9.0_r11 android-cts-9.0_r12 android-cts-9.0_r13 android-cts-9.0_r14 android-cts-9.0_r15 android-cts-9.0_r16 android-cts-9.0_r17 android-cts-9.0_r18 android-cts-9.0_r19 android-cts-9.0_r2 android-cts-9.0_r20 android-cts-9.0_r3 android-cts-9.0_r4 android-cts-9.0_r5 android-cts-9.0_r6 android-cts-9.0_r7 android-cts-9.0_r8 android-cts-9.0_r9 android-security-9.0.0_r62 android-security-9.0.0_r63 android-security-9.0.0_r64 android-security-9.0.0_r65 android-security-9.0.0_r66 android-security-9.0.0_r67 android-security-9.0.0_r68 android-security-9.0.0_r69 android-security-9.0.0_r70 android-security-9.0.0_r71 android-security-9.0.0_r72 android-security-9.0.0_r73 android-security-9.0.0_r74 android-security-9.0.0_r75 android-security-9.0.0_r76 android-vts-9.0_r10 android-vts-9.0_r11 android-vts-9.0_r12 android-vts-9.0_r13 android-vts-9.0_r14 android-vts-9.0_r15 android-vts-9.0_r16 android-vts-9.0_r17 android-vts-9.0_r18 android-vts-9.0_r19 android-vts-9.0_r4 android-vts-9.0_r5 android-vts-9.0_r6 android-vts-9.0_r7 android-vts-9.0_r8 android-vts-9.0_r9 android-wear-9.0.0_r1 android-wear-9.0.0_r10 android-wear-9.0.0_r11 android-wear-9.0.0_r12 android-wear-9.0.0_r13 android-wear-9.0.0_r14 android-wear-9.0.0_r15 android-wear-9.0.0_r16 android-wear-9.0.0_r17 android-wear-9.0.0_r18 android-wear-9.0.0_r19 android-wear-9.0.0_r2 android-wear-9.0.0_r20 android-wear-9.0.0_r21 android-wear-9.0.0_r22 android-wear-9.0.0_r23 android-wear-9.0.0_r24 android-wear-9.0.0_r25 android-wear-9.0.0_r26 android-wear-9.0.0_r27 android-wear-9.0.0_r28 android-wear-9.0.0_r29 android-wear-9.0.0_r3 android-wear-9.0.0_r30 android-wear-9.0.0_r31 android-wear-9.0.0_r32 android-wear-9.0.0_r33 android-wear-9.0.0_r34 android-wear-9.0.0_r4 android-wear-9.0.0_r5 android-wear-9.0.0_r6 android-wear-9.0.0_r7 android-wear-9.0.0_r8 android-wear-9.0.0_r9
  6. 83c1d93 Manually merge changes from giant AOSP topic by Stephen Li · 6 years ago master-cuttlefish-testing-release oreo-mr1-1.2-iot-release pie-b4s4-dev pie-b4s4-release pie-dev pie-dr1-dev pie-dr1-release pie-qpr1-release pie-qpr1-s1-release pie-qpr1-s2-release pie-qpr1-s3-release pie-qpr2-release pie-qpr3-b-release pie-qpr3-release pie-qpr3-s1-release android-9.0.0_r11 android-9.0.0_r12 android-9.0.0_r16 android-9.0.0_r19 android-9.0.0_r20 android-9.0.0_r21 android-9.0.0_r22 android-9.0.0_r30 android-9.0.0_r31 android-9.0.0_r32 android-9.0.0_r33 android-9.0.0_r34 android-9.0.0_r35 android-9.0.0_r36 android-9.0.0_r37 android-9.0.0_r38 android-9.0.0_r39 android-9.0.0_r40 android-9.0.0_r41 android-9.0.0_r42 android-9.0.0_r43 android-9.0.0_r44 android-9.0.0_r45 android-9.0.0_r46 android-9.0.0_r47 android-o-mr1-iot-release-1.0.3 android-o-mr1-iot-release-1.0.4 android-o-mr1-iot-release-1.0.5 android-o-mr1-iot-release-smart-clock-fcs android-o-mr1-iot-release-smart-clock-fsi android-o-mr1-iot-release-smart-clock-r2 android-o-mr1-iot-release-smart-clock-r6 android-o-mr1-iot-release-smart-display-r14 android-o-mr1-iot-release-smart-display-r22 android-o-mr1-iot-release-smart-display-r3 android-o-mr1-iot-release-smart-display-r30 android-o-mr1-iot-release-smart-display-r39 android-o-mr1-iot-release-smart-display-r4 android-o-mr1-iot-release-smart-display-r40.1J android-o-mr1-iot-release-smart-display-r5 android-o-mr1-iot-release-smart-display-r8 android-o-mr1-iot-release-smart-display-r9 android-wear-8.0.0_r2
  7. 2ea3bab DO NOT MERGE: Merge Oreo MR1 into master am: 85184fbd6a -s ours am: 6d2293f755 by Xin Li · 6 years ago
  8. 6d2293f DO NOT MERGE: Merge Oreo MR1 into master am: 85184fbd6a -s ours by Xin Li · 6 years ago
  9. 85184fb DO NOT MERGE: Merge Oreo MR1 into master by Xin Li · 6 years ago o-mr1-iot-preview-7 o-mr1-iot-preview-8 android-o-mr1-iot-preview-7 android-o-mr1-iot-preview-8 android-o-mr1-iot-release-1.0.0 android-o-mr1-iot-release-1.0.1 android-o-mr1-iot-release-1.0.2 android-p-preview-1 android-p-preview-2 android-p-preview-3 android-p-preview-4 android-p-preview-5 android-wear-8.0.0_r1 android-wear-p-preview-2
  10. 1760c2b Remove out of date contents. by Joe LaPenna · 7 years ago oreo-mr1-dev
  11. da4d91c Add OWNERS in packages/services/NetworkRecommendation am: 87a0ebe5a0 am: a455993a49 am: 9264ab18a0 by Chih-Hung Hsieh · 7 years ago
  12. 727389b Add OWNERS in packages/services/NetworkRecommendation am: 87a0ebe5a0 am: a455993a49 by Chih-Hung Hsieh · 7 years ago o-mr1-iot-preview-6 android-o-mr1-iot-preview-6
  13. 9264ab1 Add OWNERS in packages/services/NetworkRecommendation am: 87a0ebe5a0 by Chih-Hung Hsieh · 7 years ago android-o-mr1-preview-1 android-o-mr1-preview-2
  14. a455993 Add OWNERS in packages/services/NetworkRecommendation am: 87a0ebe5a0 by Chih-Hung Hsieh · 7 years ago
  15. 87a0ebe Add OWNERS in packages/services/NetworkRecommendation by Chih-Hung Hsieh · 7 years ago o-iot-preview-5 android-o-iot-preview-5 android-o-preview-4
  16. 8d901f9 Merge "Don't build NetworkRecommendation." into oc-dev am: b8fbe77a30 by Jeremy Joslin · 7 years ago oreo-dr1-dev
  17. e237621 Merge "Don't build NetworkRecommendation." into oc-dev am: b8fbe77a30 by Jeremy Joslin · 7 years ago
  18. b8fbe77 Merge "Don't build NetworkRecommendation." into oc-dev by TreeHugger Robot · 7 years ago oreo-dev android-vts-8.0_r1 android-vts-8.0_r2
  19. 84f935e Don't build NetworkRecommendation. by Jeremy Joslin · 7 years ago
  20. 9ce242d Updates based on API council guidance. am: 9f75401bb8 am: 3cc7577383 by Jeff Sharkey · 7 years ago
  21. 3cc7577 Updates based on API council guidance. am: 9f75401bb8 by Jeff Sharkey · 7 years ago
  22. 9f75401 Updates based on API council guidance. by Jeff Sharkey · 7 years ago
  23. 979382c Stop using deprecated APIs. by Jeff Sharkey · 7 years ago
  24. 2f6ca59 Update netrec components to latest spec. am: 724e94175d am: 2218ce64d8 by Joe LaPenna · 7 years ago
  25. 2218ce6 Update netrec components to latest spec. am: 724e94175d by Joe LaPenna · 7 years ago
  26. 724e941 Update netrec components to latest spec. by Joe LaPenna · 7 years ago
  27. 4e49964 Merge "Add test config to NetworkRecommendationTests" by TreeHugger Robot · 7 years ago
  28. f355ffa Update netrec. am: 69639e9bb9 am: 569d879246 by Joe LaPenna · 7 years ago
  29. 569d879 Update netrec. am: 69639e9bb9 by Joe LaPenna · 7 years ago
  30. 69639e9 Update netrec. by Joe LaPenna · 7 years ago
  31. 019e651 Merge "Add/update strings for wifi wake and open networks" by Amin Shaikh · 7 years ago
  32. 9687836 Add/update strings for wifi wake and open networks by Amin Shaikh · 7 years ago
  33. 29a0cc4 Change the small icon of Wi-Fi notifications in networkrecommendation. by Stephen Chen · 7 years ago
  34. 4b645ec Add test config to NetworkRecommendationTests by Dan Shi · 7 years ago
  35. 8f8960e Update AOSP network recommendation service label. by Amin Shaikh · 7 years ago
  36. 013ba58 Move WideAreaNetworks.java to config by Joe LaPenna · 7 years ago
  37. 2567b5b Merge "Change name of default network recommendation provider." by TreeHugger Robot · 7 years ago
  38. e7c3b4b Change name of default network recommendation provider. by Stephen Chen · 7 years ago
  39. 846ac9b Merge "packages/services/NetworkRecommendation: Add APCT tests to the device-tests suite." by TreeHugger Robot · 7 years ago
  40. 77c83c9 packages/services/NetworkRecommendation: Add APCT tests to the device-tests suite. by Simran Basi · 7 years ago
  41. 2d9b0d4 Merge "Stop using ScoredNetworks.BADGING_ constants" by TreeHugger Robot · 7 years ago
  42. afd6abf Update notify and wakeup code. by Joe LaPenna · 7 years ago
  43. 325162d Stop using ScoredNetworks.BADGING_ constants by Joe LaPenna · 7 years ago
  44. 3f38723 Set the label of network recommendation service. by Stephen Chen · 7 years ago
  45. f160dcf Update tests. by Joe LaPenna · 7 years ago
  46. 0ec2cba Update /wakeup/ by Joe LaPenna · 7 years ago
  47. d044813 Merge "Update /notify/." by TreeHugger Robot · 7 years ago
  48. ff32635 Update /notify/. by Joe LaPenna · 7 years ago
  49. ba3ce37 Merge "Updated DefaultNetworkRecommendationProvider to use the new ctor." by TreeHugger Robot · 7 years ago
  50. 0f602a6 Move Badging from ScoredNetwork to NetworkingBadging. by Sundeep Ghuman · 7 years ago
  51. a6a5644 Updated DefaultNetworkRecommendationProvider to use the new ctor. by Jeremy Joslin · 7 years ago
  52. 408ffe6 Update notify code. by Joe LaPenna · 7 years ago
  53. 197976b Add an example robolectric test. by Joe LaPenna · 7 years ago
  54. 02076ca Add string "common_connecting." by Joe LaPenna · 7 years ago
  55. 57b8d55 Update util classes by Joe LaPenna · 7 years ago
  56. b3208cc Update to add config parameters, improved ssid handling. by Joe LaPenna · 7 years ago
  57. 8da7500 Use google formatter rather than checkstyle. by Joe LaPenna · 7 years ago
  58. c39d038 Merge "Update deps structure, add new Blog class for easier logging" by TreeHugger Robot · 7 years ago
  59. eded5c0 Update deps structure, add new Blog class for easier logging by Joe LaPenna · 7 years ago
  60. a6d5d1b Add robolectric support for netrec. by Joe LaPenna · 7 years ago
  61. 3ae41f6 Move code around for better organization. by Joe LaPenna · 7 years ago
  62. 00fbb9f Renamed currentRecommendedWifiConfig to defaultWifiConfig. am: 80b6db66f6 am: f401c4316e am: 4aa49102a8 by Jeremy Joslin · 7 years ago
  63. 98734c1 Renamed currentRecommendedWifiConfig to defaultWifiConfig. am: 80b6db66f6 am: f401c4316e by Jeremy Joslin · 7 years ago android-o-preview-2 android-o-preview-3 android-wear-o-preview-3 android-wear-o-preview-4
  64. 4aa4910 Renamed currentRecommendedWifiConfig to defaultWifiConfig. am: 80b6db66f6 by Jeremy Joslin · 7 years ago
  65. f401c43 Renamed currentRecommendedWifiConfig to defaultWifiConfig. am: 80b6db66f6 by Jeremy Joslin · 7 years ago
  66. 80b6db6 Renamed currentRecommendedWifiConfig to defaultWifiConfig. by Jeremy Joslin · 7 years ago o-preview android-o-preview-1
  67. 235a787 Renamed currentRecommendedWifiConfig to defaultWifiConfig. by Jeremy Joslin · 7 years ago
  68. 8b788b9 Update Wi-Fi Wakeup notification action. by Amin Shaikh · 7 years ago
  69. 8fda493 Add Wi-Fi Enabled notification. am: f61eea388f am: 1ea05f9f3f am: e66a2cd7ae by Amin Shaikh · 7 years ago
  70. e631896 Add Wi-Fi Enabled notification. am: f61eea388f am: 1ea05f9f3f am: e66a2cd7ae by Amin Shaikh · 7 years ago
  71. e66a2cd Add Wi-Fi Enabled notification. am: f61eea388f am: 1ea05f9f3f by Amin Shaikh · 7 years ago
  72. 1ea05f9 Add Wi-Fi Enabled notification. am: f61eea388f by Amin Shaikh · 7 years ago
  73. f61eea3 Add Wi-Fi Enabled notification. by Amin Shaikh · 7 years ago
  74. 12c2e72 Make sure notifications work when score is provided but no badging. am: e14eb36c16 am: 6d5c1366f0 am: 0484c4a6df by Stephen Chen · 7 years ago
  75. e1be0a6 Make sure notifications work when score is provided but no badging. am: e14eb36c16 am: 6d5c1366f0 by Stephen Chen · 7 years ago
  76. 0484c4a Make sure notifications work when score is provided but no badging. am: e14eb36c16 by Stephen Chen · 7 years ago
  77. 6d5c136 Make sure notifications work when score is provided but no badging. by Stephen Chen · 7 years ago
  78. e14eb36 Make sure notifications work when score is provided but no badging. by Stephen Chen · 7 years ago
  79. ffa758e Revert "Disable notification and wakeup controller" by Joe LaPenna · 7 years ago
  80. 2015def resolve merge conflicts of c8d623e to master by Mark Salyzyn · 7 years ago
  81. c8d623e Request recommendations for WifiNotificationController via provider. am: 69631bf8a6 am: 534074986a by Stephen Chen · 7 years ago
  82. e542dd4 Compile NetworkRecommendation with the system jar. am: f3811fdd2f am: 6589ef9d68 by Joe LaPenna · 7 years ago
  83. f83c2ee Request recommendations for WifiNotificationController via provider. am: 69631bf8a6 by Stephen Chen · 7 years ago
  84. 9973bc5 Compile NetworkRecommendation with the system jar. am: f3811fdd2f am: 6589ef9d68 by Joe LaPenna · 7 years ago
  85. 5340749 Request recommendations for WifiNotificationController via provider. by Stephen Chen · 7 years ago
  86. 6589ef9 Compile NetworkRecommendation with the system jar. am: f3811fdd2f by Joe LaPenna · 7 years ago
  87. 69631bf Request recommendations for WifiNotificationController via provider. by Stephen Chen · 7 years ago
  88. f3811fd Compile NetworkRecommendation with the system jar. by Joe LaPenna · 7 years ago
  89. aa52733 Make the start range for rssi constant. am: 996de25b83 am: d921271b25 am: ff0ceac48f by Joe LaPenna · 7 years ago
  90. 9639d67 Make the start range for rssi constant. am: 996de25b83 am: d921271b25 by Joe LaPenna · 7 years ago
  91. ff0ceac Make the start range for rssi constant. am: 996de25b83 am: d921271b25 by Joe LaPenna · 7 years ago
  92. d921271 Make the start range for rssi constant. am: 996de25b83 by Joe LaPenna · 7 years ago
  93. 996de25 Make the start range for rssi constant. by Joe LaPenna · 7 years ago
  94. 8b3b74c Disable notification and wakeup controller by Joe LaPenna · 7 years ago
  95. c903239 Merge "Make the start range for rssi constant." by TreeHugger Robot · 7 years ago
  96. df15f00 Make the start range for rssi constant. by Joe LaPenna · 7 years ago
  97. e23e5b3 Send a mock badge score to the scorer, too. am: 7df9dcf237 am: 0c47a23050 am: 71077769c3 by Joe LaPenna · 7 years ago
  98. e98ec0c Send a mock badge score to the scorer, too. am: 7df9dcf237 am: 0c47a23050 by Joe LaPenna · 7 years ago
  99. 7107776 Send a mock badge score to the scorer, too. am: 7df9dcf237 am: 0c47a23050 by Joe LaPenna · 7 years ago
  100. 0c47a23 Send a mock badge score to the scorer, too. am: 7df9dcf237 by Joe LaPenna · 7 years ago