Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Leme
05b9f210af DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 77cba4bdf6 -s ours am: 82393f7b98 -s ours 
am: 854038fcd8

Change-Id: I4acc3df60493e5ac388772f8c0e22ac92bc3ce4c
 2016-12-09 10:26:08 +00:00
Jeremy Joslin
483611214d DO NOT MERGE: VPN network stat accounting changes. am: ffe5a46b3e -s ours am: 12bb3f057b -s ours 
am: 4d145b01ee

Change-Id: Ie33371e7e4e47071aa9f74fef93ddf2cff2ec57a
 2016-12-09 10:25:17 +00:00
Hugo Benichi
a9bbff0d2b DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: ce765b7a51 -s ours am: f6cb43ae32 -s ours 
am: de53b117b5

Change-Id: I121ad24bed0fa12b80110b1058ad4279ec9c0107
 2016-12-09 10:24:20 +00:00
Hugo Benichi
274806b011 DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 1853f78d76 -s ours am: 7337239702 -s ours 
am: 57b372d6da

Change-Id: If52ab02bd501d4b071f24ddf8abdfe344e7358eb
 2016-12-09 10:23:28 +00:00
Hugo Benichi
d51cb6eb83 DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 4983e55853 -s ours am: ef148edaa2 -s ours 
am: c869826359

Change-Id: I7c177123057676622e1aa43c68676ee06ed60ee6
 2016-12-09 10:22:25 +00:00
Philip P. Moltmann
6c6a790ddc DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service. am: 29154b000f -s ours am: 6e8a33a583 -s ours 
am: 6771c6abe1

Change-Id: Id16463e4621b4012cc6c7c2bf5d7b2cc07de1b0d
 2016-12-09 10:20:59 +00:00
Jeremy Klein
4d96cee757 DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: c8e4cc8e99 -s ours am: 3cd1ae2261 -s ours 
am: a5373c3eeb

Change-Id: I897f28d2b002e1a2aa6be8ec423a1c9b1d5b761b
 2016-12-09 10:20:04 +00:00
Lorenzo Colitti
4925138b8a Merge changes from topic 'framework-net-aosp' am: ab4c79bd96 
am: 1a2fa0f372

Change-Id: I746ee7fd37946df2ba31ca8aee928fa3ef04591c
 2016-12-09 10:18:11 +00:00
Hugo Benichi
1ef8d5cdd8 DO NOT MERGE: frameworks-test: adding missing @SmallTest am: cfcc1cb7bf -s ours 
am: 9f65f04157  -s ours

Change-Id: I717dbbd4d3ed657fec9ed9f45a5ae6f3e2a04b3e
 2016-12-09 10:08:43 +00:00
Hugo Benichi
3499968748 DO NOT MERGE: Netd events: record connect() success/errno am: 5d0f28c7fd -s ours 
am: d84f932680  -s ours

Change-Id: I2e11ad15c3327a1d57453295ebc904dcf68ec3e0
 2016-12-09 10:07:51 +00:00
Lorenzo Colitti
2fc1b42116 DO NOT MERGE: Add missing dependency. am: 744b02069d -s ours 
am: 50c77cb9c0  -s ours

Change-Id: I1f15f964fcabefc50a7f05c5406f26e884130053
 2016-12-09 10:07:01 +00:00
Tony Mak
d2561167e1 DO NOT MERGE: Show notification for always-on app VPN am: de7f7d195e -s ours 
am: 118071a481  -s ours

Change-Id: I35f5107f9984284379136fd86c57432317066e68
 2016-12-09 10:05:30 +00:00
Stephen Chen
aa75afd589 DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am: 963e8ddf6d -s ours 
am: 3f5785260e  -s ours

Change-Id: Ib6f4a4af04c3f4e26028604c66f6cc4f1720a801
 2016-12-09 10:04:41 +00:00
Hugo Benichi
7092831185 DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe am: 2a43b208cc -s ours 
am: a452f24e30  -s ours

Change-Id: I4b18e3cc8c2faebbe26298db916380549eaa97aa
 2016-12-09 10:03:53 +00:00
Hugo Benichi
31e3ab399f DO NOT MERGE: NetworkMonitor metrics: add first validation information am: 21680fd25d -s ours 
am: 9908c161ca  -s ours

Change-Id: Icb20731455e4d694c92d4350a3be9184bb655d82
 2016-12-09 10:03:00 +00:00
Hugo Benichi
5fb6beae02 DO NOT MERGE: APF: also drop any ICMPv6 RSs am: 02428988ad -s ours 
am: 0d95fc9552  -s ours

Change-Id: Ib2d95353455be50dc26b3aacfca8bc804dfc447d
 2016-12-09 10:02:08 +00:00
Hugo Benichi
05236e77fe DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am: 53d83d5142 -s ours 
am: a30ae5542b  -s ours

Change-Id: If1fe794f87060443d721f0f269f519046a9ee321
 2016-12-09 10:00:41 +00:00
Hugo Benichi
6d756fa472 DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am: cbf8ff83a8 -s ours 
am: 0bef352535  -s ours

Change-Id: I92e3730002c11f3c2d5ea9c324f61237190f44bc
 2016-12-09 09:59:49 +00:00
Jeff Sharkey
2d72c165af DO NOT MERGE: Switch over to new "time.android.com" NTP pool. am: dda938a698 -s ours 
am: 7c670da7ac  -s ours

Change-Id: Ia2dec60bc75123495fe1c5e41bd545c51e07c610
 2016-12-09 09:58:59 +00:00
Stephen Chen
320111113f DO NOT MERGE: Define API for metering network stats buckets. am: dadf6caf9f -s ours 
am: 419a061017  -s ours

Change-Id: Ide68c11828a6473e330715bb4efe4d0ade9a46a2
 2016-12-09 09:58:05 +00:00
Felipe Leme
a20ccdb0ab DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. am: e4c029918f -s ours 
am: fbbaf25665  -s ours

Change-Id: I66000b3cd40a8494ad144610436f6ee953821a06
 2016-12-09 09:57:16 +00:00
Felipe Leme
153604cd9a DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. am: 2026ca147b -s ours 
am: b296948b3b  -s ours

Change-Id: I43b77614b0ccdd573cf8b29b08ef518bad617aff
 2016-12-09 09:55:47 +00:00
Felipe Leme
854038fcd8 DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 77cba4bdf6 -s ours 
am: 82393f7b98  -s ours

Change-Id: I175601094ae486700c8a6886470abb3147b6ef4e
 2016-12-09 09:54:55 +00:00
Jeremy Joslin
4d145b01ee DO NOT MERGE: VPN network stat accounting changes. am: ffe5a46b3e -s ours 
am: 12bb3f057b  -s ours

Change-Id: Id9d26bf1b9512a85cd9b6a3253b86b77a6f62e77
 2016-12-09 09:54:07 +00:00
Hugo Benichi
de53b117b5 DO NOT MERGE: ConnectivityThread: use lazy holder idiom am: ce765b7a51 -s ours 
am: f6cb43ae32  -s ours

Change-Id: I08a03dd249d30bc474a5d16472883737d12fec37
 2016-12-09 09:53:16 +00:00
Hugo Benichi
57b372d6da DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper am: 1853f78d76 -s ours 
am: 7337239702  -s ours

Change-Id: Ida0d76b540e800db215569717a1c5d26e0f583b0
 2016-12-09 09:52:26 +00:00
Hugo Benichi
c869826359 DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler am: 4983e55853 -s ours 
am: ef148edaa2  -s ours

Change-Id: Ie8ebf41835e62b64ceb22e552208c77482d96c73
 2016-12-09 09:50:57 +00:00
Philip P. Moltmann
6771c6abe1 DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service. am: 29154b000f -s ours 
am: 6e8a33a583  -s ours

Change-Id: I95d1b3e8b676572dd3fb78aa750731e4c4c6a31f
 2016-12-09 09:50:04 +00:00
Lorenzo Colitti
1a2fa0f372 Merge changes from topic 'framework-net-aosp' 
am: ab4c79bd96

Change-Id: I286110dc7db8424187d50d07fa3f059903cdea03
 2016-12-09 09:48:51 +00:00
Jeremy Klein
a5373c3eeb DO NOT MERGE: Add a null check for the OnStartTetheringCallback. am: c8e4cc8e99 -s ours 
am: 3cd1ae2261  -s ours

Change-Id: I3c471a8971c21cdbf1ebf7e1302524b038b20375
 2016-12-09 09:48:50 +00:00
Hugo Benichi
9f65f04157 DO NOT MERGE: frameworks-test: adding missing @SmallTest 
am: cfcc1cb7bf  -s ours

Change-Id: Idc0806748704f86b65dfbe760e7b55c2f61436d0
 2016-12-09 09:36:16 +00:00
Hugo Benichi
d84f932680 DO NOT MERGE: Netd events: record connect() success/errno 
am: 5d0f28c7fd  -s ours

Change-Id: I833ea69c0a8cb79bcaf9280bd617d0ce7924764c
 2016-12-09 09:34:51 +00:00
Lorenzo Colitti
50c77cb9c0 DO NOT MERGE: Add missing dependency. 
am: 744b02069d  -s ours

Change-Id: I2bcc3e7eb9d55c4063cdbf6945baa4ce5ce9ba88
 2016-12-09 09:34:11 +00:00
Tony Mak
118071a481 DO NOT MERGE: Show notification for always-on app VPN 
am: de7f7d195e  -s ours

Change-Id: Icb50333e9ca623f40a8a48c25d28c404748310c2
 2016-12-09 09:33:28 +00:00
Stephen Chen
3f5785260e DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. 
am: 963e8ddf6d  -s ours

Change-Id: Idfaf31ca77450618391cf2b010ec7fc0961b6dc2
 2016-12-09 09:32:43 +00:00
Hugo Benichi
a452f24e30 DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe 
am: 2a43b208cc  -s ours

Change-Id: Ic6806b65b46c0e7f68a796db534b319126235129
 2016-12-09 09:31:59 +00:00
Hugo Benichi
9908c161ca DO NOT MERGE: NetworkMonitor metrics: add first validation information 
am: 21680fd25d  -s ours

Change-Id: Ida088560e94946bc0fa57f59f56007753a197068
 2016-12-09 09:31:16 +00:00
Hugo Benichi
0d95fc9552 DO NOT MERGE: APF: also drop any ICMPv6 RSs 
am: 02428988ad  -s ours

Change-Id: Iaf8442b9536e8c465fd4336a7706e8fd00933266
 2016-12-09 09:30:09 +00:00
Hugo Benichi
a30ae5542b DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings 
am: 53d83d5142  -s ours

Change-Id: I07650e028dbe5be6d04761ae0cbb9e9512d31d53
 2016-12-09 09:29:11 +00:00
Hugo Benichi
0bef352535 DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark 
am: cbf8ff83a8  -s ours

Change-Id: I6af5dd9e2bf31346578d5fca4a635ba3af2f2099
 2016-12-09 09:28:32 +00:00
Hugo Benichi
eb96bb7338 Removing bogus file added by mistake 
This patch deletes a bogus file added by mistake in the change with
commit hash 147aa6d53b.

Test: no code change.
Bug: 32198726

Change-Id: Iffc6b3a5ebd854dc81d537576a4405955abacba7
 2016-12-09 18:28:19 +09:00
Jeff Sharkey
7c670da7ac DO NOT MERGE: Switch over to new "time.android.com" NTP pool. 
am: dda938a698  -s ours

Change-Id: I2b1825f00459952d6f3430c99661aafc907e6c37
 2016-12-09 09:27:54 +00:00
Stephen Chen
419a061017 DO NOT MERGE: Define API for metering network stats buckets. 
am: dadf6caf9f  -s ours

Change-Id: I3dcf9d32deeb09d08364b135714b84e685767dee
 2016-12-09 09:27:11 +00:00
Felipe Leme
fbbaf25665 DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock. 
am: e4c029918f  -s ours

Change-Id: Ieeea6db94be1d402fe8129f02bea2586346dcf76
 2016-12-09 09:26:31 +00:00
Felipe Leme
b296948b3b DO NOT MERGE: Use @Ignore to explicitly disable a @Test method. 
am: 2026ca147b  -s ours

Change-Id: I17818101fa8f47d285cf772a0f67373c1dda5e30
 2016-12-09 09:25:12 +00:00
Felipe Leme
82393f7b98 DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. 
am: 77cba4bdf6  -s ours

Change-Id: I907010456f9bb9674748222fd5e82b8b64dce46f
 2016-12-09 09:24:24 +00:00
Jeremy Joslin
12bb3f057b DO NOT MERGE: VPN network stat accounting changes. 
am: ffe5a46b3e  -s ours

Change-Id: Ic42723be04158feafd268b3859f0e938d3e36d01
 2016-12-09 09:23:37 +00:00
Hugo Benichi
f6cb43ae32 DO NOT MERGE: ConnectivityThread: use lazy holder idiom 
am: ce765b7a51  -s ours

Change-Id: I0625013f14e4a2c24a238677a3de50961d114619
 2016-12-09 09:22:57 +00:00
Hugo Benichi
7337239702 DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper 
am: 1853f78d76  -s ours

Change-Id: Ia41bae1435c94e042358e8b88b42f83cd5359a6e
 2016-12-09 09:22:16 +00:00
Hugo Benichi
ef148edaa2 DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler 
am: 4983e55853  -s ours

Change-Id: I806d5d79994785357390707d77760af3af725477
 2016-12-09 09:21:22 +00:00