Jeff Sharkey
|
4167ea05b6
|
Persist UID stats, lazy loading, resize buckets. am: 837b4ebf7e am: b8d04a6a88 am: 310acdb231
Original change: undetermined
Change-Id: I0ff7534a989e3204a886953b5e63ad1a9c7563a1
|
2021-05-31 12:11:19 +00:00 |
|
Jeff Sharkey
|
f8bfb07623
|
Persist network stats using AtomicFile. am: ebbebc73a0 am: 6bac4e55ab am: cc88516b14
Original change: undetermined
Change-Id: I57c97811d190340b51892689187f97a94cc6df38
|
2021-05-31 12:11:06 +00:00 |
|
Chia-chi Yeh
|
1a40fb7ba9
|
The service part of the user space VPN support. am: 9a4ad7d52c am: 02b2764424 am: 1dcbdaa51a
Original change: undetermined
Change-Id: I2c47a1283c3f1c15f7991d54fc6f071d51b3919b
|
2021-05-31 12:10:53 +00:00 |
|
Robert Greenwalt
|
cd556fef6f
|
resolved conflicts for merge of 510d0a75 to master am: 269d732e13 am: 6a6fe42af8 am: cef6bc40cb
Original change: undetermined
Change-Id: Ie277d9055ae757411509d37a977e876a0b0be192
|
2021-05-31 12:10:41 +00:00 |
|
Jeff Sharkey
|
7a11920ae5
|
Compute range-based usage in NetworkStatsHistory. am: 512b757b08 am: c7a2cbdaf7 am: cec023c513
Original change: undetermined
Change-Id: I87f45d1c08940fee7394ea100af78d52f2a2059a
|
2021-05-31 12:10:29 +00:00 |
|
Jeff Sharkey
|
b6098bc891
|
Map network identity using ConnectivityService. am: 21062e7c7e am: 7433b91c8f am: 02e59fa369
Original change: undetermined
Change-Id: Ica623cdf077e1da66fefb9b371f8e85fe3b2a577
|
2021-05-31 12:10:16 +00:00 |
|
Chia-chi Yeh
|
1549873a85
|
Merge "Do not register the callbacks in the constructor." am: ab2c05370e am: 631d1a70f5 am: dba43a183d
Original change: undetermined
Change-Id: I01f91923d7b94dec7275879282a935dbd7ea0ffe
|
2021-05-31 12:10:04 +00:00 |
|
Jeff Sharkey
|
af9a59fd73
|
Collect historical network stats. am: d26449fd76 am: a7e6d88f1c am: b1787f22b7
Original change: undetermined
Change-Id: If3639fcce20fa614855f5cc661e49f086f9e11d6
|
2021-05-31 12:09:51 +00:00 |
|
Jeff Sharkey
|
4e730916f3
|
Policy and rules work for ConnectivityManager. am: 921ebf2ee5 am: d2284681ad am: 31a379bdd0
Original change: undetermined
Change-Id: I1768173d806e61a38d53a8e4d7815fb9c349420c
|
2021-05-31 12:09:39 +00:00 |
|
Mike Lockwood
|
45fbfa5e57
|
Move stringToFile utility from ConnectivityService to FileUtils am: 0d5916c21e am: 587fcfee64 am: 08067bd481
Original change: undetermined
Change-Id: I292acd7fd308d6c5e69d471f241216c0fa540f32
|
2021-05-31 12:09:27 +00:00 |
|
Jeff Sharkey
|
b317a3df15
|
Merge "APIs to profile network usage for current UID." am: 0d49ed3ca8 am: 4d5375dc6c am: 9b1f2f8faf
Original change: undetermined
Change-Id: Ie0ce8ebe416f394689d272654d4e388b16a02133
|
2021-05-31 12:09:14 +00:00 |
|
Robert Greenwalt
|
227215a96f
|
am e0f7bc0b: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp am: 1b507045bd am: 6a759ea8f1 am: 4782adac37
Original change: undetermined
Change-Id: Ic15e97207f85e8fc3734d4656e4b8ef3f0c9b19b
|
2021-05-31 12:09:02 +00:00 |
|
The Android Open Source Project
|
82df977269
|
Reconcile with honeycomb-release am: 991f5f4ec9 am: a7b8bd5671 am: 19210cd047
Original change: undetermined
Change-Id: Ia0263a39d4a2f9a0cb0e43785f2be4ebb20f0813
|
2021-05-31 12:08:51 +00:00 |
|
The Android Open Source Project
|
4b27f0cb0b
|
Reconcile with gingerbread-release am: 969a009cbd am: 1afa2215dc am: 68bb13c861
Original change: undetermined
Change-Id: I9373382c85c7255d2bc161885c07a1108af47911
|
2021-05-31 12:08:39 +00:00 |
|
Wink Saville
|
afafe65ff9
|
am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE am: 1dc369c378 am: 0655a61541 am: 20aa545f6d
Original change: undetermined
Change-Id: Ibf300683487558133cad11e4010661b5f92bad73
|
2021-05-31 12:08:27 +00:00 |
|
Jean-Baptiste Queru
|
8277e4862b
|
Merge f024027b am: 65727c9c5d am: 5b21e068f1 am: af14a5af5e
Original change: undetermined
Change-Id: Idc1335e873001680b4653c519ae55e5e1321dfc3
|
2021-05-31 12:08:16 +00:00 |
|
Kazuhiro Ondo
|
bdd97cdcb8
|
am a9f139c4: am 3a34041f: Linkproperties update via unsol data call state change. am: 842c177850 am: a9266ebc4f am: c38857975a
Original change: undetermined
Change-Id: I61b38ab9501f76dca0868f5feb0178ec691a302c
|
2021-05-31 12:08:04 +00:00 |
|
Irfan Sheriff
|
890d16bc51
|
am ea7aa92a: (-s ours) am 891bdee2: Merge commit \'01ea7f01\' into manualmerge1 am: bc7d82560f am: c21a957b45 am: 98c9400728
Original change: undetermined
Change-Id: I58f80b6d27789fdd3d8ee66d98190240dfa5e66f
|
2021-05-31 12:07:52 +00:00 |
|
Wink Saville
|
ddabe40fbd
|
am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE am: a8f3f7c298 am: bfb78d7880 am: faf430b32c
Original change: undetermined
Change-Id: I88615b749bab5b9fc311c5030cd5274bb832bb33
|
2021-05-31 12:07:40 +00:00 |
|
Chia-chi Yeh
|
5df3049f98
|
Extract NetworkManagementService out from Tethering to ConnectivityService. am: 4df51328bd am: ccf66691c9 am: ff992595ea
Original change: undetermined
Change-Id: I722588ab0c6b98efcd81abb82007b77646840c66
|
2021-05-31 12:07:28 +00:00 |
|
Robert Greenwalt
|
f9f2f925f6
|
am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE am: b5c62b6230 am: e4cd798f6d am: 6556fc6536
Original change: undetermined
Change-Id: I430734cfd6376e16f4246e3ec6e8dea2fec8db3e
|
2021-05-31 12:07:15 +00:00 |
|
Robert Greenwalt
|
d395819431
|
am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE am: e7dcc1362f am: 3131fedb76 am: 316829c39a
Original change: undetermined
Change-Id: I8dde5052d5f3314011d705c5292293475538510d
|
2021-05-31 12:07:02 +00:00 |
|
Robert Greenwalt
|
5b0383f7a5
|
resolved conflicts for merge of 90faa5de to master am: b0d1452d58 am: 7b76c95d85 am: 26405858bc
Original change: undetermined
Change-Id: Ia08608b5406e3efff999d231379af13c7010b759
|
2021-05-31 12:06:50 +00:00 |
|
Irfan Sheriff
|
63e5c7549f
|
am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE am: 52b5163b83 am: 9e88a39d63 am: 96bc459c63
Original change: undetermined
Change-Id: I895b71fb9da807615444675cc5ee0cabc6bf7ff8
|
2021-05-31 12:06:38 +00:00 |
|
Robert Greenwalt
|
2e9e4fa330
|
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE am: ef903acab4 am: 655ffb0c17 am: cb192bba92
Original change: undetermined
Change-Id: Icd10a148f59d502b58cb1f800afe5e1686105c5c
|
2021-05-31 12:06:25 +00:00 |
|
Robert Greenwalt
|
1c16beaafe
|
Expose more net types to the public. am: f76c55d289 am: 3fade91d84 am: e98f3d7c66
Original change: undetermined
Change-Id: I97700fab7955c44537b79eafe8dc07b25afaa744
|
2021-05-31 12:06:13 +00:00 |
|
Elliott Hughes
|
5037c48ef9
|
More native code cleanup. am: c944a7dedc am: 9e5fd38c42 am: 6b58c34ddd
Original change: undetermined
Change-Id: I39bcb2642a758bd813f65bc11113ac0e0eead1d7
|
2021-05-31 12:06:01 +00:00 |
|
Benoit Goby
|
4e1567b3b1
|
resolved conflicts for merge of d27954e0 to master am: ef54af248b am: 50885c55bb am: a51c661cbc
Original change: undetermined
Change-Id: I1fe497bb023b019a00621e5cba60f344d89c1e8b
|
2021-05-31 12:05:49 +00:00 |
|
Wink Saville
|
0047177cdf
|
am 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE am: 75d9e1cd13 am: 90b9909493 am: 33f3c20627
Original change: undetermined
Change-Id: Ie64eaeb14303d28af9ca7d560cbe1c5143c2c3e7
|
2021-05-31 12:05:37 +00:00 |
|
Robert Greenwalt
|
d4f376f7a3
|
am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp am: f7ca6f7ddf am: 1502bc55a8 am: be2039fe98
Original change: undetermined
Change-Id: I88ba80832f7e03a591c0e663e48ac4286ac2f330
|
2021-05-31 12:05:25 +00:00 |
|
John Wang
|
b4345d536b
|
am f2cc9d1c: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE am: a8191da467 am: eb922405e8 am: 1c78694373
Original change: undetermined
Change-Id: I776691f66033638a955d72ec4ff01a223bc6c2a8
|
2021-05-31 12:05:13 +00:00 |
|
Brian Carlstrom
|
0f33213f40
|
Don't use local ref for cached jclass reference in JNI code am: 587274ea3a am: 6e90d05342 am: ab2023a847
Original change: undetermined
Change-Id: I85ea020c45db1c4b0c3f1ffb9458e187a6f0d024
|
2021-05-31 12:04:59 +00:00 |
|
Simon Wilson
|
6559164262
|
[automerger skipped] 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 am: e4eecbb1f8 -s ours
am skip reason: subject contains skip directive
Original change: undetermined
Change-Id: Ia9554591aa65766ff5270e503b39e65bb004fb9c
|
2021-05-31 12:04:47 +00:00 |
|
Robert Greenwalt
|
b0fd216df4
|
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp am: 198b24d59a am: 923b316408 am: 5e8f6ed01b
Original change: undetermined
Change-Id: I924fc046d7d4bb382a6c20a022024eb4ca761f01
|
2021-05-31 12:04:38 +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 |
|