Commit Graph

276881 Commits

Author SHA1 Message Date
Paul Duffin
3e24af3eb7 Merge "Copy junit-runner files into test-runner." 2016-12-14 13:22:40 +00:00
Paul Duffin
eef35dd29a Copy junit-runner files into test-runner.
The android.test.runner target forms part of the Android API and
so must maintain backwards compatibility. The junit classes that
belong in there are copied here to ensure that they do not
change when external/junit is upgraded.

Bug: 30188076
Test: make checkbuild and checked android.test.runner contents
Change-Id: I947144c47ae1c3eb361a43c39bdd03dc11b9575f
2016-12-14 10:41:05 +00:00
Treehugger Robot
06178a39f8 Merge "Stop setting net.hostname" 2016-12-14 07:51:00 +00:00
Erik Kline
fc1b6a3f2a Stop setting net.hostname
Test: as follows
    - basics:
        - built
        - flashed
        - booted
    - connect to {v4-only, dualstack, v6-only} networks
        - verified expected connectivity on each
    - runtest frameworks-net
Bug: 30979015

Change-Id: I65e9878c7b8eaddaba1c0e1b8566ddfa0760047f
2016-12-14 13:11:15 +09:00
Treehugger Robot
eef38717b9 Merge "DHCPv4 anonymity profile: support skipping hostname option" 2016-12-14 03:07:48 +00:00
Marco Nelissen
70b262b0f2 Merge "Remove AmrInputStream" 2016-12-13 23:09:21 +00:00
Marco Nelissen
0c3518cc77 Remove AmrInputStream
Bug: 32114618
Change-Id: I55328e6f003377f4d3c2ba2266844047b1422f49
2016-12-13 13:31:10 -08:00
Treehugger Robot
fbeacb02c0 Merge "Make the onRequestRecommendation() method async." 2016-12-13 16:04:36 +00:00
Tobias Thierer
c35137ce36 Merge "API changes for updating Locale to OpenJDK8u60, part 2" 2016-12-13 13:36:08 +00:00
Erik Kline
511818ffb3 DHCPv4 anonymity profile: support skipping hostname option
Per https://tools.ietf.org/html/rfc7844#section-3.7

   When using the anonymity profile, DHCP clients SHOULD NOT send the
   Host Name option.

Once the net.hostname property is removed and ensured unset via CTS
this option will no longer be sent.

Test: as follows
    - build, flashed
    - connected to v4-only and dualstack networks, verified v4 works
    - android.net.dhcp.DhcpPacketTest passes
    - setprop net.hostname "" and verified no hostname option
Bug: 30979015
Change-Id: Ieab3f04ea38e176d9147bb788742a5397762c2e4
2016-12-13 18:14:44 +09:00
sghuman
a895081335 Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests." 2016-12-13 02:08:39 +00:00
Jeremy Joslin
280f82c312 Make the onRequestRecommendation() method async.
Converted the NetworkRecommendationProvider.onRequestRecommendation()
method into an async call to give implementors more flexibility.

Added unit tests for NetworkRecommendationProvider.

Test: Added NetworkRecommendationProviderTest.
BUG: 32909424
Change-Id: I8c1d2e11baa539744d77a012e85351f750523e3b
Merged-In: Iebe72f260133e9ad1946b0b75e2f69635e154ef3
2016-12-12 17:48:41 -08:00
Josh Gao
6968d90dc5 Merge "Add trace category for adb." 2016-12-13 00:28:09 +00:00
Treehugger Robot
ff93f927e4 Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4." 2016-12-13 00:18:57 +00:00
Jerry Zhang
1975240f17 Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." 2016-12-13 00:12:04 +00:00
Treehugger Robot
d0fdf7aba3 Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest." 2016-12-12 23:00:18 +00:00
Sundeep Ghuman
46169f946b Copy WifiNetworkScoreCache into frameworks/base. Add tests.
Begin process of migrating WifiNetworkScoreCache.java from System Server
(//frameworks/opt/net/wifi/service/java/com/android/server/wifi/) to a
SystemApi. This CL is a straight copy and paste of
WifiNetworkScoreCache.java. Only new code is located in
WifiNetworkScoreCacheTest.java

Bug: b/33050254
Test: Unit tests added to cover most common use cases.
Change-Id: I7510420d293339ce7811fcf71a6efceb8d809c3a
2016-12-12 14:57:10 -08:00
sghuman
9d55f43719 Merge "Fix erroneous constructor in ScoredNetwork.java" 2016-12-12 22:53:19 +00:00
Sundeep Ghuman
23f98ebe33 Fix erroneous constructor in ScoredNetwork.java
Test: Unit tests in ag/310934.
Change-Id: I0075b15f59796872ea9779c04373563607d2f883
2016-12-12 14:36:03 -08:00
Felipe Leme
5ae2cd5d76 DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4.
BUG: 30839080
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

(cherry picked from Ic192334389eed7596e1f7cb8ce98a5169262418c)

Change-Id: I90cf55ad948bbe0883473431f40201cf4206dc82
2016-12-12 14:19:25 -08:00
Felipe Leme
4ef40087be DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest.
NetworkPolicyManagerServiceTest had many tests there were @Suppressed
because they were obsolete and harder to fix using Easymocks.

This CL replaced EasyMock by Mockito and re-enabled most tests, although
some tests were removed because:
- It's underlying logic changed too much that.
- It would be hard to mock all external entities they interact with.
- They are covered by CTS tests.

Bug: 30764608
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

(cherry picked from commit I53ff86fc9b64cb058846f1aefa244771630d9e1e)

Change-Id: Ia9cdb780cb0917477b310dc38d2e39731d6a7609
2016-12-12 14:18:39 -08:00
Marie Janssen
47e1f497c0 Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" 2016-12-12 21:27:23 +00:00
Treehugger Robot
9b430e0395 Merge "Add simplified_network_settings_bool to CarrierConfigManager." 2016-12-12 21:14:57 +00:00
Josh Gao
552d86b520 Add trace category for adb.
Bug: http://b/31289465
Test: systrace
Change-Id: I765c55c264329227556ff25655e3f00c5c3e8b54
2016-12-12 12:32:57 -08:00
Jeff Sharkey
9a10ca3f4c Merge "Catch all exceptions from installd, log codes." 2016-12-12 19:30:23 +00:00
Joe LaPenna
2b22ae3b87 Add simplified_network_settings_bool to CarrierConfigManager.
BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I3da3048afcf1547c46db5c76ff68165246faa77a
2016-12-12 19:27:16 +00:00
Jerry Zhang
bb598ee16f Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.
Functionfs requires MtpServer to write descriptors before the device can be
configured. This adds a new configure call that will occur only when
functions are changed (new argument added to updateUsbStateBroadcast for this)
and be called after sys.usb.config is changed but before the waitForState
call to ensure compatibility with configfs devices.

Bug: 30976142
Change-Id: I7e94a5847d3b19c0fd75139e1b15a3f2a1cea01d
Test: Manual
2016-12-12 11:05:32 -08:00
Svetoslav Ganov
c2ac5bde6f 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
2016-12-12 09:50:24 -08:00
Neil Fuller
021e8ff2af Merge "Track BufferIterator changes in libcore" 2016-12-12 17:23:18 +00:00
Jeff Sharkey
447a3ac16b 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
2016-12-12 10:16:32 -07:00
Treehugger Robot
7552e2de9d Merge "Stop setting net.dns{1234} system properties." 2016-12-12 08:16:35 +00:00
Jeff Sharkey
8584db972c Merge "Remove DEXOPT_OTA flag." 2016-12-10 22:57:22 +00:00
Jeff Sharkey
1950377f91 Merge "Final push of installd to Binder; goodbye socket!" 2016-12-10 22:54:52 +00:00
Michael Rosenfeld
64583c332a Merge "Copy preload2.jar to build artifacts" 2016-12-10 00:48:52 +00:00
Michael Rosenfeld
d19ea14f30 Copy preload2.jar to build artifacts
Test: local build
Bug: 33492076
Change-Id: I76de648cd1947e49278a678a4c6f1dce8092bbd4
2016-12-09 16:16:54 -08:00
Jeff Sharkey
4f05cd8900 Remove DEXOPT_OTA flag.
Test: builds, boots
Bug: 13758960, 30944031
Change-Id: I266a39c6dc7948f784580e4ef1cf0bb8ee27d0e7
2016-12-09 17:09:30 -07:00
Treehugger Robot
a511a07fa3 Merge "Update registerNetworkScoreCache() to accept a filter type." 2016-12-09 23:56:35 +00:00
Jeff Sharkey
740f523b25 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
2016-12-09 15:30:34 -07:00
Jeremy Joslin
823db059e4 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
2016-12-09 13:15:15 -08:00
Jeff Sharkey
d7b144a5e9 Merge "Prepare to move dexopt calls to Binder." 2016-12-09 16:42:25 +00:00
Neil Fuller
5ba69e46ed Track BufferIterator changes in libcore
Addition of a new method pos().

Bug: 31008728
Test: make
Change-Id: Id5fcb13104a8580ffaa7d4f8d3c473fe14ac5ccd
2016-12-09 14:59:26 +00:00
Paul Duffin
2761ed124a Merge "Move android.test classes from core/java to legacy-test/src" 2016-12-09 14:56:37 +00:00
Treehugger Robot
a44c833042 Merge "Removing bogus file added by mistake" 2016-12-09 10:50:11 +00:00
Przemyslaw Szczepaniak
4ee94a6a9b Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" 2016-12-09 10:46:19 +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
Lorenzo Colitti
ab4c79bd96 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.
2016-12-09 09:11:22 +00:00
Hugo Benichi
cfcc1cb7bf 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 fa8a6f6220)

Change-Id: I7b0706a7e3368f971d508388e8ad4afc5de9d646
2016-12-09 14:35:05 +09:00
Hugo Benichi
5d0f28c7fd DO NOT MERGE: Netd events: record connect() success/errno
Test: $ runtest frameworks-net pass
Bug: 32198976

(cherry picked from commit 8b06bcdfd2)
2016-12-09 14:34:39 +09:00
Lorenzo Colitti
744b02069d DO NOT MERGE: Add missing dependency.
Change-Id: I5deb8e03eb368ab7003f9376f7b4459d2ef5e934
2016-12-09 14:23:17 +09:00
Tony Mak
de7f7d195e 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 1a405fe300)

Change-Id: I929a05c24df01e21415535a333bb14ac4b790a9d
2016-12-09 14:23:10 +09:00