1. bd2dcae Merge "[VCN15] expose addUnwantedCapability and related APIs" into sc-dev by Lorenzo Colitti · 5 years ago
  2. 64b0316 [automerger skipped] Expose uids related APIs in NetworkRequest and NetworkCapabilities am: fd13f9223f -s ours am: 712d3a0579 -s ours by Chiachang Wang · 5 years ago
  3. 141e8b9 [automerger skipped] Replace the usage of UidRange am: e0ace0533c -s ours am: 9421da680e -s ours by Chiachang Wang · 5 years ago
  4. 77127b6 Merge "Revert "Have a new method in NetworkAgentConfig.Builder to set allowBypass"" into sc-dev by Joshua Mccloskey · 5 years ago
  5. 712d3a0 [automerger skipped] Expose uids related APIs in NetworkRequest and NetworkCapabilities am: fd13f9223f -s ours by Chiachang Wang · 5 years ago
  6. 9421da6 [automerger skipped] Replace the usage of UidRange am: e0ace0533c -s ours by Chiachang Wang · 5 years ago
  7. f5df095 Revert "Have a new method in NetworkAgentConfig.Builder to set allowBypass" by Joshua Mccloskey · 5 years ago
  8. 0bf318f [automerger skipped] Expose uids related APIs in NetworkRequest and NetworkCapabilities am: b40480c2ea -s ours by Chiachang Wang · 5 years ago
  9. e955a30 [automerger skipped] Replace the usage of UidRange am: c347b9c341 -s ours by Chiachang Wang · 5 years ago
  10. d40b253 Have a new method in NetworkAgentConfig.Builder to set allowBypass by lucaslin · 5 years ago
  11. fd13f92 Expose uids related APIs in NetworkRequest and NetworkCapabilities by Chiachang Wang · 5 years ago
  12. b40480c Expose uids related APIs in NetworkRequest and NetworkCapabilities by Chiachang Wang · 5 years ago
  13. e0ace05 Replace the usage of UidRange by Chiachang Wang · 5 years ago
  14. c347b9c Replace the usage of UidRange by Chiachang Wang · 5 years ago
  15. d4c4f86 Merge "Remove ConnectivityService hidden annotations" into sc-dev by Remi NGUYEN VAN · 5 years ago
  16. 99cf352 Merge "Add NetworkRequest.Builder creating from an existing instance" into sc-dev by Chiachang Wang · 5 years ago
  17. c2e79ad Add NetworkRequest.Builder creating from an existing instance by Chiachang Wang · 5 years ago
  18. 90acad1 Merge changes I90bf7957,If58524b0 am: 029ba17cb0 am: c3e38ade53 am: b08e5aba25 by Lorenzo Colitti · 5 years ago
  19. adb8328 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours am: 60450deb67 am: 7007e04119 by Chiachang Wang · 5 years ago
  20. 0f324fc [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours am: 8297bc95a0 am: d914ad7ad9 by Treehugger Robot · 5 years ago
  21. 8908af0 [automerger skipped] Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 am: 6a4a9423ef am: 8b4738d3b3 -s ours by Remi NGUYEN VAN · 5 years ago
  22. 751124c [automerger skipped] Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 am: 5024171a1f am: e6fb8c44dd -s ours by Remi NGUYEN VAN · 5 years ago
  23. da66d09 Merge "Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 am: 0847f57ff9" into sc-dev by Automerger Merge Worker · 5 years ago
  24. 92dcd3a Merge "Remove hidden Icon.createWithResource API usage" into sc-dev by Remi NGUYEN VAN · 5 years ago
  25. 4d9190f Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 am: 0847f57ff9 by Remi NGUYEN VAN · 5 years ago
  26. 8cfb7d0 Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 am: dea1480c0b am: 4345a9b287 by Treehugger Robot · 5 years ago
  27. 9f092d5 Merge "Add SystemMessages protos to Connectivity" am: cf638d345b am: 02e5fcf301 am: 3b780f79d3 by Remi NGUYEN VAN · 5 years ago
  28. 4e273df Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d am: f3f342370a am: 61bfb06808 by Jayachandran Chinnakkannu · 5 years ago
  29. fd994c9 [automerger skipped] resolve merge conflicts of d2c4f1d6c85ef453abf06a03dbc08ebe293f2412 to stage-aosp-master am: 39ff19da2f am: c8ed8dce59 -s ours by Roshan Pius · 5 years ago
  30. 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 · 5 years ago
  31. 03f2900 [automerger skipped] Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 am: a043655e3a -s ours by Lorenzo Colitti · 5 years ago
  32. b28d297 [automerger skipped] Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775 am: 28a89348a9 -s ours by Lorenzo Colitti · 5 years ago
  33. 530bffa [automerger skipped] Add connectivity protos to framework-connectivity am: 953819d7f0 am: 00b56b8d0d am: 30c4960d7e -s ours by Remi NGUYEN VAN · 5 years ago
  34. a98994a [automerger skipped] Remove unused NetworkPolicyManagerInternal in CS am: c850635440 am: 143739703d am: 634e8a5b2a -s ours by paulhu · 5 years ago
  35. fbc4404 [automerger skipped] Move connectivity AIDLs to android.net am: 6ed4472b63 am: e6fe8b4103 am: 909eb08445 -s ours by Remi NGUYEN VAN · 5 years ago
  36. 18c08a9 [automerger skipped] Migrate framework-connectivity internal resources am: 8e12782094 am: 1f00de9e81 am: 50fab6449d -s ours by Remi NGUYEN VAN · 5 years ago
  37. 7e85f08 [automerger skipped] Add multipath preference, background status API am: 0f91b7a19a am: 6f3429172b am: 3f139e72f6 -s ours by Remi NGUYEN VAN · 5 years ago
  38. ce8c92d [VCN15] expose addUnwantedCapability and related APIs by junyulai · 5 years ago
  39. b08e5ab Merge changes I90bf7957,If58524b0 am: 029ba17cb0 am: c3e38ade53 by Lorenzo Colitti · 5 years ago
  40. 2c5b333 [automerger skipped] Merge "Copy NetworkNotificationManager resources to conectivity module." am: 4385ef6896 am: cc018f77ec am: db1ad4da2b -s ours by Lorenzo Colitti · 5 years ago
  41. 52950ed Remove ConnectivityService hidden annotations by Remi NGUYEN VAN · 5 years ago
  42. fff9cd3 Remove hidden Icon.createWithResource API usage by Remi NGUYEN VAN · 5 years ago
  43. c3e38ad Merge changes I90bf7957,If58524b0 am: 029ba17cb0 by Lorenzo Colitti · 5 years ago
  44. 029ba17 Merge changes I90bf7957,If58524b0 by Lorenzo Colitti · 5 years ago
  45. def3314 Merge "Remove the usage of NETID_UNSET from Vpn.java" into sc-dev by Lucas Lin · 5 years ago
  46. a12c9fa Merge "Add NetworkFactory to connectivity jarjar rules" into sc-dev by Remi NGUYEN VAN · 5 years ago
  47. 865b4f2 Remove the usage of NETID_UNSET from Vpn.java by lucaslin · 5 years ago
  48. 7007e04 [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours am: 60450deb67 by Chiachang Wang · 5 years ago
  49. d914ad7 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours am: 8297bc95a0 by Treehugger Robot · 5 years ago
  50. 60450de [automerger skipped] Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" am: 3f603fae13 -s ours by Chiachang Wang · 5 years ago
  51. 8297bc9 [automerger skipped] Merge "Correct the logic in NetworkCapabilitiesTest" am: 58f4cdf3b3 -s ours by Treehugger Robot · 5 years ago
  52. 2ad15ec Merge "Expose some APIs from ConnectivityManager" into sc-dev by Lucas Lin · 5 years ago
  53. 3f603fa Merge "Revert "Correct the logic in NetworkCapabilitiesTest"" by Chiachang Wang · 5 years ago
  54. f2b0b41 Revert "Correct the logic in NetworkCapabilitiesTest" by Chiachang Wang · 5 years ago
  55. 8b4738d Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 am: 6a4a9423ef by Remi NGUYEN VAN · 5 years ago
  56. e6fb8c4 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 am: 5024171a1f by Remi NGUYEN VAN · 5 years ago
  57. 0847f57 Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 am: 1a7066d0a5 by Remi NGUYEN VAN · 5 years ago
  58. 4345a9b Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 am: dea1480c0b by Treehugger Robot · 5 years ago
  59. 3b780f7 Merge "Add SystemMessages protos to Connectivity" am: cf638d345b am: 02e5fcf301 by Remi NGUYEN VAN · 5 years ago
  60. 61bfb06 Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d am: f3f342370a by Jayachandran Chinnakkannu · 5 years ago
  61. c8ed8dc resolve merge conflicts of d2c4f1d6c85ef453abf06a03dbc08ebe293f2412 to stage-aosp-master am: 39ff19da2f by Roshan Pius · 5 years ago
  62. 5140e48 Expose some APIs from ConnectivityManager by lucaslin · 5 years ago
  63. 0c66c1a Add NetworkFactory to connectivity jarjar rules by Remi NGUYEN VAN · 5 years ago
  64. 6a4a942 Merge "Remove Preconditions usage in TestNetworkSpecifier" am: afdb6a7347 by Remi NGUYEN VAN · 5 years ago
  65. 5024171 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 by Remi NGUYEN VAN · 5 years ago
  66. 1a7066d Merge "Add TEST_MAPPING for Connectivity" am: b2fe416e82 by Remi NGUYEN VAN · 5 years ago
  67. dea1480 Merge "Move trimV4AddrZeros to libs/net" am: 33b1df7ec4 by Treehugger Robot · 5 years ago
  68. 02e5fcf Merge "Add SystemMessages protos to Connectivity" am: cf638d345b by Remi NGUYEN VAN · 5 years ago
  69. f3f3423 Merge "Swap parameters in QosCallback#registerQosCallback" am: fce4049a1d by Jayachandran Chinnakkannu · 5 years ago
  70. 8b6e155 Merge "Use connectivity resources in service-connectivity" into sc-dev by Lorenzo Colitti · 5 years ago
  71. 58f4cdf Merge "Correct the logic in NetworkCapabilitiesTest" by Treehugger Robot · 5 years ago
  72. afdb6a7 Merge "Remove Preconditions usage in TestNetworkSpecifier" by Remi NGUYEN VAN · 5 years ago
  73. aa1d743 Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" by Remi NGUYEN VAN · 5 years ago
  74. b2fe416 Merge "Add TEST_MAPPING for Connectivity" by Remi NGUYEN VAN · 5 years ago
  75. 33b1df7 Merge "Move trimV4AddrZeros to libs/net" by Treehugger Robot · 5 years ago
  76. 12e02a3 Merge "Use jniThrowErrnoException from JNIHelp" into sc-dev by Remi NGUYEN VAN · 5 years ago
  77. 508d3cf Remove Preconditions usage in TestNetworkSpecifier by Remi NGUYEN VAN · 5 years ago
  78. acd6de1 Revert "Revert "Remove connectivity dependency on Preconditions"" by Remi NGUYEN VAN · 5 years ago
  79. cf638d3 Merge "Add SystemMessages protos to Connectivity" by Remi NGUYEN VAN · 5 years ago
  80. fce4049 Merge "Swap parameters in QosCallback#registerQosCallback" by Jayachandran Chinnakkannu · 5 years ago
  81. 39ff19d resolve merge conflicts of d2c4f1d6c85ef453abf06a03dbc08ebe293f2412 to stage-aosp-master by Roshan Pius · 5 years ago
  82. 332e7a2 resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to stage-aosp-master by Roshan Pius · 5 years ago
  83. 7d909af [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours am: 9991401b9d -s ours by Chiachang Wang · 5 years ago
  84. a043655 Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 am: dd37a5d576 by Lorenzo Colitti · 5 years ago
  85. 28a8934 Cherry-pick some test changes from ag/13210542. am: e7963a1d82 am: eb0dc8f775 by Lorenzo Colitti · 5 years ago
  86. c62368f Fix privileged apps calling registerDefaultNetworkCallback. by Lorenzo Colitti · 5 years ago
  87. 053b2a2 Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback. by Lorenzo Colitti · 5 years ago
  88. 30c4960 Add connectivity protos to framework-connectivity am: 953819d7f0 am: 00b56b8d0d by Remi NGUYEN VAN · 5 years ago
  89. 634e8a5 Remove unused NetworkPolicyManagerInternal in CS am: c850635440 am: 143739703d by paulhu · 5 years ago
  90. 909eb08 Move connectivity AIDLs to android.net am: 6ed4472b63 am: e6fe8b4103 by Remi NGUYEN VAN · 5 years ago
  91. 50fab64 Migrate framework-connectivity internal resources am: 8e12782094 am: 1f00de9e81 by Remi NGUYEN VAN · 5 years ago
  92. 3f139e7 Add multipath preference, background status API am: 0f91b7a19a am: 6f3429172b by Remi NGUYEN VAN · 5 years ago
  93. 9991401 [automerger skipped] Revert "Revert "Expose uids related APIs in NetworkRequest and N..." am: 8d81c8d76b -s ours by Chiachang Wang · 5 years ago
  94. dd37a5d Merge changes from topic "backport-connectivityresources" am: a31a7b1bf4 by Lorenzo Colitti · 5 years ago
  95. eb0dc8f Cherry-pick some test changes from ag/13210542. am: e7963a1d82 by Lorenzo Colitti · 5 years ago
  96. 00b56b8 Add connectivity protos to framework-connectivity am: 953819d7f0 by Remi NGUYEN VAN · 5 years ago
  97. 1437397 Remove unused NetworkPolicyManagerInternal in CS am: c850635440 by paulhu · 5 years ago
  98. e6fe8b4 Move connectivity AIDLs to android.net am: 6ed4472b63 by Remi NGUYEN VAN · 5 years ago
  99. d2c4f1d Merge changes from topics "revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction" by Treehugger Robot · 5 years ago
  100. 1f00de9 Migrate framework-connectivity internal resources am: 8e12782094 by Remi NGUYEN VAN · 5 years ago