- 1a71027 am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev am: 215018f6e2 by Robert Greenwalt · 4 years, 2 months ago
- c2c7341 [automerger skipped] Reconcile with jb-mr2-release - do not merge am: ebff3ebaba -s ours by The Android Open Source Project · 4 years, 2 months ago
- 4d963b4 am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev am: 79f58996c5 by Lorenzo Colitti · 4 years, 2 months ago
- a1c2573 [automerger skipped] Reconcile with jb-mr2-release - do not merge am: 02af5ba496 -s ours by The Android Open Source Project · 4 years, 2 months ago
- 19fc9ac [automerger skipped] Reconcile with jb-mr2-release - do not merge am: 9b48b90c6f -s ours by The Android Open Source Project · 4 years, 2 months ago
- a13720b am d40130ab: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev am: 76fcb627ae by Lorenzo Colitti · 4 years, 2 months ago
- 32877f5 am 2e3f7f04: Merge "Add BT - DataTracker connection" into jb-mr2-dev am: baee17e854 by Robert Greenwalt · 4 years, 2 months ago
- c4fc0db am f98a515f: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev am: 157e5bf119 by Wink Saville · 4 years, 2 months ago
- 9aeb1e2 am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev am: faac152a2d by Lorenzo Colitti · 4 years, 2 months ago
- 4baad9b [automerger skipped] Reconcile with jb-mr2-release - do not merge am: a4712d353f -s ours by The Android Open Source Project · 4 years, 2 months ago
- 68f4d93 am e1b73b79: Prevent NPE in new API. am: f92734e168 by Robert Greenwalt · 4 years, 2 months ago
- 0e53732 am 31453e5a: Merge "Reset connections on all stacked interfaces." into jb-mr2-dev am: 97f2e96382 by Lorenzo Colitti · 4 years, 2 months ago
- f2e200f merge in jb-mr2-release history after reset to jb-mr2-dev am: 095035b66a by The Android Automerger · 4 years, 2 months ago
- 3c10be9 Merge "Framework changes for 464xlat." into jb-mr2-dev am: 82217ba580 by Lorenzo Colitti · 4 years, 2 months ago
- db69f97 Revert of Ifd0c4081a. Turning off logging. am: fa4e867061 by Robert Greenwalt · 4 years, 2 months ago
- 3db8cac Don't return an unmod collection. am: 26ce4b57d5 by Robert Greenwalt · 4 years, 2 months ago
- c2f0534 Merge "Don't update routes if Dhcp fails." into jb-mr2-dev am: 2d17281ca7 by Lorenzo Colitti · 4 years, 2 months ago
- 15c2033 Fix build. am: 50e2b43ce1 by Lorenzo Colitti · 4 years, 2 months ago
- cb6a7aa Merge "Set routes from stacked links as well." into jb-mr2-dev am: 8c9e75757f by Lorenzo Colitti · 4 years, 2 months ago
- 74cbe6c Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev am: 79c3dfdf0e by Lorenzo Colitti · 4 years, 2 months ago
- dae77c7 Revert "Fail fast if somebody is adding default routes" am: 4235ce5640 by Wink Saville · 4 years, 2 months ago
- 611616c Fail fast if somebody is adding default routes am: f2f0430d40 by Robert Greenwalt · 4 years, 2 months ago
- cb73d76 Add logging to track down bug am: b9f53aa687 by Robert Greenwalt · 4 years, 2 months ago
- c47a20b Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev am: 90fbffb1e9 by Lorenzo Colitti · 4 years, 2 months ago
- 8c3de70 Remove redundant parameter to modifyRoute am: f7020e29fe by Lorenzo Colitti · 4 years, 2 months ago
- 6ba0b9d Unbreak documentation build. am: ab7ad3a458 by Lorenzo Colitti · 4 years, 2 months ago
- fd9943a Always specify an interface for host routes. am: 697e1c0748 by Lorenzo Colitti · 4 years, 2 months ago
- 203d3ed RouteInfo changes. am: 0580598772 by Lorenzo Colitti · 4 years, 2 months ago
- 24d78c8 Revert "Add default route constants to RouteInfo." am: ddf54416c5 by Robert Greenwalt · 4 years, 2 months ago
- 0b5ea32 Add default route constants to RouteInfo. am: b00860f1ad by Lorenzo Colitti · 4 years, 2 months ago
- 95a1c7e Allow loopback traffic in lockdown mode. am: b103b2578b by Jeff Sharkey · 4 years, 2 months ago
- ec625ff Remove two new permission checks am: dc55f48d64 by Robert Greenwalt · 4 years, 2 months ago
- 25f626b Improve ConnectivityManager docs am: 26744a5f52 by Robert Greenwalt · 4 years, 2 months ago
- 770ab27 Improve notification UI for lockdown VPN. am: 6932ff654e by Jeff Sharkey · 4 years, 2 months ago
- b60d0d4 merge in jb-mr2-release history after reset to master am: be253713d5 by The Android Automerger · 4 years, 2 months ago
- ee0b053 Migrate to using Mockito directly. am: c8a2687705 by Jeff Sharkey · 4 years, 2 months ago
- eaac89b am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()" am: 9a51314973 by Kenny Root · 4 years, 2 months ago
- 8b3c308 Adjust captive portal test for setup wizard am: 4774b0208e by Russell Brenner · 4 years, 2 months ago
- 52aa3b4 Fix a permissions probem in ConnectivityManager am: 1790009c36 by Robert Greenwalt · 4 years, 2 months ago
- 8ffe306 Reintroduce the net.dns system properties <TEMP> am: d44340d0ec by Robert Greenwalt · 4 years, 2 months ago
- abee775 Merge "Second pass tying into dns cache per interface" am: 75c17e5f38 by Robert Greenwalt · 4 years, 2 months ago
- 09ab3ff Merge "Revert "Clean up published network condition reporting."" am: 75ba50a4fa by Wink Saville · 4 years, 2 months ago
- 60f14a2 Merge "Revert "Second pass tying into dns cache per interface"" am: 3ed6099b4b by Robert Greenwalt · 4 years, 2 months ago
- 4193986 Clean up published network condition reporting. am: 463928fabe by Wink Saville · 4 years, 2 months ago
- ab4a7fb Second pass tying into dns cache per interface am: ea8d68962c by Mattias Falk · 4 years, 2 months ago
- 3957f8f Merge "Up our DNS server support from 2 > 4" am: f345cde69e by Robert Greenwalt · 4 years, 2 months ago
- a18f262 Expose roaming flag for testing. am: e35bff840d by Jeff Sharkey · 4 years, 2 months ago
- 5304df5 am 3f051210: Merge from AOSP staging branch am: 7542010f7b by Jean-Baptiste Queru · 4 years, 2 months ago
- ce3aa40 Fix javadoc break am: 1ee3d2c33e by Robert Greenwalt · 4 years, 2 months ago
- c98a894 Refactor getPersistedNetworkPreference am: a8aa160836 by Jianzheng Zhou · 4 years, 2 months ago
- e9b9567 Merge "Support for dns domain." am: ff31bee14a by Robert Greenwalt · 4 years, 2 months ago
- 256492e am 298d5f42: am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev am: 7a4d27dfdf by Jeff Sharkey · 4 years, 2 months ago
- b7ea39f Merge "Remove DhcpInfoInternal" am: 2be645a342 by Robert Greenwalt · 4 years, 2 months ago
- f76bd60 am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev am: 044ac6a1c8 by Dianne Hackborn · 4 years, 2 months ago
- 1f713c5 am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev am: b1ed51bc0e by Jeff Sharkey · 4 years, 2 months ago
- a54d74e am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev am: 621975ad96 by Jeff Sharkey · 4 years, 2 months ago
- e0fc860 am b39f3f46: am 1c1c06fa: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev am: 3136c613e1 by Ashish Sharma · 4 years, 2 months ago
- c57bbf6 am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev am: 42af268864 by Jeff Brown · 4 years, 2 months ago
- 91f726d am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev am: b974e23410 by Irfan Sheriff · 4 years, 2 months ago
- e311bbc am 116e0ed0: am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev am: aab7d3b292 by Jeff Sharkey · 4 years, 2 months ago
- 7246cbc am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev am: f56e2157be by Jeff Sharkey · 4 years, 2 months ago
- 12f1bce am 52781414: am fa8d83d9: Merge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev am: e4e3c9dce2 by Jeff Sharkey · 4 years, 2 months ago
- 99109f9 am 623cc6b7: am bac6c129: Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev am: cc4caf33a9 by Dianne Hackborn · 4 years, 2 months ago
- 5390151 am c25494a4: am 73e58381: am 0e90f738: am cd2a20f2: am 5a2772e2: Merge "Fix code problem in writePidDns" am: b486a2054c by Wink Saville · 4 years, 2 months ago
- ef3748a am f59dfc81: am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev am: fab1f2400e by Dianne Hackborn · 4 years, 2 months ago
- 57cf5c5 Merge commit '949dcad8' into manualmerge am: 04327607d0 by Irfan Sheriff · 4 years, 2 months ago
- 251f1fd am f261d88f: am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev am: 03ca5c9f83 by Jeff Sharkey · 4 years, 2 months ago
- df20a14 am 33f94286: am 34f86312: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev am: 31b50e628d by Jeff Sharkey · 4 years, 2 months ago
- 5a69f7c am 45a630e8: am d5fc86f0: Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev am: 5c900a6685 by Jeff Sharkey · 4 years, 2 months ago
- 5194e59 am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev am: 4e235f7eb7 by Robert Greenwalt · 4 years, 2 months ago
- a06e5e6 am 634f34af: am a819a078: am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type" am: f021438b03 by Robert Greenwalt · 4 years, 2 months ago
- 6ee082b am 35d875ad: am 77b25796: Merge "Setup idletimer for network interface." into jb-mr1-dev am: e4565dcbeb by Ashish Sharma · 4 years, 2 months ago
- 2bb2a94 resolved conflicts for merge of ab4e251a to master am: 696aeb4e78 by Jeff Sharkey · 4 years, 2 months ago
- 971b2b0 Merge "Setup idletimer for network interface." am: 5f4cd1dfef by Ashish Sharma · 4 years, 2 months ago
- 57026e4 Merge "Include network type that caused broadcast." into jb-mr1-dev am: 976942a8ee by Jeff Sharkey · 4 years, 2 months ago
- e8f9a7a Make generic BaseNetworkObserver. am: 60e6c1ac06 by Jeff Sharkey · 4 years, 2 months ago
- 187d6e3 Split NST handler events away from CS internals. am: a1ef1bec2a by Jeff Sharkey · 4 years, 2 months ago
- 17319ab Network data activity change intent for network interfaces. am: b5da575fc7 by Haoyu Bai · 4 years, 2 months ago
- f5374c6 [automerger skipped] am 406feb59: (-s ours) Create telephony-common and mms-common - DO NOT MERGE am: e0bdc06669 -s ours by Wink Saville · 4 years, 2 months ago
- 80d49c6 Create telephony-common and mms-common am: 64e3f78abb by Wink Saville · 4 years, 2 months ago
- 2c8cf43 Reconcile with jb-release am: da0ba6beec by The Android Open Source Project · 4 years, 2 months ago
- dd41b30 am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev am: 5889983f0b by Nicolas Falliere · 4 years, 2 months ago
- d07a1fc Reconcile with jb-release nakasi-factoryrom-release am: 29cdec9fd3 by The Android Open Source Project · 4 years, 2 months ago
- 2fb9148 am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev am: 6568a45c99 by Robert Greenwalt · 4 years, 2 months ago
- a68eaa3 Reconcile with jb-release am: ce77d5e629 by The Android Open Source Project · 4 years, 2 months ago
- 924fad1 am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev am: dae5f0a509 by Jeff Sharkey · 4 years, 2 months ago
- 64ab890 merge in jb-release history after reset to jb-dev am: 2da3efe1e8 by The Android Automerger · 4 years, 2 months ago
- 6423b9f Fix network stats and policy tests. am: 0e5fa591b9 by Jeff Sharkey · 4 years, 2 months ago
- 594eb09 Merge "Reduce persist threshold for lower warning/limit." into jb-dev am: 04536e49a0 by Jeff Sharkey · 4 years, 2 months ago
- d4dbd98 Merge "Begin collecting xtables iface counters." into jb-dev am: 1e329235a6 by Jeff Sharkey · 4 years, 2 months ago
- 58266a0 Merge "Block metered APNs when app is restricted." into jb-dev am: 528c3f2139 by Jeff Sharkey · 4 years, 2 months ago
- b2649bb Support full 32 bits for socket tags. am: 528cf48b34 by Jeff Sharkey · 4 years, 2 months ago
- 9e398e8 Add bit to eventlog to handle new network types am: 310fa08670 by Robert Greenwalt · 4 years, 2 months ago
- 1c7380e Merge "Stop complaining about failure to remove routes" am: aabfae0bc8 by Robert Greenwalt · 4 years, 2 months ago
- f09e632 Pipe DHCP vendor info towards framework. am: d6075598cb by Jeff Sharkey · 4 years, 2 months ago
- 2df836f Add ALLOW_METERED column to DownloadManager. am: 3022ee14a2 by Jeff Sharkey · 4 years, 2 months ago
- 10485cf API to report if active network is metered. am: d00b130332 by Jeff Sharkey · 4 years, 2 months ago
- 9973234 Migrate to @Override to remove warnings. am: 078d356a9b by Jeff Sharkey · 4 years, 2 months ago
- d88b7eb INetworkStatsSession with lifecycle for caching. am: dc164ff128 by Jeff Sharkey · 4 years, 2 months ago
- 2d6480d Support metered Wi-Fi NetworkPolicy. am: 2d9e5a5f9e by Jeff Sharkey · 4 years, 2 months ago