1. 0f324fc [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours am: 8297bc95a0 am: d914ad7ad9 by Treehugger Robot · 4 years, 4 months ago
  2. 8908af0 [automerger skipped] Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 am: 6a4a9423ef am: 8b4738d3b3 -s ours by Remi NGUYEN VAN · 4 years, 4 months ago
  3. 751124c [automerger skipped] Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 am: 5024171a1f am: e6fb8c44dd -s ours by Remi NGUYEN VAN · 4 years, 4 months ago
  4. da66d09 Merge "Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 am: 0847f57ff9" into sc-dev by Automerger Merge Worker · 4 years, 4 months ago
  5. 92dcd3a Merge "Remove hidden Icon.createWithResource API usage" into sc-dev by Remi NGUYEN VAN · 4 years, 4 months ago
  6. 4d9190f Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 am: 0847f57ff9 by Remi NGUYEN VAN · 4 years, 4 months ago
  7. 8cfb7d0 Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 am: dea1480c0b am: 4345a9b287 by Treehugger Robot · 4 years, 4 months ago
  8. 9f092d5 Merge "Add SystemMessages protos to Connectivity" am: cf638d345b am: 02e5fcf301 am: 3b780f79d3 by Remi NGUYEN VAN · 4 years, 4 months ago
  9. 4e273df Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d am: f3f342370a am: 61bfb06808 by Jayachandran Chinnakkannu · 4 years, 4 months ago
  10. fd994c9 [automerger skipped] resolve merge conflicts of d2c4f1d6c85ef453abf06a03dbc08ebe293f2412 to stage-aosp-master am: 39ff19da2f am: c8ed8dce59 -s ours by Roshan Pius · 4 years, 4 months ago
  11. 5629445 [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours am: 9991401b9d -s ours am: 7d909af3bb -s ours by Chiachang Wang · 4 years, 4 months ago
  12. 03f2900 [automerger skipped] Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 am: a043655e3a -s ours by Lorenzo Colitti · 4 years, 4 months ago
  13. b28d297 [automerger skipped] Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775 am: 28a89348a9 -s ours by Lorenzo Colitti · 4 years, 4 months ago
  14. 530bffa [automerger skipped] Add connectivity protos to framework-connectivity am: 953819d7f0 am: 00b56b8d0d am: 30c4960d7e -s ours by Remi NGUYEN VAN · 4 years, 4 months ago
  15. a98994a [automerger skipped] Remove unused NetworkPolicyManagerInternal in CS am: c850635440 am: 143739703d am: 634e8a5b2a -s ours by paulhu · 4 years, 4 months ago
  16. fbc4404 [automerger skipped] Move connectivity AIDLs to android.net am: 6ed4472b63 am: e6fe8b4103 am: 909eb08445 -s ours by Remi NGUYEN VAN · 4 years, 4 months ago
  17. 18c08a9 [automerger skipped] Migrate framework-connectivity internal resources am: 8e12782094 am: 1f00de9e81 am: 50fab6449d -s ours by Remi NGUYEN VAN · 4 years, 4 months ago
  18. 7e85f08 [automerger skipped] Add multipath preference, background status API am: 0f91b7a19a am: 6f3429172b am: 3f139e72f6 -s ours by Remi NGUYEN VAN · 4 years, 4 months ago
  19. 2c5b333 [automerger skipped] Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4385ef6896 am: cc018f77ec am: db1ad4da2b -s ours by Lorenzo Colitti · 4 years, 4 months ago
  20. fff9cd3 Remove hidden Icon.createWithResource API usage by Remi NGUYEN VAN · 4 years, 4 months ago
  21. def3314 Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev by Lucas Lin · 4 years, 5 months ago
  22. a12c9fa Merge "Add NetworkFactory to connectivity jarjar rules" into sc-dev by Remi NGUYEN VAN · 4 years, 5 months ago
  23. 865b4f2 Remove the usage of NETID_UNSET from Vpn.java by lucaslin · 4 years, 5 months ago
  24. d914ad7 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours am: 8297bc95a0 by Treehugger Robot · 4 years, 5 months ago
  25. 8297bc9 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours by Treehugger Robot · 4 years, 5 months ago
  26. 2ad15ec Merge "Expose some APIs from ConnectivityManager" into sc-dev by Lucas Lin · 4 years, 5 months ago
  27. 8b4738d Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 am: 6a4a9423ef by Remi NGUYEN VAN · 4 years, 5 months ago
  28. e6fb8c4 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 am: 5024171a1f by Remi NGUYEN VAN · 4 years, 5 months ago
  29. 0847f57 Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 by Remi NGUYEN VAN · 4 years, 5 months ago
  30. 4345a9b Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 am: dea1480c0b by Treehugger Robot · 4 years, 5 months ago
  31. 3b780f7 Merge "Add SystemMessages protos to Connectivity" am: cf638d345b am: 02e5fcf301 by Remi NGUYEN VAN · 4 years, 5 months ago
  32. 61bfb06 Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d am: f3f342370a by Jayachandran Chinnakkannu · 4 years, 5 months ago
  33. c8ed8dc resolve merge conflicts of d2c4f1d6c85ef453abf06a03dbc08ebe293f2412 to stage-aosp-master am: 39ff19da2f by Roshan Pius · 4 years, 5 months ago
  34. 5140e48 Expose some APIs from ConnectivityManager by lucaslin · 4 years, 5 months ago
  35. 0c66c1a Add NetworkFactory to connectivity jarjar rules by Remi NGUYEN VAN · 4 years, 5 months ago
  36. 6a4a942 Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 by Remi NGUYEN VAN · 4 years, 5 months ago
  37. 5024171 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 by Remi NGUYEN VAN · 4 years, 5 months ago
  38. 1a7066d Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 by Remi NGUYEN VAN · 4 years, 5 months ago
  39. dea1480 Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 by Treehugger Robot · 4 years, 5 months ago
  40. 02e5fcf Merge "Add SystemMessages protos to Connectivity" am: cf638d345b by Remi NGUYEN VAN · 4 years, 5 months ago
  41. f3f3423 Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d by Jayachandran Chinnakkannu · 4 years, 5 months ago
  42. 8b6e155 Merge "Use connectivity resources in service-connectivity" into sc-dev by Lorenzo Colitti · 4 years, 5 months ago
  43. 58f4cdf Merge "Correct the logic in NetworkCapabilitiesTest" by Treehugger Robot · 4 years, 5 months ago
  44. afdb6a7 Merge "Remove Preconditions usage in TestNetworkSpecifier" by Remi NGUYEN VAN · 4 years, 5 months ago
  45. aa1d743 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" by Remi NGUYEN VAN · 4 years, 5 months ago
  46. b2fe416 Merge "Add TEST_MAPPING for Connectivity" by Remi NGUYEN VAN · 4 years, 5 months ago
  47. 33b1df7 Merge "Move trimV4AddrZeros to libs/net" by Treehugger Robot · 4 years, 5 months ago
  48. 12e02a3 Merge "Use jniThrowErrnoException from JNIHelp" into sc-dev by Remi NGUYEN VAN · 4 years, 5 months ago
  49. 508d3cf Remove Preconditions usage in TestNetworkSpecifier by Remi NGUYEN VAN · 4 years, 5 months ago
  50. acd6de1 Revert "Revert "Remove connectivity dependency on Preconditions"" by Remi NGUYEN VAN · 4 years, 5 months ago
  51. cf638d3 Merge "Add SystemMessages protos to Connectivity" by Remi NGUYEN VAN · 4 years, 5 months ago
  52. fce4049 Merge "Swap parameters in QosCallback#registerQosCallback" by Jayachandran Chinnakkannu · 4 years, 5 months ago
  53. 39ff19d resolve merge conflicts of d2c4f1d6c85ef453abf06a03dbc08ebe293f2412 to stage-aosp-master by Roshan Pius · 4 years, 5 months ago
  54. 332e7a2 resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-aosp-master by Roshan Pius · 4 years, 5 months ago
  55. 7d909af [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours am: 9991401b9d -s ours by Chiachang Wang · 4 years, 5 months ago
  56. a043655 Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 by Lorenzo Colitti · 4 years, 5 months ago
  57. 28a8934 Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775 by Lorenzo Colitti · 4 years, 5 months ago
  58. 30c4960 Add connectivity protos to framework-connectivity am: 953819d7f0 am: 00b56b8d0d by Remi NGUYEN VAN · 4 years, 5 months ago
  59. 634e8a5 Remove unused NetworkPolicyManagerInternal in CS am: c850635440 am: 143739703d by paulhu · 4 years, 5 months ago
  60. 909eb08 Move connectivity AIDLs to android.net am: 6ed4472b63 am: e6fe8b4103 by Remi NGUYEN VAN · 4 years, 5 months ago
  61. 50fab64 Migrate framework-connectivity internal resources am: 8e12782094 am: 1f00de9e81 by Remi NGUYEN VAN · 4 years, 5 months ago
  62. 3f139e7 Add multipath preference, background status API am: 0f91b7a19a am: 6f3429172b by Remi NGUYEN VAN · 4 years, 5 months ago
  63. 9991401 [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours by Chiachang Wang · 4 years, 5 months ago
  64. dd37a5d Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 by Lorenzo Colitti · 4 years, 5 months ago
  65. eb0dc8f Cherry-pick some test changes from ag/13210542. am: e7963a1d82 by Lorenzo Colitti · 4 years, 5 months ago
  66. 00b56b8 Add connectivity protos to framework-connectivity am: 953819d7f0 by Remi NGUYEN VAN · 4 years, 5 months ago
  67. 1437397 Remove unused NetworkPolicyManagerInternal in CS am: c850635440 by paulhu · 4 years, 5 months ago
  68. e6fe8b4 Move connectivity AIDLs to android.net am: 6ed4472b63 by Remi NGUYEN VAN · 4 years, 5 months ago
  69. d2c4f1d Merge changes from topics "revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction" by Treehugger Robot · 4 years, 5 months ago
  70. 1f00de9 Migrate framework-connectivity internal resources am: 8e12782094 by Remi NGUYEN VAN · 4 years, 5 months ago
  71. 6f34291 Add multipath preference, background status API am: 0f91b7a19a by Remi NGUYEN VAN · 4 years, 5 months ago
  72. a31a7b1 Merge changes from topic "backport-connectivityresources" by Lorenzo Colitti · 4 years, 5 months ago
  73. e7963a1 Cherry-pick some test changes from ag/13210542. by Lorenzo Colitti · 4 years, 5 months ago
  74. 2ce7470 Use module resources in NetworkNotificationManager. by Lorenzo Colitti · 4 years, 5 months ago
  75. 9de8916 Use connectivity resources in service-connectivity by Remi NGUYEN VAN · 4 years, 5 months ago
  76. db1ad4d Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4385ef6896 am: cc018f77ec by Lorenzo Colitti · 4 years, 5 months ago
  77. cc018f7 Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4385ef6896 by Lorenzo Colitti · 4 years, 5 months ago
  78. 4385ef6 Merge "Copy NetworkNotificationManager resources to conectivity module." by Lorenzo Colitti · 4 years, 5 months ago
  79. 953819d Add connectivity protos to framework-connectivity by Remi NGUYEN VAN · 4 years, 5 months ago
  80. c850635 Remove unused NetworkPolicyManagerInternal in CS by paulhu · 4 years, 5 months ago
  81. 6ed4472 Move connectivity AIDLs to android.net by Remi NGUYEN VAN · 4 years, 6 months ago
  82. 8e12782 Migrate framework-connectivity internal resources by Remi NGUYEN VAN · 4 years, 5 months ago
  83. 0f91b7a Add multipath preference, background status API by Remi NGUYEN VAN · 4 years, 5 months ago
  84. f40003c Copy NetworkNotificationManager resources to conectivity module. by Lorenzo Colitti · 4 years, 5 months ago
  85. 147951c TransportInfo: Add a generic redaction mechanism by Roshan Pius · 4 years, 5 months ago
  86. 920228f Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: ef16d9420d am: efcd8e96e7 by Treehugger Robot · 4 years, 5 months ago
  87. efcd8e9 Merge "Fix InetAddressCompat exception handling" am: cd37173df6 am: ef16d9420d by Treehugger Robot · 4 years, 5 months ago
  88. ef16d94 Merge "Fix InetAddressCompat exception handling" am: cd37173df6 by Treehugger Robot · 4 years, 5 months ago
  89. 4730840 Merge "[NS03] Mix in other CS-managed properties" into sc-dev by TreeHugger Robot · 4 years, 5 months ago
  90. 969cb54 Merge "Use module resources in NetworkNotificationManager." into sc-dev by TreeHugger Robot · 4 years, 5 months ago
  91. 9d5ce0f Merge "Fix InetAddressCompat exception handling" into sc-dev by TreeHugger Robot · 4 years, 5 months ago
  92. c7968e7 Add TEST_MAPPING for Connectivity by Remi NGUYEN VAN · 4 years, 5 months ago
  93. 9d239b5 Use module resources in NetworkNotificationManager. by Lorenzo Colitti · 4 years, 5 months ago
  94. 11619d0 Merge "Copy NetworkNotificationManager resources to conectivity module." into sc-dev by Lorenzo Colitti · 4 years, 5 months ago
  95. 3b8af46 Copy NetworkNotificationManager resources to conectivity module. by Lorenzo Colitti · 4 years, 5 months ago
  96. cb5c2e1 Fix InetAddressCompat exception handling by Remi NGUYEN VAN · 4 years, 5 months ago
  97. 31c5d94 Fix InetAddressCompat exception handling by Remi NGUYEN VAN · 4 years, 5 months ago
  98. e37aaf5 Merge "Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API" into sc-dev by Chalard Jean · 4 years, 5 months ago
  99. eb0e591 Use jniThrowErrnoException from JNIHelp by Remi NGUYEN VAN · 4 years, 5 months ago
  100. 75689f7 Merge "Move NetworkUtils JNI out of core/jni" into sc-dev by Remi NGUYEN VAN · 4 years, 5 months ago