Google Git
Sign in
android / platform / packages / modules / DnsResolver / 3665a1c
commit3665a1c991063a4531c93f3d0ccaa3154d3da3e6[log] [tgz]
authorTreehugger Robot <treehugger-gerrit@google.com>Wed Jun 10 11:47:09 2020 +0000
committerKen Chen <cken@google.com>Wed Jun 10 16:37:11 2020 +0000
tree853a2e63d4c941b486a204a12158c63b7f73beee
parent8c45bfb848cd6da0258093b6bd37cf4745b1df0a [diff]
Remove RESOLV_INJECT_CA_CERTIFICATE

The cppflags RESOLV_INJECT_CA_CERTIFICATE prevents test CA certificate
injection interface to be misused in production build. However, it will
also leads to resolv_integration_test fail while the resolver is built
for mainline release. Remove RESOLV_INJECT_CA_CERTIFICATE to get test
pass. The CA certificate injection interface is still protected by
permission check in DnsResolverService::setResolverConfiguration().

Bug: 147792436
Test: 1. build and install com.android.resolv from aml branch
      2. atest resolv_integration_test

Merged-In: Id03566dcaceab0f8c78fe705cb8f6f6c806082ca
Change-Id: Ibb59239b2aa1848f133593333115cd9d41249824
(cherry picked from commit 450aa6bfba55c48c83939db4dc4695042666fac2)
2 files changed
tree: 853a2e63d4c941b486a204a12158c63b7f73beee
  1. aidl_api/
  2. apex/
  3. binder/
  4. include/
  5. tests/
  6. .clang-format ⇨ ../../../build/soong/scripts/system-clang-format
  7. .editorconfig
  8. Android.bp
  9. Dns64Configuration.cpp
  10. Dns64Configuration.h
  11. DnsProxyListener.cpp
  12. DnsProxyListener.h
  13. DnsQueryLog.cpp
  14. DnsQueryLog.h
  15. DnsQueryLogTest.cpp
  16. DnsResolver.cpp
  17. DnsResolver.h
  18. DnsResolverService.cpp
  19. DnsResolverService.h
  20. DnsStats.cpp
  21. DnsStats.h
  22. DnsStatsTest.cpp
  23. DnsTlsDispatcher.cpp
  24. DnsTlsDispatcher.h
  25. DnsTlsQueryMap.cpp
  26. DnsTlsQueryMap.h
  27. DnsTlsServer.cpp
  28. DnsTlsServer.h
  29. DnsTlsSessionCache.cpp
  30. DnsTlsSessionCache.h
  31. DnsTlsSocket.cpp
  32. DnsTlsSocket.h
  33. DnsTlsSocketFactory.h
  34. DnsTlsTransport.cpp
  35. DnsTlsTransport.h
  36. Experiments.cpp
  37. Experiments.h
  38. ExperimentsTest.cpp
  39. getaddrinfo.cpp
  40. getaddrinfo.h
  41. gethnamaddr.cpp
  42. gethnamaddr.h
  43. hostent.h
  44. IDnsTlsSocket.h
  45. IDnsTlsSocketFactory.h
  46. IDnsTlsSocketObserver.h
  47. libnetd_resolv.map.txt
  48. LockedQueue.h
  49. NOTICE
  50. OWNERS
  51. params.h
  52. PREUPLOAD.cfg
  53. PrivateDnsConfiguration.cpp
  54. PrivateDnsConfiguration.h
  55. README-DoT.md
  56. README.md
  57. res_cache.cpp
  58. res_comp.cpp
  59. res_comp.h
  60. res_debug.cpp
  61. res_debug.h
  62. res_init.cpp
  63. res_init.h
  64. res_mkquery.cpp
  65. res_query.cpp
  66. res_send.cpp
  67. res_send.h
  68. res_stats.cpp
  69. resolv_cache.h
  70. resolv_cache_unit_test.cpp
  71. resolv_callback_unit_test.cpp
  72. resolv_private.h
  73. resolv_test_config_template.xml
  74. resolv_tls_unit_test.cpp
  75. resolv_unit_test.cpp
  76. ResolverController.cpp
  77. ResolverController.h
  78. ResolverEventReporter.cpp
  79. ResolverEventReporter.h
  80. ResolverStats.h
  81. sethostent.cpp
  82. stats.h
  83. stats.proto
  84. TEST_MAPPING
  85. util.cpp
  86. util.h
README.md

Logging

This code uses LOG(X) for logging. Log levels are VERBOSE,DEBUG,INFO,WARNING and ERROR. The default setting is WARNING and logs relate to WARNING and ERROR will be shown. If you want to enable the DEBUG level logs, using following command. adb shell service call dnsresolver 10 i32 1 VERBOSE 0 DEBUG 1 INFO 2 WARNING 3 ERROR 4 Verbose resolver logs could contain PII -- do NOT enable in production builds.