1. 5335592 Merge "Add EPROTONOSUPPORT to IpSecManager SSE map" am: 7050ce9434 by Benedict Wong · 6 years ago
  2. 7e9c1ce Add EPROTONOSUPPORT to IpSecManager SSE map by Benedict Wong · 7 years ago
  3. 70e5117 Merge "Add NATT keepalive resources and methods into IpSecService" by Benedict Wong · 6 years ago
  4. 4aac3e9 Add NATT keepalive resources and methods into IpSecService by Benedict Wong · 7 years ago
  5. 2c28ee4 Merge "Move TrafficStats tags for the network stack constants" am: d2eb7f71b8 by Chalard Jean · 6 years ago
  6. d2eb7f7 Merge "Move TrafficStats tags for the network stack constants" by Chalard Jean · 6 years ago
  7. 8a93ab8 Move TrafficStats tags for the network stack constants by Chalard Jean · 6 years ago
  8. af8f384 Merge "Restrict access to dangerous methods to <= P" am: a1c9270562 by Chalard Jean · 6 years ago
  9. a1c9270 Merge "Restrict access to dangerous methods to <= P" by Chalard Jean · 6 years ago
  10. 3878f31 Merge "Ask netd to swap stats map before reading" am: f8b251fd28 by Chenbo Feng · 6 years ago
  11. f8b251f Merge "Ask netd to swap stats map before reading" by Treehugger Robot · 6 years ago
  12. 57f207b Merge "Add a lock to protect persistent stats snapshot" am: f31face531 by Chenbo Feng · 6 years ago
  13. f31face Merge "Add a lock to protect persistent stats snapshot" by Treehugger Robot · 6 years ago
  14. 876218a Ask netd to swap stats map before reading by Chenbo Feng · 7 years ago
  15. 0c419ca Add a lock to protect persistent stats snapshot by Chenbo Feng · 6 years ago
  16. a1a994c Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" by Chiachang Wang · 6 years ago
  17. 41c49d1 Merge "Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces" by Chiachang Wang · 6 years ago
  18. 47fa5b0 Merge "Fix remove-before-add for IpSecService RefcountedResource" am: dcd06394d4 by Benedict Wong · 6 years ago
  19. dcd0639 Merge "Fix remove-before-add for IpSecService RefcountedResource" by Benedict Wong · 6 years ago
  20. f04137e Enforce NETWORK_STACK permission for calling NSS#forceUpdateIfaces by Chiachang Wang · 6 years ago
  21. 3cfb499 Restrict access to dangerous methods to <= P by Chalard Jean · 6 years ago
  22. 04738f5 Fix remove-before-add for IpSecService RefcountedResource by Benedict Wong · 7 years ago
  23. 1c3e466 Merge "Move NetworkStatsFactory into service directory" am: c452cbf496 by Chenbo Feng · 6 years ago
  24. c452cbf Merge "Move NetworkStatsFactory into service directory" by Treehugger Robot · 6 years ago
  25. 53e2f98 Merge "Fix flaky UdpEncapsulationSocket test" am: 066b321400 by Lorenzo Colitti · 6 years ago
  26. 066b321 Merge "Fix flaky UdpEncapsulationSocket test" by Lorenzo Colitti · 6 years ago
  27. 29c3077 Fix flaky UdpEncapsulationSocket test by Benedict Wong · 6 years ago
  28. 45fff45 Move NetworkStatsFactory into service directory by Chenbo Feng · 7 years ago
  29. 6f365c4 Merge changes from topic "vpn_data_accounting" am: ed2eb961e8 by Varun Anand · 6 years ago
  30. ed2eb96 Merge changes from topic "vpn_data_accounting" by Varun Anand · 6 years ago
  31. 720133f NetworkStatsService: Fix getDetailedUidStats to take VPNs into account. by Varun Anand · 7 years ago
  32. c8dbdf3 Take all VPN underlying networks into account when migrating traffic for by Varun Anand · 7 years ago
  33. b70a65d Merge "Add @UnsupportedAppUsage annotations" am: 60eacd60d1 by Andrei-Valentin Onea · 6 years ago
  34. 60eacd6 Merge "Add @UnsupportedAppUsage annotations" by Andrei-Valentin Onea · 6 years ago
  35. 8841fd2 Add @UnsupportedAppUsage annotations by Andrei Onea · 6 years ago
  36. dd9d8de Merge "Add unit tests related to data accounting for VPNs with one underlying network." by Varun Anand · 6 years ago
  37. d8fdea1 Add unit tests related to data accounting for VPNs with one underlying network. by Varun Anand · 7 years ago
  38. 6a9a136 Merge "Add @UnsupportedAppUsage annotations" am: cdf8d71a9f by Andrei-Valentin Onea · 7 years ago
  39. cdf8d71 Merge "Add @UnsupportedAppUsage annotations" by Andrei-Valentin Onea · 7 years ago
  40. a28860f resolve merge conflicts of 18900c462c16c0e3784b8bb6959426caa93cb8cb to stage-aosp-master by Brett Chabot · 7 years ago
  41. 97342bd Migrate frameworks/base/tests/testables and its users to androidx.test by Brett Chabot · 7 years ago
  42. c2a6f8a Merge "Remove ConnectivityManager and its usages from NetworkStatsService." by Varun Anand · 7 years ago
  43. 10fe088 Remove ConnectivityManager and its usages from NetworkStatsService. by Varun Anand · 7 years ago
  44. 2a71a3d Add @UnsupportedAppUsage annotations by Andrei Onea · 7 years ago
  45. 090a80a DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master by Xin Li · 7 years ago
  46. 38b1a2d DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into by Xin Li · 7 years ago
  47. 4a44ee4 Snap for 5180536 from 1fc6d8adf1e7824e5a617c3ec4c4bde55407aa35 to pi-platform-release by android-build-team Robot · 7 years ago
  48. e4675dc Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c by Remi NGUYEN VAN · 7 years ago
  49. 5db0919 Remove last NetworkStack usage of hidden APIs by Remi NGUYEN VAN · 7 years ago
  50. 4d301b8 Merge "Add SocketUtils for NetworkStack" am: d9cc11e8bd by Remi NGUYEN VAN · 7 years ago
  51. 7b51a98 Merge "jni: more O_CLOEXECs" am: 0bd511611e by Nick Kralevich · 7 years ago
  52. d9cc11e Merge "Add SocketUtils for NetworkStack" by Remi NGUYEN VAN · 7 years ago
  53. cac3986 jni: more O_CLOEXECs by Nick Kralevich · 7 years ago
  54. 8945330 Add SocketUtils for NetworkStack by Remi NGUYEN VAN · 7 years ago
  55. 03074c7 Merge "Use delta reads for per uid traffic stats" am: 39de2905a5 by Chenbo Feng · 7 years ago
  56. 39de290 Merge "Use delta reads for per uid traffic stats" by Chenbo Feng · 7 years ago
  57. fef17fd Merge changes I1250730c,I7d00848c am: e693d49c0a by Remi NGUYEN VAN · 7 years ago
  58. 63e61c4 Move IpClient to NetworkStack by Remi NGUYEN VAN · 7 years ago
  59. a9382c9 Use delta reads for per uid traffic stats by Chenbo Feng · 7 years ago
  60. 19ec97e resolve merge conflicts of da290bec0c5418e758b92abad7be8e729cf37d68 to stage-aosp-master by junyulai · 7 years ago
  61. 3657ce96 fix getIfaceStats and getTotalStats bug by Mike SU · 7 years ago
  62. 50252f8 Merge "Adjust map names due to new bpfloader" am: 0317e9e374 am: 37cec67bdc by Chenbo Feng · 7 years ago
  63. 37cec67 Merge "Adjust map names due to new bpfloader" am: 0317e9e374 by Chenbo Feng · 7 years ago
  64. 0317e9e Merge "Adjust map names due to new bpfloader" by Treehugger Robot · 7 years ago
  65. fa29021 [automerger skipped] Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" am: a1e93d0a66 -s ours by junyulai · 7 years ago
  66. ac828b9 [automerger skipped] Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" by junyulai · 7 years ago
  67. a1e93d0 Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count" by Treehugger Robot · 7 years ago
  68. 579bf97 DO NOT MERGE: Revert: use legacy way to get tcp packet count by junyulai · 7 years ago
  69. 150dc6f Adjust map names due to new bpfloader by Chenbo Feng · 7 years ago
  70. 59c7f1a Merge "Ignore ipv6 tx traffic on clat uid." am: 191f32fdc7 am: 9c0075aad0 by Junyu Lai · 7 years ago
  71. 9c0075a Merge "Ignore ipv6 tx traffic on clat uid." am: 191f32fdc7 by Junyu Lai · 7 years ago
  72. 191f32f Merge "Ignore ipv6 tx traffic on clat uid." by Junyu Lai · 7 years ago
  73. 9144380 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: ab3b396c45 -s ours by Xin Li · 7 years ago
  74. c8c0caf [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" by Xin Li · 7 years ago
  75. a437ec6 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 6f9c73f8c9 -s ours by Xin Li · 7 years ago
  76. 964a5fb [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master by Xin Li · 7 years ago
  77. 6f97b16 Merge "Delete unused import" am: e726c2654d am: 76b4d2fba2 by Chenbo Feng · 7 years ago
  78. 76b4d2f Merge "Delete unused import" am: e726c2654d by Chenbo Feng · 7 years ago
  79. ab3b396 Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" by Treehugger Robot · 7 years ago
  80. f9eff38 Delete unused import by Chenbo Feng · 7 years ago
  81. a58161f Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" am: af0e1c2fa5 by Adrian Roos · 7 years ago
  82. ee2ba33 Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi" by Adrian Roos · 7 years ago
  83. be53fbb API: Clean up redundant and ineffective usages of SystemApi and TestApi by Adrian Roos · 7 years ago
  84. 659576f [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master by Xin Li · 7 years ago
  85. 6f9c73f DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master by Xin Li · 7 years ago
  86. 07ea8a4 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master by Xin Li · 7 years ago
  87. 6fe0796 Ignore ipv6 tx traffic on clat uid. by junyulai · 7 years ago
  88. 2d79ef9 Merge "Refactoring of deleting stats in NetworkStats based on uids." am: c8dcfb8b4b by Junyu Lai · 7 years ago
  89. 2d00948 Merge "Refactoring of deleting stats in NetworkStats based on uids." by Junyu Lai · 7 years ago
  90. c8dcfb8 Merge "Refactoring of deleting stats in NetworkStats based on uids." by Junyu Lai · 7 years ago
  91. bbaddec Refactoring of deleting stats in NetworkStats based on uids. by junyulai · 7 years ago
  92. 0c54c16 Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" am: d6c2dc5908 by Luke Huang · 7 years ago
  93. 7d56932 Merge "Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl" by Luke Huang · 7 years ago
  94. 1fc6d8a Merge cherrypicks of [5704859, 5705300, 5704034, 5704195, 5705082, 5704058, 5704059, 5704932, 5705340, 5705341, 5705342, 5705343, 5705344, 5705361, 5705362, 5705363, 5705364, 5704870, 5704196, 5705083, 5701785, 5701786, 5701787, 5704035, 5705261, 5705281, 5704036, 5704037, 5704038, 5704871, 5704933, 5704872, 5705347, 5705262, 5704934] into pi-qpr2-release by android-build-team Robot · 7 years ago
  95. 09254d2 Change types of fields of network stats reported to framework. by junyulai · 7 years ago
  96. 5ea66a0 Fix negative uid stats caused by 464xlat adjust when eBPF is on. by junyulai · 7 years ago
  97. d5fda04 Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release by Bill Yi · 7 years ago
  98. d913fb4 Use ParcelFileDescriptor instead of FileDescriptor in INetd.aidl by Luke Huang · 7 years ago
  99. 26eca90 Snap for 5140444 from 294484563c94eedd70f8dd53d134d701a1d6e9cb to pi-qpr2-release by android-build-team Robot · 7 years ago
  100. 0cfc494 Merge changes from topic "xfrmi-support" am: f928c1e4b9 am: 719761f60c by Benedict Wong · 7 years ago