Commit Graph

276984 Commits

Author SHA1 Message Date
Hall Liu
32e98d2f45 Merge "Add ability to set supported audio routes on phone accounts and connection"
am: d11261dcc9

Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323
2016-12-14 20:03:54 +00:00
Jeremy Joslin
724b26c902 Merge "Add an IPC for requesting network scores."
am: e89ed4a001

Change-Id: I23bee3f29d3b3f71da6103e23afafc2df128ab75
2016-12-14 20:02:45 +00:00
Marie Janssen
7a2518ee6e Merge "Bluetooth: log message improvements"
am: f34bdf7676

Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
2016-12-14 20:01:39 +00:00
Hall Liu
d11261dcc9 Merge "Add ability to set supported audio routes on phone accounts and connection" 2016-12-14 19:55:00 +00:00
Treehugger Robot
e89ed4a001 Merge "Add an IPC for requesting network scores." 2016-12-14 19:47:48 +00:00
Treehugger Robot
f34bdf7676 Merge "Bluetooth: log message improvements" 2016-12-14 19:47:32 +00:00
Marie Janssen
cb21ad71ed Bluetooth: log message improvements
Some log improvements:
 - Reduce logspam
 - Use names for states in logs instead of numbers
 - Be more consistent with messages

Also remove some commented out dead code.

Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
2016-12-14 09:51:30 -08:00
Jeremy Joslin
e7f273d508 Add an IPC for requesting network scores.
Migrating the NetworkScoreManager.requestScores() method to use an
IPC rather than a broadcast.

Defined the new IPC in the AIDL files for NetworkScoreService and
NetworkRecommendationProvider. Added a no-op implementation in
NetworkScoreService and a full implementation in
NetworkRecommendationProvider (plus tests).

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
BUG: 33593157
Change-Id: Iacf7b6d424ec3c57e8b89e5abc6bc3e8414097b9
Merged-In: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
2016-12-14 09:11:29 -08:00
Marco Nelissen
01cb199bed Merge "Revert "Remove AmrInputStream""
am: e2d8581529

Change-Id: I55615b328bedf67819d076ccb21b9bc1f13a07a8
2016-12-14 16:59:23 +00:00
Marco Nelissen
e2d8581529 Merge "Revert "Remove AmrInputStream"" 2016-12-14 16:44:47 +00:00
Marco Nelissen
a4efbf863b Revert "Remove AmrInputStream"
This reverts commit 0c3518cc77.

Change-Id: I250d86d2d6ce462cb5f29bc6c312d88a49ac24a4
2016-12-14 16:44:12 +00:00
Paul Duffin
884d3ca53b Merge "Copy core-junit files into legacy-test."
am: 69e363f506

Change-Id: I95f3c2005e87f86f7014f6bf693eae7212f54a73
2016-12-14 15:02:20 +00:00
Paul Duffin
98e609d556 Copy core-junit files into legacy-test.
am: cd7c34d8bf

Change-Id: I672fa4b006b04db5a4c8f86793f1c891bc55754a
2016-12-14 15:02:16 +00:00
Paul Duffin
69e363f506 Merge "Copy core-junit files into legacy-test." 2016-12-14 14:50:55 +00:00
Paul Duffin
cd7c34d8bf Copy core-junit files into legacy-test.
The legacy-test directory contains part of the Android API and
so must maintain backwards compatibility. The junit classes that
are in the API are copied here to ensure that they do not change
when external/junit is upgraded.

Bug: 30188076
Test: make checkbuild and checked legacy-test contents
Change-Id: I6c263afc16c06abfd027334be51a41422239a189
2016-12-14 14:19:08 +00:00
Paul Duffin
5d53a925a1 Merge "Copy junit-runner files into test-runner."
am: 3e24af3eb7

Change-Id: I55ec07039052bf6030a16bfa0cbeedc8690809f7
2016-12-14 13:35:44 +00:00
Paul Duffin
b46cecb6c4 Copy junit-runner files into test-runner.
am: eef35dd29a

Change-Id: I974279917ae3451abf44143161ac945f4153768f
2016-12-14 13:30:03 +00:00
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
Erik Kline
35cc49e03f Merge "Stop setting net.hostname"
am: 06178a39f8

Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62
2016-12-14 07:59:59 +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
Erik Kline
94e328c22f Merge "DHCPv4 anonymity profile: support skipping hostname option"
am: eef38717b9

Change-Id: Id0eff1bdb60f1895fa6dd6c619071994efd79939
2016-12-14 03:22:12 +00:00
Treehugger Robot
eef38717b9 Merge "DHCPv4 anonymity profile: support skipping hostname option" 2016-12-14 03:07:48 +00:00
Christine Hallstrom
2830ce9a09 Add ability to set supported audio routes on phone accounts and connection
The set audio routes are used by Telecom to restrict where the audio may
be routed to. For example, an account can specify that calls may not be
routed over bluetooth headsets, which will prevent a new call from being
routed to this source.

This is a cherry-pick of abandoned ag/1521009.

Bug: 32958838
Change-Id: Idd5e4d38b157f11454f3d991385644f2f384596e
2016-12-13 17:48:50 -08:00
Marco Nelissen
e57b37e423 Merge "Remove AmrInputStream"
am: 70b262b0f2

Change-Id: I46f8cf7847982e8ab590c9016472fea93aa4a27b
2016-12-13 23:22:14 +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
Jeremy Joslin
a6c6bc333d Merge "Make the onRequestRecommendation() method async."
am: fbeacb02c0

Change-Id: I9b98480499c2366eee06de163b561c4583e475d2
2016-12-13 16:13:44 +00:00
Treehugger Robot
fbeacb02c0 Merge "Make the onRequestRecommendation() method async." 2016-12-13 16:04:36 +00:00
Tobias Thierer
7de23e292f Merge "API changes for updating Locale to OpenJDK8u60, part 2"
am: c35137ce36

Change-Id: Ibbf80ffe75bdbbc5da343e139bd80bc70afe4794
2016-12-13 13:42:50 +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
9b2760dbe5 Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests."
am: a895081335

Change-Id: I779eabea94d67d01ac29b49a68456daf9dd19013
2016-12-13 02:23:15 +00:00
Sundeep Ghuman
e436024c65 Copy WifiNetworkScoreCache into frameworks/base. Add tests.
am: 46169f946b

Change-Id: Id3ce970efaea32d0d0a2fa5594b91628e2f3d1df
2016-12-13 02:18:21 +00: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
15dc5951e6 Merge "Add trace category for adb."
am: 6968d90dc5

Change-Id: Id542769172f3d40221a6b20ea8af1db5a70abfd1
2016-12-13 00:36:54 +00:00
Felipe Leme
c398c0fc8d Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
am: ff93f927e4  -s ours

Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344
2016-12-13 00:30:21 +00:00
Josh Gao
6968d90dc5 Merge "Add trace category for adb." 2016-12-13 00:28:09 +00:00
Jerry Zhang
830874dbe7 Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."
am: 1975240f17

Change-Id: I4b6532719b848ba4b595c8069ecbbd42e855382b
2016-12-13 00:26:33 +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
Felipe Leme
9f0030a98a Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
am: d0fdf7aba3  -s ours

Change-Id: I3720f2e2fd0c78c9d45e0b26e7157902a32fae76
2016-12-12 23:12:25 +00:00
sghuman
eaed9ef0b7 Merge "Fix erroneous constructor in ScoredNetwork.java"
am: 9d55f43719

Change-Id: I6f24c92a9638f91197a4d17bfdc3fbeeede3daf4
2016-12-12 23:07:22 +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