Jeff Sharkey
|
ee0b0534de
|
Migrate to using Mockito directly. am: c8a2687705
Original change: undetermined
Change-Id: I2030051b2d6c688919562517282901614fd7974d
|
2021-05-31 05:54:35 +00:00 |
|
Kenny Root
|
eaac89b594
|
am dc7b3e3b: am 79a80652: Merge "KeyStore: stop using state()" am: 9a51314973
Original change: undetermined
Change-Id: Ic2a2223d718af743047dd602bcaca2b0ffb0ea2c
|
2021-05-31 05:54:22 +00:00 |
|
Russell Brenner
|
8b3c3089cb
|
Adjust captive portal test for setup wizard am: 4774b0208e
Original change: undetermined
Change-Id: I598773844ac151fb1783be07abc1c7c1df8eaf30
|
2021-05-31 05:54:08 +00:00 |
|
Robert Greenwalt
|
52aa3b4d5b
|
Fix a permissions probem in ConnectivityManager am: 1790009c36
Original change: undetermined
Change-Id: Idc3757bf3a4f46d2390df2bbf3488ac433952c90
|
2021-05-31 05:53:54 +00:00 |
|
Robert Greenwalt
|
8ffe306bbb
|
Reintroduce the net.dns system properties <TEMP> am: d44340d0ec
Original change: undetermined
Change-Id: I4225929e37a2c0d2b793d4e77904c802263be380
|
2021-05-31 05:53:40 +00:00 |
|
Robert Greenwalt
|
abee77559e
|
Merge "Second pass tying into dns cache per interface" am: 75c17e5f38
Original change: undetermined
Change-Id: I71f20a1aaab51c39ffa50c235fd071f01dff3dab
|
2021-05-31 05:53:26 +00:00 |
|
Wink Saville
|
09ab3ff930
|
Merge "Revert "Clean up published network condition reporting."" am: 75ba50a4fa
Original change: undetermined
Change-Id: I4a3d6f828eaa87a2d924bfa479daf0cc394a080f
|
2021-05-31 05:53:05 +00:00 |
|
Robert Greenwalt
|
60f14a2d63
|
Merge "Revert "Second pass tying into dns cache per interface"" am: 3ed6099b4b
Original change: undetermined
Change-Id: If851e7d7b3812a8d994520c41f771c03236a6b10
|
2021-05-31 05:52:42 +00:00 |
|
Wink Saville
|
4193986380
|
Clean up published network condition reporting. am: 463928fabe
Original change: undetermined
Change-Id: I5d947fdd962c918aaab9c8fc0f750adfb6fd5c13
|
2021-05-31 05:52:21 +00:00 |
|
Mattias Falk
|
ab4a7fbe31
|
Second pass tying into dns cache per interface am: ea8d68962c
Original change: undetermined
Change-Id: If87709abf03eac5a0b9d9ce189e200182a2b70b7
|
2021-05-31 05:52:09 +00:00 |
|
Robert Greenwalt
|
3957f8f7db
|
Merge "Up our DNS server support from 2 > 4" am: f345cde69e
Original change: undetermined
Change-Id: I7384411327f7631c50c07a72fb0fdf271aea641e
|
2021-05-31 05:51:55 +00:00 |
|
Jeff Sharkey
|
a18f262a5d
|
Expose roaming flag for testing. am: e35bff840d
Original change: undetermined
Change-Id: I3acdd09db2e766de9854c7ff604a112ba488c91c
|
2021-05-31 05:51:33 +00:00 |
|
Jean-Baptiste Queru
|
5304df56c3
|
am 3f051210: Merge from AOSP staging branch am: 7542010f7b
Original change: undetermined
Change-Id: I6171a6ae1d090b41091dd0c8938bca266dc2b732
|
2021-05-31 05:51:20 +00:00 |
|
Robert Greenwalt
|
ce3aa40e80
|
Fix javadoc break am: 1ee3d2c33e
Original change: undetermined
Change-Id: I9fdfd42e9cc0154a1f69a08908c749292f317144
|
2021-05-31 05:51:07 +00:00 |
|
Jianzheng Zhou
|
c98a894ebf
|
Refactor getPersistedNetworkPreference am: a8aa160836
Original change: undetermined
Change-Id: Ifc544d6b8f094995520b4693fded8a96cde1b1c3
|
2021-05-31 05:50:54 +00:00 |
|
Robert Greenwalt
|
e9b9567f1b
|
Merge "Support for dns domain." am: ff31bee14a
Original change: undetermined
Change-Id: I15fc7fdc8b73adae2e64df434099d2b4dea0653d
|
2021-05-31 05:50:40 +00:00 |
|
Jeff Sharkey
|
256492ea98
|
am 298d5f42: am b84f21c5: am bc0edecb: Merge "Increase readability of connectivity event log." into jb-mr1.1-dev am: 7a4d27dfdf
Original change: undetermined
Change-Id: I9958d499ba882d617fb690b6b42bf02d63ac0d04
|
2021-05-31 05:50:17 +00:00 |
|
Robert Greenwalt
|
b7ea39f7b6
|
Merge "Remove DhcpInfoInternal" am: 2be645a342
Original change: undetermined
Change-Id: I5146d6392f0ab9f64b4b12d90f64ace6b6bee47d
|
2021-05-31 05:50:03 +00:00 |
|
Dianne Hackborn
|
f76bd60065
|
am e0d454d2: am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev am: 044ac6a1c8
Original change: undetermined
Change-Id: Id15f0681a8c7abc91abc94e90bb5f2b910103419
|
2021-05-31 05:49:39 +00:00 |
|
Jeff Sharkey
|
1f713c5178
|
am 65f4de10: am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev am: b1ed51bc0e
Original change: undetermined
Change-Id: I35ddc8afb63c59d551e66128c852c7dedd940f8e
|
2021-05-31 05:49:26 +00:00 |
|
Jeff Sharkey
|
a54d74efe1
|
am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev am: 621975ad96
Original change: undetermined
Change-Id: I3527c19149c9aab01c37b94810c9574dd789ef3e
|
2021-05-31 05:49:12 +00:00 |
|
Ashish Sharma
|
e0fc860225
|
am b39f3f46: am 1c1c06fa: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev am: 3136c613e1
Original change: undetermined
Change-Id: Ia5798b0e82762dc0f0118ddce22a8ff84bf1de04
|
2021-05-31 05:49:00 +00:00 |
|
Jeff Brown
|
c57bbf66ed
|
am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev am: 42af268864
Original change: undetermined
Change-Id: I90909b0706f5c961b7c1da0ba240a75348c62eaa
|
2021-05-31 05:48:46 +00:00 |
|
Irfan Sheriff
|
91f726d911
|
am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev am: b974e23410
Original change: undetermined
Change-Id: I3418d2536960a988faad20894a9c8d5be133f83d
|
2021-05-31 05:48:32 +00:00 |
|
Jeff Sharkey
|
e311bbc849
|
am 116e0ed0: am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev am: aab7d3b292
Original change: undetermined
Change-Id: I9a7fe89d2b009273b4716df98e0e2dd5eee07137
|
2021-05-31 05:48:19 +00:00 |
|
Jeff Sharkey
|
7246cbc912
|
am 1e364aca: am 04a34b37: Merge "Actually move to Global settings." into jb-mr1-dev am: f56e2157be
Original change: undetermined
Change-Id: Ic6dce027bf5aa9d74a9df22cbafbdc1d9c80c6f5
|
2021-05-31 05:48:06 +00:00 |
|
Jeff Sharkey
|
12f1bce81c
|
am 52781414: am fa8d83d9: Merge "Restrict lockdown and firewall to AID_SYSTEM." into jb-mr1-dev am: e4e3c9dce2
Original change: undetermined
Change-Id: I17c0bfed7fc8c68978901d61e387d7f725a97c9d
|
2021-05-31 05:47:52 +00:00 |
|
Dianne Hackborn
|
99109f95ce
|
am 623cc6b7: am bac6c129: Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev am: cc4caf33a9
Original change: undetermined
Change-Id: I6a81bafcf166269c55866b03f77d1f9ba035494b
|
2021-05-31 05:47:34 +00:00 |
|
Wink Saville
|
539015166b
|
am c25494a4: am 73e58381: am 0e90f738: am cd2a20f2: am 5a2772e2: Merge "Fix code problem in writePidDns" am: b486a2054c
Original change: undetermined
Change-Id: I1234f64c78bd59328ad8b388ad2b6decbdc19654
|
2021-05-31 05:47:22 +00:00 |
|
Dianne Hackborn
|
ef3748aeeb
|
am f59dfc81: am 73365695: Merge "Improve multi-user broadcasts." into jb-mr1-dev am: fab1f2400e
Original change: undetermined
Change-Id: I019ac13338c989e71c0ef5e06a953a9fa8e57c1a
|
2021-05-31 05:46:52 +00:00 |
|
Irfan Sheriff
|
57cf5c5294
|
Merge commit '949dcad8' into manualmerge am: 04327607d0
Original change: undetermined
Change-Id: Icb01bb1b9ae845b0e152d7cda3b6e2d3f0542b6a
|
2021-05-31 05:46:21 +00:00 |
|
Jeff Sharkey
|
251f1fdfda
|
am f261d88f: am 116ee10b: Merge "Always-on VPN." into jb-mr1-dev am: 03ca5c9f83
Original change: undetermined
Change-Id: I7b62064b2f4b99c76e63d92040a09889c24aa792
|
2021-05-31 05:35:35 +00:00 |
|
Jeff Sharkey
|
df20a146df
|
am 33f94286: am 34f86312: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev am: 31b50e628d
Original change: undetermined
Change-Id: Icd8ddfdc79188341c38bd284071f6d4002918aa0
|
2021-05-31 05:35:21 +00:00 |
|
Jeff Sharkey
|
5a69f7cb28
|
am 45a630e8: am d5fc86f0: Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev am: 5c900a6685
Original change: undetermined
Change-Id: Id1b8374d294fc2564d9dec21dd353c2c93904ec2
|
2021-05-31 05:35:07 +00:00 |
|
Robert Greenwalt
|
5194e59fec
|
am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev am: 4e235f7eb7
Original change: undetermined
Change-Id: I22e6b4f452fe182802e5c6e27dc1ecd9e1e19374
|
2021-05-31 05:34:53 +00:00 |
|
Robert Greenwalt
|
a06e5e66a3
|
am 634f34af: am a819a078: am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type" am: f021438b03
Original change: undetermined
Change-Id: Ibfd6457496f6bc855a7688f8a2038e25aee78cca
|
2021-05-31 05:34:39 +00:00 |
|
Ashish Sharma
|
6ee082b413
|
am 35d875ad: am 77b25796: Merge "Setup idletimer for network interface." into jb-mr1-dev am: e4565dcbeb
Original change: undetermined
Change-Id: I9e59f4370f966635833af78e2cecd79366bb419e
|
2021-05-31 05:34:26 +00:00 |
|
Jeff Sharkey
|
2bb2a941a0
|
resolved conflicts for merge of ab4e251a to master am: 696aeb4e78
Original change: undetermined
Change-Id: Ib16beb701f8e1947e6da836b47798e4daebfa639
|
2021-05-31 05:34:12 +00:00 |
|
Ashish Sharma
|
971b2b01bd
|
Merge "Setup idletimer for network interface." am: 5f4cd1dfef
Original change: undetermined
Change-Id: If174f83dac03da8eb5860d232de92ece288f9a50
|
2021-05-31 05:33:59 +00:00 |
|
Jeff Sharkey
|
57026e4f63
|
Merge "Include network type that caused broadcast." into jb-mr1-dev am: 976942a8ee
Original change: undetermined
Change-Id: I200833519100685474c282353239b5818374dbec
|
2021-05-31 05:33:37 +00:00 |
|
Jeff Sharkey
|
e8f9a7a4cb
|
Make generic BaseNetworkObserver. am: 60e6c1ac06
Original change: undetermined
Change-Id: I3e709d5f4cc14436c6bf1d6c3cc020802449a95d
|
2021-05-31 05:33:15 +00:00 |
|
Jeff Sharkey
|
187d6e32f1
|
Split NST handler events away from CS internals. am: a1ef1bec2a
Original change: undetermined
Change-Id: Iddbf3468edff7207fc3cf9573793b350a3e9144f
|
2021-05-31 05:33:01 +00:00 |
|
Haoyu Bai
|
17319ab7c7
|
Network data activity change intent for network interfaces. am: b5da575fc7
Original change: undetermined
Change-Id: I2d89198295e658bf70053dfd8dbee53234273f96
|
2021-05-31 05:32:48 +00:00 |
|
Wink Saville
|
f5374c6d26
|
[automerger skipped] am 406feb59: (-s ours) Create telephony-common and mms-common - DO NOT MERGE am: e0bdc06669 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ib65c8f591e0efec485a6e9fc74006b346f819467
|
2021-05-31 05:32:35 +00:00 |
|
Wink Saville
|
80d49c69b7
|
Create telephony-common and mms-common am: 64e3f78abb
Original change: undetermined
Change-Id: Iddc420f86a4bbcbdbfbb514434c90e0ebc6009be
|
2021-05-31 05:32:26 +00:00 |
|
The Android Open Source Project
|
2c8cf43129
|
Reconcile with jb-release am: da0ba6beec
Original change: undetermined
Change-Id: I262a4674ff8bac06bc8880f7937d771a25d67d0d
|
2021-05-31 05:32:13 +00:00 |
|
Nicolas Falliere
|
dd41b308bd
|
am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev am: 5889983f0b
Original change: undetermined
Change-Id: Ib57570da47d7054773df637a8e1895ec9d10f51d
|
2021-05-31 05:32:00 +00:00 |
|
The Android Open Source Project
|
d07a1fc9ce
|
Reconcile with jb-release nakasi-factoryrom-release am: 29cdec9fd3
Original change: undetermined
Change-Id: Icc0aca969fc422236db6e0ce267067ff11221d4e
|
2021-05-31 05:31:47 +00:00 |
|
Robert Greenwalt
|
2fb9148a39
|
am 1ed1de7a: Merge "Modify logging to debug this issue" into jb-dev am: 6568a45c99
Original change: undetermined
Change-Id: I916247bd3f65e5db347e25518655f9b6288987a1
|
2021-05-31 05:31:33 +00:00 |
|
The Android Open Source Project
|
a68eaa35bf
|
Reconcile with jb-release am: ce77d5e629
Original change: undetermined
Change-Id: Ibd184aeb4ee22dcfa7ba36cd849aab302c5afcd3
|
2021-05-31 05:31:20 +00:00 |
|