Google Git
Sign in
android / platform / system / update_engine / b1e063a383115ae2bbc62cbd64047c913724921c
commitb1e063a383115ae2bbc62cbd64047c913724921c[log] [tgz]
authorSen Jiang <senj@google.com>Fri Sep 15 17:44:31 2017 -0700
committerSen Jiang <senj@google.com>Tue Sep 19 18:06:04 2017 -0700
tree8b382a32f5f6d487617e811b03692c5eea52790c
parent9321f501029e7c0fdca55db3a79c9dcb24e4a767 [diff]
Only accept cohort in app that matches product id.

The system app also has cohort data but it's empty, and it overwrites
the one in product app.
We don't really care about the cohort for system app, so ignore them.

Bug: 65414782
Test: unittests
Change-Id: Ie4b6f93563ec5a8d76e22e23a863ba7e04b9f119
(cherry picked from commit 8fd11a1907bb7a33678d3c38443eedfcf3e8e1e6)
2 files changed
tree: 8b382a32f5f6d487617e811b03692c5eea52790c
  1. binder_bindings/
  2. client_library/
  3. common/
  4. dbus_bindings/
  5. init/
  6. payload_consumer/
  7. payload_generator/
  8. sample_images/
  9. scripts/
  10. update_manager/
  11. update_payload_key/
  12. .clang-format ⇨ ../../build/tools/brillo-clang-format
  13. .gitignore
  14. Android.mk
  15. binder_service_android.cc
  16. binder_service_android.h
  17. binder_service_brillo.cc
  18. binder_service_brillo.h
  19. boot_control_android.cc
  20. boot_control_android.h
  21. boot_control_chromeos.cc
  22. boot_control_chromeos.h
  23. boot_control_chromeos_unittest.cc
  24. boot_control_recovery.cc
  25. boot_control_recovery.h
  26. boot_control_recovery_stub.cc
  27. certificate_checker.cc
  28. certificate_checker.h
  29. certificate_checker_unittest.cc
  30. chrome_browser_proxy_resolver.cc
  31. chrome_browser_proxy_resolver.h
  32. chrome_browser_proxy_resolver_unittest.cc
  33. common_service.cc
  34. common_service.h
  35. common_service_unittest.cc
  36. connection_manager.cc
  37. connection_manager.h
  38. connection_manager_android.cc
  39. connection_manager_android.h
  40. connection_manager_interface.h
  41. connection_manager_unittest.cc
  42. connection_utils.cc
  43. connection_utils.h
  44. CPPLINT.cfg
  45. daemon.cc
  46. daemon.h
  47. daemon_state_android.cc
  48. daemon_state_android.h
  49. daemon_state_interface.h
  50. dbus_connection.cc
  51. dbus_connection.h
  52. dbus_service.cc
  53. dbus_service.h
  54. dbus_test_utils.h
  55. fake_file_writer.h
  56. fake_p2p_manager.h
  57. fake_p2p_manager_configuration.h
  58. fake_shill_proxy.cc
  59. fake_shill_proxy.h
  60. fake_system_state.cc
  61. fake_system_state.h
  62. generate_pc_file.sh
  63. hardware_android.cc
  64. hardware_android.h
  65. hardware_chromeos.cc
  66. hardware_chromeos.h
  67. hardware_chromeos_unittest.cc
  68. image_properties.h
  69. image_properties_android.cc
  70. image_properties_android_unittest.cc
  71. image_properties_chromeos.cc
  72. image_properties_chromeos_unittest.cc
  73. libcurl_http_fetcher.cc
  74. libcurl_http_fetcher.h
  75. libupdate_engine-client-test.pc.in
  76. libupdate_engine-client.pc.in
  77. local_coverage_rate
  78. main.cc
  79. metrics.cc
  80. metrics.h
  81. metrics_utils.cc
  82. metrics_utils.h
  83. metrics_utils_unittest.cc
  84. mock_certificate_checker.h
  85. mock_connection_manager.h
  86. mock_file_writer.h
  87. mock_omaha_request_params.h
  88. mock_p2p_manager.h
  89. mock_payload_state.h
  90. mock_power_manager.h
  91. mock_proxy_resolver.h
  92. mock_service_observer.h
  93. mock_update_attempter.h
  94. MODULE_LICENSE_APACHE2
  95. network_selector.h
  96. network_selector_android.cc
  97. network_selector_android.h
  98. network_selector_interface.h
  99. network_selector_stub.cc
  100. network_selector_stub.h
  101. NOTICE
  102. omaha_request_action.cc
  103. omaha_request_action.h
  104. omaha_request_action_unittest.cc
  105. omaha_request_params.cc
  106. omaha_request_params.h
  107. omaha_request_params_unittest.cc
  108. omaha_response.h
  109. omaha_response_handler_action.cc
  110. omaha_response_handler_action.h
  111. omaha_response_handler_action_unittest.cc
  112. omaha_utils.cc
  113. omaha_utils.h
  114. omaha_utils_unittest.cc
  115. OWNERS
  116. p2p_manager.cc
  117. p2p_manager.h
  118. p2p_manager_unittest.cc
  119. parcelable_update_engine_status.cc
  120. parcelable_update_engine_status.h
  121. payload_state.cc
  122. payload_state.h
  123. payload_state_interface.h
  124. payload_state_unittest.cc
  125. power_manager_android.cc
  126. power_manager_android.h
  127. power_manager_chromeos.cc
  128. power_manager_chromeos.h
  129. power_manager_interface.h
  130. PRESUBMIT.cfg
  131. PREUPLOAD.cfg
  132. proxy_resolver.cc
  133. proxy_resolver.h
  134. proxy_resolver_unittest.cc
  135. pylintrc
  136. real_system_state.cc
  137. real_system_state.h
  138. run_unittests
  139. sample_omaha_v3_response.xml
  140. service_delegate_android_interface.h
  141. service_observer_interface.h
  142. shill_proxy.cc
  143. shill_proxy.h
  144. shill_proxy_interface.h
  145. sideload_main.cc
  146. system_state.h
  147. tar_bunzip2.gypi
  148. test_http_server.cc
  149. test_subprocess.cc
  150. testrunner.cc
  151. unittest_key.pem
  152. unittest_key2.pem
  153. update_attempter.cc
  154. update_attempter.h
  155. update_attempter_android.cc
  156. update_attempter_android.h
  157. update_attempter_unittest.cc
  158. update_engine-client.gyp
  159. update_engine.conf
  160. update_engine.gyp
  161. update_engine.rc
  162. update_engine_client.cc
  163. update_engine_client_android.cc
  164. update_metadata.proto
  165. update_status_utils.cc
  166. update_status_utils.h
  167. UpdateEngine.conf
  168. utils_android.cc
  169. utils_android.h
  170. WATCHLISTS