Commit Graph

13879 Commits

Author SHA1 Message Date
Amin Shaikh
a3943850ab Merge "Expose ScanResult#untrusted as a @SystemApi."
am: a93e57f1ac

Change-Id: I9cac16dbceb36d6ff72e92d2ab8de20bd8d70e36
2016-12-21 19:56:19 +00:00
Amin Shaikh
3d18c621cb Expose ScanResult#untrusted as a @SystemApi.
- Expose ScanResult#untrusted to inform NetworkRecommendationProviders
  that a ScanResult does not correspond to a saved network.
- Add static construction methods and assertions to RecommendationResult

Test: runtest frameworks-services

Bug: 33490132
Change-Id: If7006040f63843c1c468c9d95c5c017383c5c5dd
Merged-In: If7006040f63843c1c468c9d95c5c017383c5c5dd
2016-12-21 11:46:22 -08:00
Amin Shaikh
a81a4163f5 Merge "Make WifiConfiguration#meteredHint a @SystemApi"
am: f456ddf3fd

Change-Id: Ie1324197329486e9eeec0bb765441a6fc5bb8a32
2016-12-20 22:35:06 +00:00
Amin Shaikh
d3dfd3b8e9 Make WifiConfiguration#meteredHint a @SystemApi
This allows NetworkRecommendationProviders to set this field on
returned WifiConfigurations.

Test: make
Bug: 33760009
Change-Id: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
Merged-In: I4d34272a1fb8d88bcc56cf4f00d8beadd06ac603
2016-12-20 12:46:50 -08:00
Joe LaPenna
8df12d98f7 Merge "Remove "final" from ResultCallback."
am: b60d7b334c

Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed
2016-12-19 21:01:26 +00:00
Joe LaPenna
68685240f5 Remove "final" from ResultCallback.
Removing final makes providers easier to test using mocks.

Test: Build system image.

Change-Id: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Merged-In: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
2016-12-19 11:25:45 -08:00
Polina Bondarenko
104a5c7a34 Merge "Make TelephonyManager APIs public:"
am: 441bfc6718

Change-Id: I968c8232c746027123beac6481161019e1dc64a5
2016-12-16 10:37:21 +00:00
Treehugger Robot
441bfc6718 Merge "Make TelephonyManager APIs public:" 2016-12-16 10:29:04 +00:00
Joachim Sauer
d20aebb443 Merge "API updated for ICU4J 58.1"
am: 9e3b160fc3

Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
2016-12-15 11:24:52 +00:00
Joachim Sauer
9e3b160fc3 Merge "API updated for ICU4J 58.1" 2016-12-15 11:16:41 +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
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
Polina Bondarenko
a6dba0ab35 Make TelephonyManager APIs public:
TelephonyManager.getSimState(slotIdx) and
TelephonyManager.SIM_STATE_CARD_RESTRICTED.

It is needed for OobConfig app unbundling.

Bug: 33479833
Test: run cts -m CtsTelephonyTestCases
Change-Id: I375f436bc4e1dcedc0656866a0838c7bf5948422
2016-12-13 21:37:01 +01: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
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
Przemyslaw Szczepaniak
104e268a14 Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"
am: 4ee94a6a9b

Change-Id: I93e4dc42695a35934748e4242bb36e4260cbd3ca
2016-12-09 10:54:03 +00:00
Przemyslaw Szczepaniak
4ee94a6a9b Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d" 2016-12-09 10:46:19 +00:00
Stephen Chen
dadf6caf9f 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 9ac251d116)

Change-Id: I6a2fcc8577d62daa8823dff9e0128a5cf39ede7b
2016-12-09 13:59:17 +09:00
Tobias Thierer
9fa05c25c9 API changes for updating Locale to OpenJDK8u60, part 2
This adds APIs for RFC 4647 Matching of Language Tags

Bug: 29935305

Test: make update-api

Change-Id: I58fc9481578a63ecd9528a62377fa9414cc836d4
2016-12-08 15:43:37 +00:00
Fredrik Roubert
c7bc38c5e5 API updated for ICU4J 58.1
Bug: 31328818
Test: make
Change-Id: Ifef308acd346704a9d6364fac70967fff08eb599
2016-12-07 20:42:07 +01:00
Przemyslaw Szczepaniak
120e0375e9 Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d
Bug: 29935305
Test: CtsLibcoreTestCases
Change-Id: I8ee39da7d7e0a4e94e3772b6e52068b53755693f
2016-12-07 17:43:43 +00:00
Jeremy Joslin
2b57c69e25 Merge "API for requesting network recommendations."
am: 800a4e753e

Change-Id: Icda431682a283051d4f5f5052dc70b8ab8e01dc9
2016-12-06 23:58:13 +00:00
Bill Yi
82834baa35 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 2016-12-06 15:17:16 -08:00
Treehugger Robot
800a4e753e Merge "API for requesting network recommendations." 2016-12-06 23:08:03 +00:00
Jeremy Joslin
d1daf6d22a API for requesting network recommendations.
Defining a new system API that will allow the system to request
network recommendations from a NetworkScoreService implementation.

Test: Coming in a future CL.
BUG: 32909424
Merged-In: I2d5c0a843b928b04e87c1862a78702a02fd54c31
Change-Id: Idd33095c6cd2f5b391796c900399f18a2c40fcc3
2016-12-06 12:48:30 -08:00
Stephen Chen
45fdf32038 Merge "Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag."
am: 70ae1bf4db

Change-Id: If3d13f94a131188ddbebc7a35c82ea357b37e022
2016-12-06 19:20:24 +00:00
Stephen Chen
6a0c879de3 Add Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED flag.
This flag enables the NetworkScoreService.requestRecommendations API,
defined in b/32909424.

Bug: 32913919
Bug: 32909424
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java

Change-Id: If592e4a2ec574929aa0c829c39ad4ce9b0317805
2016-12-05 17:01:57 -08:00
Lenka Trochtova
13a0519394 Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
2016-12-05 11:53:34 +01:00
Lenka Trochtova
f15cf38311 Introduce a new user restriction for disallowing Bluetooth.
Only the device owner will be able to set the restriction
and the restriction will prevent usage of Bluetooth on the
entire device - i.e. in all the users.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.UserRestrictionsTest
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895300

Merged-In: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5

Change-Id: I2875cf178cb16eca1965d0ba965d1cd3d8db2ad5
2016-12-05 10:46:58 +01:00
Stephen Chen
d738140b8d Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag."
am: d758ce1586

Change-Id: I1bf1effbb635d57980728555587e8056f630edb9
2016-12-03 04:16:06 +00:00
Stephen Chen
8ca96c1f3c Add Settings.Global.WIFI_WAKEUP_ENABLED flag.
Set the flag default to false. This addition is for the
Android Wi-Fi Snooze project:
https://docs.google.com/document/d/1zewDZ6Ne-qH7zKFDtcSx55f9jPauZwT5VvOs1uVNXf8/edit#

Bug: 32920000
Bug: 32913119
Test: runtest --path
frameworks/base/packages/SettingsProvider/test/src/com/android/providers/settings/SettingsProviderTest.java

Change-Id: I597d5dd643e8044315cc6d7553ae5740485a0552
2016-11-30 18:31:44 -08:00
Stephen Chen
6ef2ec0d80 Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings."
am: 6e54c31f0a

Change-Id: Ie3b4a3ed5e2858ce2b3446c300c984875201205c
2016-12-01 00:02:58 +00:00
nharold
8fabfd639e Merge "Expose GSM Timing Advance, Update LTE TA docstring"
am: 4134ccb214

Change-Id: Ic60953cebd3209b1320ed4b6723809d0421ebc27
2016-12-01 00:00:09 +00:00
Jordan Liu
cee0c941ed resolve merge conflicts of a578ae2 to stage-aosp-master
Change-Id: I344ce44711edee385c64de4e6c52c64e6901820d
2016-11-30 15:08:13 -08:00
Treehugger Robot
6e54c31f0a Merge "Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings." 2016-11-30 20:25:13 +00:00
nharold
4134ccb214 Merge "Expose GSM Timing Advance, Update LTE TA docstring" 2016-11-30 18:00:35 +00:00
Jordan Liu
a578ae2aa1 Merge "Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY" 2016-11-30 17:42:31 +00:00
Stephen Chen
767e453cdf Add ACTION_WIFI_SAVED_NETWORK_SETTINGS to Settings.
Exposes an activity that deep links into saved network Settings.

Bug: 32738882
Test: gts test
Change-Id: Ic639b7543439bbe52941fa58a74a767a4a0f8a76
2016-11-28 16:26:16 -08:00
Jeff Davidson
fa8e6c0f5a Merge "Expose TelephonyManager#{set,get}DataEnabled."
am: 99d6227782

Change-Id: Iacdd6d802725ab1b45c273ad7c8de7c85c8cb801
2016-11-23 04:01:22 +00:00
Jeff Davidson
40db40878e Expose TelephonyManager#{set,get}DataEnabled.
setDataEnabled requires MODIFY_PHONE_STATE or carrier privileges.
getDataEnabled will work with any of the above or
ACCESS_NETWORK_STATE.

Merged-In: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Test: Exercised APIs from test app, updated and executed CTS tests
Change-Id: I2d5a9df2e55f3f7be1729abefe137c00ae1d6c4e
Fixes: 32644451
2016-11-22 17:28:57 -08:00
Ta-wei Yen
9b614baeab Merge "Make voicemail notification broadcast public"
am: 6a56326109

Change-Id: Ic094db50e40a0cd46251e27f84b2a98b9040a192
2016-11-22 01:32:00 +00:00
Treehugger Robot
6a56326109 Merge "Make voicemail notification broadcast public" 2016-11-21 22:23:13 +00:00
Przemyslaw Szczepaniak
d771b36951 Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7"
am: caa816451c

Change-Id: I43c66260714bb312e270bfbae1c74047e6ef01e4
2016-11-17 15:41:57 +00:00
Przemyslaw Szczepaniak
caa816451c Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" 2016-11-17 15:28:53 +00:00
Ta-wei Yen
73cdcf5787 Make voicemail notification broadcast public
Fixes: 32884372
Bug: 32414216
Test: CTS Verifier -> Telephony -> Voicemail Broadcast Test

Change-Id: Id11d68bc154517a0965c8368a85013128e6b0b58
2016-11-14 16:48:23 -08:00
Tyler Gunn
8b58e73c48 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
am: 8223dc1ae9

Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
2016-11-14 18:08:11 +00:00
Tyler Gunn
8223dc1ae9 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." 2016-11-14 16:23:43 +00:00