[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a2cccc09a0 -s ours

am skip reason: Change-Id I007b22e4466e202817dc600631817899535b33d7 with SHA-1 5ad5e92f0d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/12484872

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