Wink Saville
|
2dadec0662
|
am 3f2f58e9: am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE am: efaa396ae9 am: 49aae8e001
Original change: undetermined
Change-Id: I1eacf5e85bb9e6a69416d917bab1c0171c0761ae
|
2021-05-31 12:03:52 +00:00 |
|
Irfan Sheriff
|
77d9e762da
|
Merge "WifiWatchdogService - disable bad connections" am: e7bfeb3d77 am: 21ee0e1479
Original change: undetermined
Change-Id: Ibf80b7a20b50d21a5949d44c06e6c899a573b133
|
2021-05-31 12:03:38 +00:00 |
|
Robert Greenwalt
|
3b506eb7fe
|
resolved conflicts for merge of 40717996 to master am: 968330fae8 am: 30eb566d0f
Original change: undetermined
Change-Id: I873dd106441b1eb4e6e138a7574a146566f258c1
|
2021-05-31 12:03:00 +00:00 |
|
Irfan Sheriff
|
05a73ab51b
|
am be859295: (-s ours) am 9a33301d: resolved conflicts for merge of ea8e3c23 to honeycomb-LTE am: df6bab0528 am: b2d284c5ed
Original change: undetermined
Change-Id: Ib65afbc8e5ab86031e5ed4d21a0646e20fd82e24
|
2021-05-31 12:02:45 +00:00 |
|
Irfan Sheriff
|
82f1de224b
|
am 060e2a4a: (-s ours) am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE am: 016cd82367 am: e4bc970baf
Original change: undetermined
Change-Id: I0d360fbb8eaf8dd5f0f58d4e5dfa09dd20017300
|
2021-05-31 12:02:29 +00:00 |
|
Robert Greenwalt
|
46c656a1b4
|
resolved conflicts for merge of 796539b1 to master am: 09d6cdf338 am: c4778fab71
Original change: undetermined
Change-Id: Id563efeff9125f6b8a89f60dba05608c4ab05ef4
|
2021-05-31 12:02:15 +00:00 |
|
Jeff Sharkey
|
8b3625ddd1
|
Persist "tagged" network stats along with UIDs. am: d723e62717 am: 2e5704faa8
Original change: undetermined
Change-Id: I05d86bbee28be4b03ee827d9de380b8835f96b1a
|
2021-05-31 12:02:02 +00:00 |
|
Jeff Sharkey
|
3c29f98198
|
Handle removed UIDs in network stats and policy. am: d57635406d am: 300c957638
Original change: undetermined
Change-Id: I6b6b3ca3f2c97da4a3e2cd2dbdb393997ba914d0
|
2021-05-31 12:01:47 +00:00 |
|
Jeff Sharkey
|
d580628760
|
Read "qtaguid" network stats, refactor templates. am: de450f98eb am: e6037cda67
Original change: undetermined
Change-Id: If904e3023c688fb3bc8a7398b566ec93e59aa07e
|
2021-05-31 12:01:34 +00:00 |
|
Jeff Sharkey
|
73cf1cd588
|
Notify policy listeners about metered ifaces. am: a47d7a1a70 am: 27b8250fe9
Original change: undetermined
Change-Id: I1c93cb15ca4e906674ea7b9f1e678a0c79b7752c
|
2021-05-31 12:01:19 +00:00 |
|
Jeff Sharkey
|
d4ce49a91a
|
Merge "DownloadManager flags for network policy." am: 29fc3322d5 am: a03b55c7c3
Original change: undetermined
Change-Id: I31726c6e03dee4783ead3c32b6ddfba01a15e754
|
2021-05-31 12:01:04 +00:00 |
|
Robert Greenwalt
|
86deeefb56
|
am 00ca322d: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE am: 9d145fde31 am: 9a4fa385de
Original change: undetermined
Change-Id: I0b8ebad8fe40798485d597e53e3fe22a4c0458ca
|
2021-05-31 12:00:49 +00:00 |
|
Chia-chi Yeh
|
22f2e71bc8
|
VPN: migrate from generic Bundle to our own Parcelable VpnConfig. am: 75cacd5525 am: c1ddef64dd
Original change: undetermined
Change-Id: I931fc959114c19274fbc632c872c3f5bb1f3b725
|
2021-05-31 12:00:35 +00:00 |
|
Jeff Sharkey
|
428438534d
|
Growable NetworkStats object instead of builder. am: 97abbe95cd am: 2f79020fc1
Original change: undetermined
Change-Id: I74966273ed27b43c4e041af0bff8c81e4d980b33
|
2021-05-31 12:00:21 +00:00 |
|
Jeff Sharkey
|
310acdb231
|
Persist UID stats, lazy loading, resize buckets. am: 837b4ebf7e am: b8d04a6a88
Original change: undetermined
Change-Id: If40101f389b34befab14b3c84713bbe039c25776
|
2021-05-31 12:00:07 +00:00 |
|
Jeff Sharkey
|
cc88516b14
|
Persist network stats using AtomicFile. am: ebbebc73a0 am: 6bac4e55ab
Original change: undetermined
Change-Id: I3ce90a7d39670edd0acc73c6c209b2c4380ad42a
|
2021-05-31 11:59:52 +00:00 |
|
Chia-chi Yeh
|
1dcbdaa51a
|
The service part of the user space VPN support. am: 9a4ad7d52c am: 02b2764424
Original change: undetermined
Change-Id: I80de0794ff14ae99f886c4f37549205dffa75cf1
|
2021-05-31 11:59:38 +00:00 |
|
Robert Greenwalt
|
cef6bc40cb
|
resolved conflicts for merge of 510d0a75 to master am: 269d732e13 am: 6a6fe42af8
Original change: undetermined
Change-Id: I26e695179edab11725a22cb7c2c26952f5540872
|
2021-05-31 11:59:24 +00:00 |
|
Jeff Sharkey
|
cec023c513
|
Compute range-based usage in NetworkStatsHistory. am: 512b757b08 am: c7a2cbdaf7
Original change: undetermined
Change-Id: I665450c37a881a612823c8b18f5969f816b0df61
|
2021-05-31 11:59:11 +00:00 |
|
Jeff Sharkey
|
02e59fa369
|
Map network identity using ConnectivityService. am: 21062e7c7e am: 7433b91c8f
Original change: undetermined
Change-Id: I17f259263c90ede6b13acfa99c419880f1bfb5b0
|
2021-05-31 11:58:57 +00:00 |
|
Chia-chi Yeh
|
dba43a183d
|
Merge "Do not register the callbacks in the constructor." am: ab2c05370e am: 631d1a70f5
Original change: undetermined
Change-Id: Ic5e7f48b2b020212dd412921b2e9f465dbace0f2
|
2021-05-31 11:58:43 +00:00 |
|
Jeff Sharkey
|
b1787f22b7
|
Collect historical network stats. am: d26449fd76 am: a7e6d88f1c
Original change: undetermined
Change-Id: I25b6552a408c915d634bf860f6a5bdcaef37fbd8
|
2021-05-31 11:58:29 +00:00 |
|
Jeff Sharkey
|
31a379bdd0
|
Policy and rules work for ConnectivityManager. am: 921ebf2ee5 am: d2284681ad
Original change: undetermined
Change-Id: Ieb9dc39f28b2a04ea65ec4d3b891fdff73bfeb32
|
2021-05-31 11:58:16 +00:00 |
|
Mike Lockwood
|
08067bd481
|
Move stringToFile utility from ConnectivityService to FileUtils am: 0d5916c21e am: 587fcfee64
Original change: undetermined
Change-Id: I1fb537110d2b7d3c206e498938006c1bc57e9f05
|
2021-05-31 11:58:03 +00:00 |
|
Jeff Sharkey
|
9b1f2f8faf
|
Merge "APIs to profile network usage for current UID." am: 0d49ed3ca8 am: 4d5375dc6c
Original change: undetermined
Change-Id: I1c2686bcb276ab19d9ed8009887a7affe25f1a3f
|
2021-05-31 11:57:49 +00:00 |
|
Robert Greenwalt
|
4782adac37
|
am e0f7bc0b: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp am: 1b507045bd am: 6a759ea8f1
Original change: undetermined
Change-Id: If4eae2b3cc4ad72cbeaa0f0ca19816a8709e04d0
|
2021-05-31 11:57:36 +00:00 |
|
The Android Open Source Project
|
19210cd047
|
Reconcile with honeycomb-release am: 991f5f4ec9 am: a7b8bd5671
Original change: undetermined
Change-Id: Ib9b070ba8e7a40e44c51c4fc70c915ce258c87c0
|
2021-05-31 11:57:23 +00:00 |
|
The Android Open Source Project
|
68bb13c861
|
Reconcile with gingerbread-release am: 969a009cbd am: 1afa2215dc
Original change: undetermined
Change-Id: Ie99458f14052580095a31a193778f350e2c83d6b
|
2021-05-31 11:57:10 +00:00 |
|
Wink Saville
|
20aa545f6d
|
am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE am: 1dc369c378 am: 0655a61541
Original change: undetermined
Change-Id: I1ecd6c0db05c74b063aa3518ef7d1e2959eb0a2e
|
2021-05-31 11:56:57 +00:00 |
|
Jean-Baptiste Queru
|
af14a5af5e
|
Merge f024027b am: 65727c9c5d am: 5b21e068f1
Original change: undetermined
Change-Id: I6ce1e450b929ba94a77d9c89a31ec4a7c9a45f37
|
2021-05-31 11:56:44 +00:00 |
|
Kazuhiro Ondo
|
c38857975a
|
am a9f139c4: am 3a34041f: Linkproperties update via unsol data call state change. am: 842c177850 am: a9266ebc4f
Original change: undetermined
Change-Id: I0bf34fcc52afa87d37a5c35ba7c41c391e56fda4
|
2021-05-31 11:56:32 +00:00 |
|
Irfan Sheriff
|
98c9400728
|
am ea7aa92a: (-s ours) am 891bdee2: Merge commit \'01ea7f01\' into manualmerge1 am: bc7d82560f am: c21a957b45
Original change: undetermined
Change-Id: I315d91a1a1377596d3312442e9a7199b28a201b5
|
2021-05-31 11:56:18 +00:00 |
|
Wink Saville
|
faf430b32c
|
am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE am: a8f3f7c298 am: bfb78d7880
Original change: undetermined
Change-Id: I68429f71c31b134b6a4160ac89005acc639eef6a
|
2021-05-31 11:56:05 +00:00 |
|
Chia-chi Yeh
|
ff992595ea
|
Extract NetworkManagementService out from Tethering to ConnectivityService. am: 4df51328bd am: ccf66691c9
Original change: undetermined
Change-Id: I8713b974b83c109466643c26a4597e25c700ad43
|
2021-05-31 11:55:51 +00:00 |
|
Robert Greenwalt
|
6556fc6536
|
am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE am: b5c62b6230 am: e4cd798f6d
Original change: undetermined
Change-Id: Idc41465bbe128cc67a371b46023b92a848a44a0a
|
2021-05-31 11:55:37 +00:00 |
|
Robert Greenwalt
|
316829c39a
|
am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE am: e7dcc1362f am: 3131fedb76
Original change: undetermined
Change-Id: I718e97d785293225db42b401a60b6c208d2812e2
|
2021-05-31 11:55:23 +00:00 |
|
Robert Greenwalt
|
26405858bc
|
resolved conflicts for merge of 90faa5de to master am: b0d1452d58 am: 7b76c95d85
Original change: undetermined
Change-Id: If736b772f4e79d76dc3d1f569cd74a661df2f850
|
2021-05-31 11:55:10 +00:00 |
|
Irfan Sheriff
|
96bc459c63
|
am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE am: 52b5163b83 am: 9e88a39d63
Original change: undetermined
Change-Id: I134997aa6b1cc3ca471742c7cff1c0dbf760c576
|
2021-05-31 11:54:56 +00:00 |
|
Robert Greenwalt
|
cb192bba92
|
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE am: ef903acab4 am: 655ffb0c17
Original change: undetermined
Change-Id: Ifb182ea2c74808f3fdf8ca0a88d6eb6ebe5fb58d
|
2021-05-31 11:54:42 +00:00 |
|
Robert Greenwalt
|
e98f3d7c66
|
Expose more net types to the public. am: f76c55d289 am: 3fade91d84
Original change: undetermined
Change-Id: I81da354de8f249e276def63cf47635466f2e41e8
|
2021-05-31 11:54:28 +00:00 |
|
Elliott Hughes
|
6b58c34ddd
|
More native code cleanup. am: c944a7dedc am: 9e5fd38c42
Original change: undetermined
Change-Id: Ic4342dcbf153801732337fe1ca8979b3d60042c5
|
2021-05-31 11:54:14 +00:00 |
|
Benoit Goby
|
a51c661cbc
|
resolved conflicts for merge of d27954e0 to master am: ef54af248b am: 50885c55bb
Original change: undetermined
Change-Id: I9aab54f02555eef00d558d7b1521a04c38af7639
|
2021-05-31 11:54:01 +00:00 |
|
Wink Saville
|
33f3c20627
|
am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE am: 75d9e1cd13 am: 90b9909493
Original change: undetermined
Change-Id: Ib355e0b4b0feb80aa4af2f2789cd73e9e1c496de
|
2021-05-31 11:53:49 +00:00 |
|
Robert Greenwalt
|
be2039fe98
|
am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp am: f7ca6f7ddf am: 1502bc55a8
Original change: undetermined
Change-Id: If9e55141e4481733b55224d9daa22f42f916dac8
|
2021-05-31 11:53:35 +00:00 |
|
John Wang
|
1c78694373
|
am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE am: a8191da467 am: eb922405e8
Original change: undetermined
Change-Id: I779c2f5f4eaa139cd23cfb481d38070744f17339
|
2021-05-31 11:53:21 +00:00 |
|
Brian Carlstrom
|
ab2023a847
|
Don't use local ref for cached jclass reference in JNI code am: 587274ea3a am: 6e90d05342
Original change: undetermined
Change-Id: I98d31da6d4a855c5e665a328aa4ecee000fef239
|
2021-05-31 11:53:08 +00:00 |
|
Simon Wilson
|
e4eecbb1f8
|
am 2e4b442d: (-s ours) am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread am: d2dc2511ec am: 9bfd950113
Original change: undetermined
Change-Id: I85c3bf10849bbf8ce04d23c828dc74135b458dde
|
2021-05-31 11:52:54 +00:00 |
|
Robert Greenwalt
|
5e8f6ed01b
|
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp am: 198b24d59a am: 923b316408
Original change: undetermined
Change-Id: I636229514903ff4c46c46d3b6acb9ca2fbb7dd55
|
2021-05-31 11:52:40 +00:00 |
|
Robert Greenwalt
|
2f0c0737a1
|
Fix a bad merge. am: 1e2f286a27 am: 480be04b6d
Original change: undetermined
Change-Id: Ic6f3022c19b61c067b46589f4565b1d9d8339d73
|
2021-05-31 11:41:31 +00:00 |
|
Robert Greenwalt
|
a237aa4df0
|
am 026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp am: e698829381 am: 0f36cf0650
Original change: undetermined
Change-Id: I3c4f4aa4fffb21ad604e1af052a42f0d147a0997
|
2021-05-31 11:41:17 +00:00 |
|