OSDN Git Service
Marie Janssen [Mon, 12 Dec 2016 21:34:39 +0000 (21:34 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
am:
47e1f497c0 -s ours
Change-Id: Ifa6abd776e6752c0eb1ac0bc41d51f9ebdddc490
Joe LaPenna [Mon, 12 Dec 2016 21:28:29 +0000 (21:28 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
am:
9b430e0395
Change-Id: Ib14979d168f4e37ab2f8de0737abe94cc6c8b16d
Marie Janssen [Mon, 12 Dec 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
Treehugger Robot [Mon, 12 Dec 2016 21:14:56 +0000 (21:14 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
Jeff Sharkey [Mon, 12 Dec 2016 19:42:22 +0000 (19:42 +0000)]
Merge "Catch all exceptions from installd, log codes."
am:
9a10ca3f4c
Change-Id: Iee50cdea3115ff868f8ae29b7e0d0ab590a7cc34
Jeff Sharkey [Mon, 12 Dec 2016 19:30:22 +0000 (19:30 +0000)]
Merge "Catch all exceptions from installd, log codes."
Joe LaPenna [Thu, 8 Dec 2016 00:27:24 +0000 (16:27 -0800)]
Add simplified_network_settings_bool to CarrierConfigManager.
BUG:
33111931
Test: runtest carrierconfig-unit
Change-Id: I3da3048afcf1547c46db5c76ff68165246faa77a
Svetoslav Ganov [Thu, 30 Jun 2016 00:31:44 +0000 (17:31 -0700)]
DO NOT MERGE Add Bluetooth toggle prompts - framework
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.
bug:
28715749
Change-Id: I77bca2305f9d0f20034b2c8fc5b58e0565d5e617
Neil Fuller [Mon, 12 Dec 2016 17:33:43 +0000 (17:33 +0000)]
Merge "Track BufferIterator changes in libcore"
am:
021e8ff2af
Change-Id: Id6cb26d1af8a3e35af52ae0f070fdab8a38c8e69
Neil Fuller [Mon, 12 Dec 2016 17:23:18 +0000 (17:23 +0000)]
Merge "Track BufferIterator changes in libcore"
Jeff Sharkey [Mon, 12 Dec 2016 17:15:37 +0000 (10:15 -0700)]
Catch all exceptions from installd, log codes.
Now that installd is throwing both SecurityException and
IllegalArgumentException, it's time that we turned all these
into InstallerException.
Also extend ServiceSpecificException to include the contained
errorCode value when printing.
Test: builds, boots, apps install/uninstall fine
Bug:
13758960,
30944031
Change-Id: Ic9c1e99ae87f4442402ef528bf352c7978572c85
Erik Kline [Mon, 12 Dec 2016 08:29:14 +0000 (08:29 +0000)]
Merge "Stop setting net.dns{1234} system properties."
am:
7552e2de9d
Change-Id: I9b31b281896995943ce8217c3230867db380a841
Treehugger Robot [Mon, 12 Dec 2016 08:16:35 +0000 (08:16 +0000)]
Merge "Stop setting net.dns{1234} system properties."
Jeff Sharkey [Sat, 10 Dec 2016 23:06:56 +0000 (23:06 +0000)]
Merge "Remove DEXOPT_OTA flag."
am:
8584db972c
Change-Id: I706f3d92b15f169f0ec877e95bac224bb90c2033
Jeff Sharkey [Sat, 10 Dec 2016 23:01:59 +0000 (23:01 +0000)]
Merge "Final push of installd to Binder; goodbye socket!"
am:
1950377f91
Change-Id: If10d4f4aafa68b78ddd9a98e8699fe008bbda49b
Jeff Sharkey [Sat, 10 Dec 2016 22:57:22 +0000 (22:57 +0000)]
Merge "Remove DEXOPT_OTA flag."
Jeff Sharkey [Sat, 10 Dec 2016 22:54:51 +0000 (22:54 +0000)]
Merge "Final push of installd to Binder; goodbye socket!"
Michael Rosenfeld [Sat, 10 Dec 2016 01:01:13 +0000 (01:01 +0000)]
Merge "Copy preload2.jar to build artifacts"
am:
64583c332a
Change-Id: I5cb3a43c09546881872803dabefb23950c0c1c17
Michael Rosenfeld [Sat, 10 Dec 2016 00:48:52 +0000 (00:48 +0000)]
Merge "Copy preload2.jar to build artifacts"
Michael Rosenfeld [Wed, 7 Dec 2016 19:49:34 +0000 (11:49 -0800)]
Copy preload2.jar to build artifacts
Test: local build
Bug:
33492076
Change-Id: I76de648cd1947e49278a678a4c6f1dce8092bbd4
Jeff Sharkey [Sat, 10 Dec 2016 00:08:06 +0000 (17:08 -0700)]
Remove DEXOPT_OTA flag.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: I266a39c6dc7948f784580e4ef1cf0bb8ee27d0e7
Jeremy Joslin [Sat, 10 Dec 2016 00:06:37 +0000 (00:06 +0000)]
Merge "Update registerNetworkScoreCache() to accept a filter type."
am:
a511a07fa3
Change-Id: I51983da8fe63db15d9b38e3ebe4a20cb95cb5f13
Treehugger Robot [Fri, 9 Dec 2016 23:56:34 +0000 (23:56 +0000)]
Merge "Update registerNetworkScoreCache() to accept a filter type."
Jeff Sharkey [Fri, 9 Dec 2016 21:31:26 +0000 (14:31 -0700)]
Final push of installd to Binder; goodbye socket!
Move last two straggling installd commands to Binder and destroy the
socket-based communication channel forever.
Test: builds, boots, apps install fine, pre-OTA dexopt works
Bug:
13758960,
30944031
Change-Id: I9afb9f71858febde34a94f53839b2986493b68a0
Jeremy Joslin [Wed, 30 Nov 2016 23:05:40 +0000 (15:05 -0800)]
Update registerNetworkScoreCache() to accept a filter type.
Defined a new IntDef in NetworkScoreManager named CacheUpdateFilter
with 3 values. Caches must be registered with a filter value and will
only receive updates based on their registered filter. Actual
filtering implementation will follow.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
32912120
Change-Id: I3ce0bee171e6405176358479fa8a532fd5193824
Merged-In: I8940e0ed1a7bbcb5a81fb3b6a7fafe4fbbc33875
Jeff Sharkey [Fri, 9 Dec 2016 16:53:46 +0000 (16:53 +0000)]
Merge "Prepare to move dexopt calls to Binder."
am:
d7b144a5e9
Change-Id: I49cce8519d5b09a646609fffc6e62ecbe1a086ef
Jeff Sharkey [Fri, 9 Dec 2016 16:42:25 +0000 (16:42 +0000)]
Merge "Prepare to move dexopt calls to Binder."
Paul Duffin [Fri, 9 Dec 2016 15:05:06 +0000 (15:05 +0000)]
Merge "Move android.test classes from core/java to legacy-test/src"
am:
2761ed124a
Change-Id: I0009b93ff096456d7f5fd5f83e71fd4b9bff31db
Neil Fuller [Fri, 9 Dec 2016 14:59:26 +0000 (14:59 +0000)]
Track BufferIterator changes in libcore
Addition of a new method pos().
Bug:
31008728
Test: make
Change-Id: Id5fcb13104a8580ffaa7d4f8d3c473fe14ac5ccd
Paul Duffin [Fri, 9 Dec 2016 14:56:37 +0000 (14:56 +0000)]
Merge "Move android.test classes from core/java to legacy-test/src"
Hugo Benichi [Fri, 9 Dec 2016 10:58:21 +0000 (10:58 +0000)]
Merge "Removing bogus file added by mistake"
am:
a44c833042
Change-Id: I25ff74ac3e46b60da05b9ab595f87d58bb50b6c0
Przemyslaw Szczepaniak [Fri, 9 Dec 2016 10:54:03 +0000 (10:54 +0000)]
Merge "Track libcore change
547177ca5c312f84fb22e6e7bf12f54129034e5d"
am:
4ee94a6a9b
Change-Id: I93e4dc42695a35934748e4242bb36e4260cbd3ca
Treehugger Robot [Fri, 9 Dec 2016 10:50:10 +0000 (10:50 +0000)]
Merge "Removing bogus file added by mistake"
Przemyslaw Szczepaniak [Fri, 9 Dec 2016 10:46:18 +0000 (10:46 +0000)]
Lorenzo Colitti [Fri, 9 Dec 2016 09:48:51 +0000 (09:48 +0000)]
Merge changes from topic 'framework-net-aosp'
am:
ab4c79bd96
Change-Id: I286110dc7db8424187d50d07fa3f059903cdea03
Hugo Benichi [Fri, 9 Dec 2016 09:36:16 +0000 (09:36 +0000)]
DO NOT MERGE: frameworks-test: adding missing @SmallTest
am:
cfcc1cb7bf -s ours
Change-Id: Idc0806748704f86b65dfbe760e7b55c2f61436d0
Hugo Benichi [Fri, 9 Dec 2016 09:34:51 +0000 (09:34 +0000)]
DO NOT MERGE: Netd events: record connect() success/errno
am:
5d0f28c7fd -s ours
Change-Id: I833ea69c0a8cb79bcaf9280bd617d0ce7924764c
Lorenzo Colitti [Fri, 9 Dec 2016 09:34:11 +0000 (09:34 +0000)]
DO NOT MERGE: Add missing dependency.
am:
744b02069d -s ours
Change-Id: I2bcc3e7eb9d55c4063cdbf6945baa4ce5ce9ba88
Tony Mak [Fri, 9 Dec 2016 09:33:28 +0000 (09:33 +0000)]
DO NOT MERGE: Show notification for always-on app VPN
am:
de7f7d195e -s ours
Change-Id: Icb50333e9ca623f40a8a48c25d28c404748310c2
Stephen Chen [Fri, 9 Dec 2016 09:32:43 +0000 (09:32 +0000)]
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
am:
963e8ddf6d -s ours
Change-Id: Idfaf31ca77450618391cf2b010ec7fc0961b6dc2
Hugo Benichi [Fri, 9 Dec 2016 09:31:59 +0000 (09:31 +0000)]
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
am:
2a43b208cc -s ours
Change-Id: Ic6806b65b46c0e7f68a796db534b319126235129
Hugo Benichi [Fri, 9 Dec 2016 09:31:16 +0000 (09:31 +0000)]
DO NOT MERGE: NetworkMonitor metrics: add first validation information
am:
21680fd25d -s ours
Change-Id: Ida088560e94946bc0fa57f59f56007753a197068
Hugo Benichi [Fri, 9 Dec 2016 09:30:09 +0000 (09:30 +0000)]
DO NOT MERGE: APF: also drop any ICMPv6 RSs
am:
02428988ad -s ours
Change-Id: Iaf8442b9536e8c465fd4336a7706e8fd00933266
Hugo Benichi [Fri, 9 Dec 2016 09:29:11 +0000 (09:29 +0000)]
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
am:
53d83d5142 -s ours
Change-Id: I07650e028dbe5be6d04761ae0cbb9e9512d31d53
Hugo Benichi [Fri, 9 Dec 2016 09:28:32 +0000 (09:28 +0000)]
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
am:
cbf8ff83a8 -s ours
Change-Id: I6af5dd9e2bf31346578d5fca4a635ba3af2f2099
Hugo Benichi [Wed, 7 Dec 2016 05:39:05 +0000 (14:39 +0900)]
Removing bogus file added by mistake
This patch deletes a bogus file added by mistake in the change with
commit hash
147aa6d53bc1e9f8a3632553abcf936023806e1d.
Test: no code change.
Bug:
32198726
Change-Id: Iffc6b3a5ebd854dc81d537576a4405955abacba7
Jeff Sharkey [Fri, 9 Dec 2016 09:27:54 +0000 (09:27 +0000)]
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
am:
dda938a698 -s ours
Change-Id: I2b1825f00459952d6f3430c99661aafc907e6c37
Stephen Chen [Fri, 9 Dec 2016 09:27:11 +0000 (09:27 +0000)]
DO NOT MERGE: Define API for metering network stats buckets.
am:
dadf6caf9f -s ours
Change-Id: I3dcf9d32deeb09d08364b135714b84e685767dee
Felipe Leme [Fri, 9 Dec 2016 09:26:31 +0000 (09:26 +0000)]
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
am:
e4c029918f -s ours
Change-Id: Ieeea6db94be1d402fe8129f02bea2586346dcf76
Felipe Leme [Fri, 9 Dec 2016 09:25:12 +0000 (09:25 +0000)]
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
am:
2026ca147b -s ours
Change-Id: I17818101fa8f47d285cf772a0f67373c1dda5e30
Felipe Leme [Fri, 9 Dec 2016 09:24:24 +0000 (09:24 +0000)]
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
am:
77cba4bdf6 -s ours
Change-Id: I907010456f9bb9674748222fd5e82b8b64dce46f
Jeremy Joslin [Fri, 9 Dec 2016 09:23:37 +0000 (09:23 +0000)]
DO NOT MERGE: VPN network stat accounting changes.
am:
ffe5a46b3e -s ours
Change-Id: Ic42723be04158feafd268b3859f0e938d3e36d01
Hugo Benichi [Fri, 9 Dec 2016 09:22:57 +0000 (09:22 +0000)]
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
am:
ce765b7a51 -s ours
Change-Id: I0625013f14e4a2c24a238677a3de50961d114619
Hugo Benichi [Fri, 9 Dec 2016 09:22:16 +0000 (09:22 +0000)]
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
am:
1853f78d76 -s ours
Change-Id: Ia41bae1435c94e042358e8b88b42f83cd5359a6e
Hugo Benichi [Fri, 9 Dec 2016 09:21:22 +0000 (09:21 +0000)]
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
am:
4983e55853 -s ours
Change-Id: I806d5d79994785357390707d77760af3af725477
Philip P. Moltmann [Fri, 9 Dec 2016 09:20:02 +0000 (09:20 +0000)]
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
am:
29154b000f -s ours
Change-Id: I5c7c11dc4f8112f0ca89b482c2ba10a6a94abfba
Jeremy Klein [Fri, 9 Dec 2016 09:19:21 +0000 (09:19 +0000)]
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
am:
c8e4cc8e99 -s ours
Change-Id: I3290e0f17c8d29f7e7216687f85b7487a3b85ac5
Lorenzo Colitti [Fri, 9 Dec 2016 09:11:21 +0000 (09:11 +0000)]
Merge changes from topic 'framework-net-aosp'
* changes:
DO NOT MERGE: frameworks-test: adding missing @SmallTest
DO NOT MERGE: Netd events: record connect() success/errno
DO NOT MERGE: Add missing dependency.
DO NOT MERGE: Show notification for always-on app VPN
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
DO NOT MERGE: NetworkMonitor metrics: add first validation information
DO NOT MERGE: APF: also drop any ICMPv6 RSs
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
DO NOT MERGE: Define API for metering network stats buckets.
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
DO NOT MERGE: VPN network stat accounting changes.
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
Hugo Benichi [Fri, 4 Nov 2016 07:06:34 +0000 (16:06 +0900)]
DO NOT MERGE: frameworks-test: adding missing @SmallTest
This activates all frameworks-test tests in runs of the continuous
platform tests.
Test: $ runtest frameworks-net passes (expect Tether
Bug:
32561414
(cherry picked from commit
fa8a6f6220d1a0027ba7969c2d3f72690ddc6495)
Change-Id: I7b0706a7e3368f971d508388e8ad4afc5de9d646
Hugo Benichi [Mon, 31 Oct 2016 06:04:37 +0000 (15:04 +0900)]
DO NOT MERGE: Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug:
32198976
(cherry picked from commit
8b06bcdfd24100302818ae0e11ee751dd813d5cf)
Lorenzo Colitti [Fri, 9 Dec 2016 05:19:57 +0000 (14:19 +0900)]
DO NOT MERGE: Add missing dependency.
Change-Id: I5deb8e03eb368ab7003f9376f7b4459d2ef5e934
Tony Mak [Thu, 30 Jun 2016 10:19:20 +0000 (11:19 +0100)]
DO NOT MERGE: Show notification for always-on app VPN
This is the same notification as the one shown during legacy lockdown
mode, sans the 'reset' button.
The notification is only shown during times when VPN has not yet
established or has failed, for example during boot or after a crash.
Bug:
29123115
(cherry picked from commit
1a405fe300950d6ceae2166fd074b596d8110dbe)
Change-Id: I929a05c24df01e21415535a333bb14ac4b790a9d
Stephen Chen [Fri, 21 Oct 2016 19:44:26 +0000 (12:44 -0700)]
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
Dependent on ag/
1550196 where API is defined.
Bug:
31015360
Bug:
26545374
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkStatsTest.java,
other test classes.
(cherry picked from commit
25147878974f82f875062e99cdee85dd33f3f078)
Change-Id: I46da93ba4afa968facf98f7c3d844fd0c469095a
Hugo Benichi [Wed, 16 Nov 2016 09:18:08 +0000 (18:18 +0900)]
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
This patch changes sligthly the two web probes mechanism for captive
portal detection and network validation so that DNS resolution is always
done for both probes.
In general the target web servers of the two parallel HTTP and HTTPS probes
are now different. This introduces a bias in the latency measurement of
th HTTPS probe since this latency will also include DNS resolution in
general.
Test: manual verification + $ runtest frameworks-net
Bug:
32198726
(cherry picked from commit
ab61e7c324b24e46829495bc2597e42ea907c53d)
Change-Id: I3b32ae451f2241849fffe24956758a9f571b1ef1
Hugo Benichi [Tue, 15 Nov 2016 14:23:24 +0000 (23:23 +0900)]
DO NOT MERGE: NetworkMonitor metrics: add first validation information
This patch adds first validation information to:
- ValidationProbeEvent, by extending the probe_type int field of to
also include a bit indicating if the probe was part of a first
validation attempt or not.
- NetworkMonitorEvent, by defining new contants for the event_type
field.
Test: $ runtest frameworks-net
+ manually generating events and inspecting the
output of $ adb shell dumpsys connmetrics list
Bug: b/
32198726
(cherry picked from commit
147aa6d53bc1e9f8a3632553abcf936023806e1d)
Change-Id: Ie7a62c4f62a13ce52806d3adaa9e627cb246073c
Hugo Benichi [Fri, 2 Dec 2016 17:41:05 +0000 (02:41 +0900)]
DO NOT MERGE: APF: also drop any ICMPv6 RSs
Test: new unit test + $ runtest franeworks-net
Bug:
32833400
(cherry picked from commit
f98182ef5e80ede5de7f2c2a5f40fc92a46c9704)
Change-Id: Ifaf6e778c811c7d865c790a293b1fce3f43cad1c
Hugo Benichi [Tue, 15 Nov 2016 04:42:34 +0000 (13:42 +0900)]
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
This patch introduces an assertEventuallyThat helper function in
ConnectivityServiceTest which given a boolean function retries until the
function returns true or until a maximum retry time is reached.
This function is used to fix flakyness of testAvoidBadWifiSetting where
the Message posted by reevaluate() could reach the Handler's
MessageQueue after waitForIdle takes effect, resulting in the test to
fail.
Instead of fixing the flakyness by introdcing hard sleep times,
assertEventuallyThat is used to reduce the overall test time.
With this change the test has been observed to pass with 100% success
rate over 50000 invocations.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
99c8294ef0c7a720364abb5884063e0a9d1bb5fe)
Change-Id: If41a24989d5f65aeb439f68741f511b5eb53b18d
Hugo Benichi [Tue, 15 Nov 2016 02:25:52 +0000 (11:25 +0900)]
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
This patch fixes flakyness of testRequestBenchmark by adjusting time
limit for callback registration from 100ms to 180ms, and time limits for
onAvailable and onLost triggers from 30ms to 40ms.
With these timeouts the test succeeds 100% over 5000 iterations.
When using 150ms for registration timeout, running the test 5000 times
fails 2 times.
When using 30ms for onLost timeout, running the test 5000 times fails
1 times.
In addition, this patch also cleans testRequestBenchmark and uses the
more stable SystemClock.elapsedRealtime() for duration measurements.
Test: $ runtest frameworks-net
Bug:
32561414
(cherry picked from commit
38be57b438a0c1754091f045317db2049304e16f)
Change-Id: I196ab9ef7f5abe456a783eed65db09279d2ecb8c
Jeff Sharkey [Fri, 2 Dec 2016 19:17:21 +0000 (12:17 -0700)]
DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
Also add logging to measure success/failure details.
Test: builds, boots, and NTP fix obtained
Bug:
32969463
(cherry picked from commit
d3f689bf14a05de735b5cc92dcf20e7226c78690)
Change-Id: I7da416099ae903fd92beb516251ef4e51673eecf
Stephen Chen [Tue, 18 Oct 2016 23:41:47 +0000 (16:41 -0700)]
DO NOT MERGE: Define API for metering network stats buckets.
This is a continuation of b/
26545374, since now we can also set the
metered bit with NetworkScorer. The tracking of metered state changes
will be implemented in a seperate CL.
Bug:
31015360
Bug:
26545374
Test: N/A
(cherry picked from commit
9ac251d1169639c7b955d63b21e80cbc5c394090)
Change-Id: I6a2fcc8577d62daa8823dff9e0128a5cf39ede7b
Felipe Leme [Thu, 18 Aug 2016 23:20:01 +0000 (16:20 -0700)]
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
Test: m -j32 FrameworksServicesTests && adb install -r -g ${ANDROID_PRODUCT_OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && adb shell am instrument -e class "com.android.server.net.NetworkStatsServiceTest" -w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
BUG:
30943463
(cherry picked from commit
b8f946dc4b24998f14e28573e452ab13ed533347)
Change-Id: Ia9929295ab2396a7ebb133e65d157f98414e4dfa
Felipe Leme [Mon, 22 Aug 2016 15:50:43 +0000 (08:50 -0700)]
DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
BUG:
30839080
BUG:
31007021
(cherry picked from commit
fc7d7a359f800d7320d29055ef3b4b75157aaf13)
Change-Id: I35942e60493adebb22871541a34240368c691ee7
Felipe Leme [Thu, 18 Aug 2016 22:31:45 +0000 (15:31 -0700)]
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
Most tests were failing because due to a null NetworkCapabilities.
Example:
1) testNetworkStatsWifi(com.android.server.net.NetworkStatsServiceTest)
java.lang.NullPointerException: Attempt to invoke virtual method 'boolean android.net.NetworkCapabilities.hasCapability(int)' on a null object reference
at
com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:983)
BUG:
30839080
(cherry picked from commit
574f370c6da52eeffe747248d68ef044617c7bcf)
Change-Id: Ie09b2f43cf6ec745e404d5ec98bd0b072d211ea3
Jeremy Joslin [Mon, 8 Aug 2016 23:07:37 +0000 (16:07 -0700)]
DO NOT MERGE: VPN network stat accounting changes.
Properly account for VPN apps that make heavy use of the tun
interface. Prior to this change a VPN app could be incorrectly charged
for more data than it actually used if it sent more traffic through
the tun interface than the underlying interface.
This change excludes VPN app traffic on the tun interface from the
adjustment pool and doesn't redistribute traffic to the VPN app.
Instead all of the redistributed traffic is deducted from the VPN app
which effectively represents any overhead incurred by the VPN app.
BUG:
30557871
(cherry picked from commit
8b436d865c9f287e9ae491e5278cd8874f4a865b)
Change-Id: I06f01aa8fe5fdc06b2d36cfb9c68feb244c2e5de
Hugo Benichi [Thu, 13 Oct 2016 07:48:42 +0000 (16:48 +0900)]
DO NOT MERGE: ConnectivityThread: use lazy holder idiom
This patch changes the way that the ConnectivityThread is lazily
instantiated by using the "lazy initialization holder class idiom".
The first code point that tries to obtain a reference to the unique
ConnectivityThread instance will trigger the creation of the Singleton
class, which will guarantee a thread-safe initialization of the static
INSTANCE field inside Singleton according to the language specs.
This is the Item #71 of Effective Java.
The unique static instance of ConnectivityThread is not stored directly
inside ConnectivityThread class but is stored in a static nested class.
This is to avoid triggering the creation of that unique instance when
Zygote does class preloading at phone startup. Otherwise this would lead
to Zygote creating a new OS thread during preloading, which is a fatal
error.
Test: frameworks-wifi tests pass
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
c4fe5d373caa9f53686e4d58e61394dd40558957)
Change-Id: If13b363889a8e9396273a90c3d9f9421a48aecbc
Hugo Benichi [Thu, 7 Jul 2016 01:15:56 +0000 (10:15 +0900)]
DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
This patch removes the static singleton looper used by
ConnectivityManager and instead uses the common ConnectivityThread.
This allows to removes the static atomic counter used to track
the number of registered NetworkCallback in ConnectivityManager, because
the looper is not turned off anymore when no callbacks are registered.
Also an overloaded version of sendRequestForNetwork is added taking as a
new parameter a Handler. This will allow to overload various callback
and request related API calls with user provided Handlers.
Test: ConnectivityServiceTest passes
Bug:
26749700
Bug:
28537383
Bug:
32130437
(cherry picked from commit
7724cdd8b90006c852644d06cf6c8a28450c71c6)
Change-Id: If956addbf8e7b11b36a4b966de7fca00e8f362c1
Hugo Benichi [Wed, 6 Jul 2016 13:53:17 +0000 (22:53 +0900)]
DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
This patch simplifies CallbackHandler in the following way:
- CallbackHandler directly uses the static references to
sNetworkCallback and sCallbackRefCount. This allows to remove
instance fields in CallbackHandler.
- CallbackHandler does not have a reference to ConnectivityManager
anymore
- CallbackHandler.getObject() is now generic in a type-safe way.
Test: ConnectivityServiceTest passes
Bug:
28537383
Bug:
32130437
(cherry picked from commit
d42650faaa33ec6274278c65a6042228555ddd4f)
Change-Id: I1b5fe2a361b5f623a8310ae698497c83d72f3034
Philip P. Moltmann [Mon, 18 Apr 2016 23:23:06 +0000 (16:23 -0700)]
DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
Fixes:
28530428
(cherry picked from commit
7d5da4b044183826ac8388c8bdb94ac979a81797)
Change-Id: If2bfc06589adb361f11b89cd5923cb5c255cb680
Jeremy Klein [Sun, 13 Mar 2016 00:29:54 +0000 (16:29 -0800)]
DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
This avoids a NullPointerException when trying to call the callback
and gives a more readable error message.
(cherry picked from commit
5f277e1667b49976a77c9fa79b9a04d775f3b49e)
Change-Id: Ia419ff68ef10f308f9e44be47420e27099ee6070
Hugo Benichi [Fri, 9 Dec 2016 03:31:44 +0000 (03:31 +0000)]
Merge changes from topic 'framework-net-aosp'
am:
25afce88a6
Change-Id: I04262e6b654c8ce0fd44139d5568783d75ccbe7b
Hugo Benichi [Fri, 9 Dec 2016 03:31:37 +0000 (03:31 +0000)]
DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
am:
f99a33a1b4 -s ours
Change-Id: Iedfe60899226b6007963b0852f87ecebb5bc987e
Hugo Benichi [Fri, 9 Dec 2016 03:30:56 +0000 (03:30 +0000)]
DO NOT MERGE: TokenBucket for rate-limiting and throttling
am:
05ad47add8 -s ours
Change-Id: I7f5a7a47d7e430fc503612bfd0a844b5ffe1bde9
Hugo Benichi [Fri, 9 Dec 2016 03:29:58 +0000 (03:29 +0000)]
DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
am:
8c9e4b68f0 -s ours
Change-Id: Ie3265557cacf2014ace63fcd73f1334330558631
Lorenzo Colitti [Fri, 9 Dec 2016 03:28:51 +0000 (03:28 +0000)]
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility.
am:
b55bf38351 -s ours
Change-Id: Ia5ca5f84367fd92848aa03446617bb296d4c93b3
Hugo Benichi [Fri, 9 Dec 2016 03:28:06 +0000 (03:28 +0000)]
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
am:
5635c270a1 -s ours
Change-Id: Ia9b6e6887fd80211ff054584127ec9141a22fd57
Hugo Benichi [Fri, 9 Dec 2016 03:27:23 +0000 (03:27 +0000)]
DO NOT MERGE: IpConnectivity metrics: add version number
am:
9df2ae138b -s ours
Change-Id: If27714f6dc3475030da891cd25a0f8e174ea83e3
Treehugger Robot [Fri, 9 Dec 2016 03:19:13 +0000 (03:19 +0000)]
Merge changes from topic 'framework-net-aosp'
* changes:
DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
DO NOT MERGE: TokenBucket for rate-limiting and throttling
DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility.
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
DO NOT MERGE: IpConnectivity metrics: add version number
Hugo Benichi [Tue, 18 Oct 2016 01:36:33 +0000 (10:36 +0900)]
DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
This patch uses the previously introduced TokenBucket to rate limit
ApfProgramEvents, still allowing for burst of ApfProgramEvents when a
new interface is set up (due to ipv4 provisioning, multicast lock, ipv6 RAs
triggering new APF program events in short amounts of time).
Test: new test in IpConnectivityMetricsTest
Bug:
1550402
(cherry picked from commit
e1c173d2240a8eedf7685c9371087dc047a6931f)
Change-Id: Idb640dec13ba64180985544b9709a586af66eb6e
Hugo Benichi [Mon, 17 Oct 2016 23:43:30 +0000 (08:43 +0900)]
DO NOT MERGE: TokenBucket for rate-limiting and throttling
This patch adds a TokenBucket class that can accumulate and distribute
tokens over time.
Test: comes with unit tests.
Bug:
32198637
(cherry picked from commit
998493f0ee39ae0e9ffdea27f48f1b11b0807fcb)
Change-Id: I4012ae6d02f7004bceee9a2ba03914f2a2506031
Hugo Benichi [Wed, 19 Oct 2016 02:17:28 +0000 (11:17 +0900)]
DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
Test: IpConnectivityMetricsTest passes. Also manually changed the new
setting and verified the buffer size is as expected after flushing the
buffer.
Bug:
32198637
(cherry picked from commit
05686dbb6b965eb1a54591d2ed2334337886c6ee)
Change-Id: Iefbeac3a688b260fb3f92dfe0bfd9db28e26749d
Lorenzo Colitti [Fri, 21 Oct 2016 09:41:25 +0000 (18:41 +0900)]
DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility.
This makes the policy for mixed HTTP/HTTPS content match Chrome.
This allows us to display login pages where unimportant
subresources are HTTP.
Bug:
32171569
(cherry picked from commit
625166377b2d7c5f09d1e7617b3eac3a464fba53)
Change-Id: Ia82958192d978280715442e182c34f9da5c88c66
Hugo Benichi [Wed, 19 Oct 2016 04:48:40 +0000 (13:48 +0900)]
DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
Test: manually created a bug report and inspected content.
(cherry picked from commit
51d14cb60793a9a073b8a29ff7875bb518cd7d54)
Change-Id: I9649cc2f9bb7a1975e60baaae55fcdb2a48c3b93
Hugo Benichi [Thu, 13 Oct 2016 04:16:16 +0000 (13:16 +0900)]
DO NOT MERGE: IpConnectivity metrics: add version number
This patch adds a version field to ipconnectivity.proto and populates it
to 2, which is the logical version number for NYC-MR2.
Test: IpConnectivity{EventBuilder,Metrics}Test pass
Bug:
32127906
(cherry picked from commit
d680d4c856f54bea0c60dea74ba4204822391e49)
Change-Id: If8f167c0dc4c1abe0e235e2adfd131168a4ddc52
Erik Kline [Tue, 6 Dec 2016 02:53:25 +0000 (11:53 +0900)]
Stop setting net.dns{1234} system properties.
Nothing in the system consumes these properties, they were never part
of an official public API, and they can leak information about the
current network to applications without networking prvileges.
Specifically, these properites allow applications to access network state
(and detect network changes, etc.) without having the ACCESS_NETWORK_STATE
permission.
Test: runtest ConnectivityServiceTest passes
Bug:
33308258
Change-Id: I85abc52bc11aee33940fd0af2397478a9a5c3b8f
Yoshinori Hirano [Thu, 8 Dec 2016 21:05:16 +0000 (21:05 +0000)]
Merge "Don't include front most excluded task in Multi-Window mode"
am:
a8c2c229d7
Change-Id: If5c1a8de2cc951d8ec97b40c57cbbc8313137a37
Treehugger Robot [Thu, 8 Dec 2016 20:52:14 +0000 (20:52 +0000)]
Merge "Don't include front most excluded task in Multi-Window mode"
Jeff Sharkey [Wed, 7 Dec 2016 21:57:34 +0000 (14:57 -0700)]
Prepare to move dexopt calls to Binder.
Since InstallerConnection is about to be replaced by a new installd
Binder interface, this change moves OtaDexoptService to override and
manually cook up the 'dexopt' command line that it expects to collect
from PackageDexOptimizer.
Since OtaDexoptService is designed to be run in isolation, add a new
mode to Installer which ignores calls that aren't being intercepted.
Also moves to a single dexopt() method instead of having overloads.
Test: builds, boots, fake OTA works
Bug:
13758960,
30944031
Change-Id: I3a6a115289f1542d6df3e2993b9720118b7d1e8d
Paul Duffin [Wed, 30 Nov 2016 13:29:39 +0000 (13:29 +0000)]
Move android.test classes from core/java to legacy-test/src
(cherry picked from
2395179afb2ea957a9ba66404021c14160361611)
Bug:
30188076
Test: make checkbuild
Merged-In: Ifa291909fcf47da788627b496bd72f54efd78ed7
Change-Id: Ie20dceb9f89df245ed6da5fc2fb06185bd7b104b
Lorenzo Colitti [Thu, 8 Dec 2016 10:15:03 +0000 (10:15 +0000)]
Merge changes from topic 'framework-net-aosp'
am:
b92aa5bdfd
Change-Id: I9f4cb99312b61e47bfb80f35a5c2478bc1be2473
Etan Cohen [Thu, 8 Dec 2016 10:14:55 +0000 (10:14 +0000)]
DO NOT MERGE: [CS] Remove timeout event after first available
am:
bf3b1bad15 -s ours
Change-Id: I24ccd42ff2078ffac5560a132dcd2432118f6788