217455 Commits

Author SHA1 Message Date
Nathan Harold
ec1d600153 Make DcRtInfo Power State Constants Final
Bug: 26779884
Change-Id: Ia035b67fd682adb6542d6569d7634678f68a1e30
2016-01-25 17:29:10 -08:00
xin He
77eb57976e Merge "Phone reboots after connect-disconnect-reconnect to GoPro" into mm-wireless-dev 2016-01-20 19:27:12 +00:00
xinhe
90a3841994 Phone reboots after connect-disconnect-reconnect to GoPro
Error is due to the wrong initialization on Disable
     Reason String

BUG=26664811

Change-Id: Ie4ede26eb5654ef369d2d07cb393765ad1edac61
2016-01-20 11:17:20 -08:00
Amit Mahajan
e2b73804f3 Merge "Revert "Added constructor with looper param for OnSubscriptionsChangedListener"" into mm-wireless-dev 2016-01-20 19:15:45 +00:00
Amit Mahajan
ca1bdcfd70 Revert "Added constructor with looper param for OnSubscriptionsChangedListener"
This reverts commit 831e401c055391745691a58d0c87c48b49139f50.

Not needed now since tests create HandlerThread

BUG=25691379
Change-Id: Ic0ac3e3ef3c717fd31acb5fc8d6d81cc9995a2f7
2016-01-19 22:46:34 +00:00
Vinit Deshpande
19ec617fd5 Allow turning off Wi-Fi when emergency call is made
Bug: 24147407
Change-Id: Ia07b8bc4ccbdaeea18ed22fbfcf813f71ddfa7dc
2016-01-14 17:24:39 -08:00
Etan Cohen
e540b64aaf Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev 2016-01-15 01:17:08 +00:00
Amit Mahajan
49442a1dd7 Merge "Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mm-wireless-dev 2016-01-14 23:54:14 +00:00
Amit Mahajan
0c0814839f Adding new intent for EMERGENCY_CALL_STATE_CHANGE
Bug: 24147407
Change-Id: Ida957b9cc6b9c3e13bc8660213ce5cf979c886d5
2016-01-14 11:42:31 -08:00
Etan Cohen
20d329b08d NAN: baseline NAN manager for discovery.
Initial framework for user API (all @hide for now). Supports:
- NAN configuration
- Publish/Subscribe = Discovery
- Message passing
- Notifications

Bug: 26216681
Change-Id: I72e467756a02f7b80c52fae916b9a47c8174af42
2016-01-14 11:34:07 -08:00
Bartosz Fabianowski
6fb0756d2f Add WifiConfiguration.shared flag
* Add boolean WifiConfiguration.shared, which indicates whether a network
  is shared (visible to and usable by all users) or private (visible to
  and usable only by the user who created it)
* Extend WifiConfiguration.configKey(...) so that when two users create
  private configurations for the same network, their configurationKeys
  will be different.
* Make AccessPoint.matches(...) take into account the shared flag

BUG=25600871

Change-Id: I4a4335fa3b4b4f850e16748583a29ab66992ddc8
2016-01-14 17:18:45 +01:00
Pavel Zhamaitsiak
4a4345b681 Merge "Add ITelephonyDebug.aidl" into mm-wireless-dev 2016-01-13 21:40:38 +00:00
xin He
5961142109 Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev 2016-01-13 20:03:50 +00:00
xinhe
8d106780b6 Initial codes for Quality network selection [DO NOT MERGE]
In this change list, the old WifiAutojoin module is
    refactored initially. The old WifiAutojoinController is
    replaced with a new WifiQualifiedNetworkSelector.
    WifiConfiguration, WifiConfigureStore and
    WifiStateMachine have been modified accordingly. The new
    network selection logic is refactored with a more clear
    and deterministci one. To refer to thedescribed in
    details, in "Quality Network Selection and Connectivity
    Scan Management in N". The link of the document is:
    https://docs.google.com/document/d
    /1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c

Bug:26012244

Change-Id: I3df124c110e458e3b6bc29466b9046748d79582a
2016-01-12 16:29:43 -08:00
Amit Mahajan
831e401c05 Added constructor with looper param for OnSubscriptionsChangedListener
This is needed for tests as subclasses may need to specify which
looper to use.

Bug: 25691379
Change-Id: Ia6eb2d34c439b420ef81622e3c8ff50a0290da22
2016-01-12 16:14:22 -08:00
Tyler Gunn
ae85bc3c65 [DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
- Added acceptRingingCall API which accepts a videostate to complement the
existing API.

Bug: 20159300
Change-Id: I2a9d53fd4dbbb0be49d95416f7e26d3ec61774cd
2016-01-05 16:33:07 -08:00
Pavel Zhamaitsiak
f91818ca34 Add ITelephonyDebug.aidl
Change-Id: I0f111a56b471bd8c8092d30e7157bc06b5da3769
2016-01-04 15:54:31 -08:00
Jack Yu
fa530b4a10 Fixed the incorrect cdma RAT detection logic.
Used the correct CDMA bitmask to determine if the bearer services
are based on 3GPP2 radio technologies.

bug: 26318528
Change-Id: Ic30c25aa7b67372898a041dd1f3a08a3abede394
2016-01-04 11:58:48 -08:00
Jack Yu
d2cf0ce9c1 Reduced the radio log
Reduced the radio log by moving some to VDBG or merging few lines
into one.

bug: 25956251
Change-Id: I290d894e95c9fdd664db35fd0cee3536c37dbd20
2015-12-30 12:06:01 -08:00
Randy Pan
8c79fe5dc4 Correct WiFi exponential back off scan
Correct the comments for exponential back off scan. Only binary
exponential back off scan is supported.

Updated the API doc. A couple of un-related fields which were
not updated get updated as well.

Bug: 26236392
Change-Id: I5668092f393b564aa40904ed609a51aa16890614
2015-12-29 11:28:43 -08:00
Robert Greenwalt
a2590b5e7f Check permissions on getDeviceId. DO NOT MERGE
This needs the package name passed in, so the aidl changes.

bug:25778215
Change-Id: I69ee88f1d2db614bad51e6de908d3f16881a0231
2015-12-22 15:29:42 -08:00
Tyler Gunn
9e4d4143cf DO NOT MERGE Add PhoneAccount capability to indicate if VT uses presence.
Added new PhoneAccount capability used to indicate whether the dialer
should use the presence bit in the contacts provider to determine when
the video call icon is shown or not.

Bug: 20257833
Change-Id: Ifb3cc5b7ff1090d539dfb925dce9f6327de15c46
2015-12-16 13:36:14 -08:00
Prerepa Viswanadham
46f5f53d28 WLAN wake reason accounting from driver.
Change-Id: I58e0594682bf0f1d5746e9a2d8ec3091a5bf550f
2015-12-16 17:54:39 +00:00
Baligh Uddin
9be302b47c empty commit to trigger build
Change-Id: I3ec926126a0d9ee7d64ffc70ca7aa7c6c9e2a9c6
2015-12-13 18:01:17 +00:00
Tyler Gunn
c6b2890e91 Merge commit 'da131290ae5e476691e05e5eb4ac6d507012a0ac' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:05:46 -08:00
Tyler Gunn
56f3d9098c Merge commit '9aadad47a0085c4298307781a423064207933f0b' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:04:25 -08:00
Tyler Gunn
c270029ca6 Merge commit '70da83381f77e0ee9ada47eafaae395038ff77ad' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:04:17 -08:00
Tyler Gunn
1c61043876 Merge commit 'bc4da97ce0fcd0ddef228048bc663e383776c323' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:03:24 -08:00
Tyler Gunn
abc571c640 Merge commit '5e42c1cf1c7786a550df351622865ba1710a0ea6' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:03:15 -08:00
Tyler Gunn
22a584906b Merge commit 'd40a83543a67a911b5dcfbb8d164cea0c5285a78' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:03:00 -08:00
Tyler Gunn
eac6923931 Merge commit '3132d0c9f894707043c07622fae7b33c85ea0013' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:02:51 -08:00
Tyler Gunn
cb663902c4 Merge commit '73831680cd7e47df103cf60a2230ed411e5d3b93' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:02:38 -08:00
Tyler Gunn
12112724b8 Merge commit 'c956f0dcb3d93dd0f3ee0a3daafaf2da8212402e' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 20:02:29 -08:00
Tyler Gunn
fb21fb73e9 Merge commit '024557b2afdbe2e946d2cc557cb71492d87b0f62' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Change-Id: I44853f0e2f56d33c8126de0799bd5129799592bd
2015-12-10 20:02:16 -08:00
Tyler Gunn
6c6f9e7a9a Merge commit '98bd72181e176cdc5536b9709127a71cca082bbf' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 19:59:27 -08:00
Tyler Gunn
54583d537d Merge commit '109e9c449d5a0070df793c63383e474a03242ba5' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 19:57:22 -08:00
Tyler Gunn
b17478667f Merge commit 'f231ca1c67f3925d018265f99f5b8a691d190d68' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 19:56:01 -08:00
Tyler Gunn
cc5d6dcccb Merge commit '6cb5fcaad143227002bd4d00b1974e126d9a8090' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 19:55:50 -08:00
Tyler Gunn
028235ab65 Merge commit 'b19c0041914019e6d9d96fce67ec0e7a6820bf3c' into mncvtdev-to-mmwirelessdev-merge-2015-12-10 2015-12-10 19:55:41 -08:00
Jack Yu
a11d3ac4c2 Merge "merge from master" into mm-wireless-dev 2015-12-11 01:07:24 +00:00
Lorenzo Colitti
6b212287d0 DO NOT MERGE Don't crash when canceling alarms if a direct listener is present
If a direct listener alarm attempts to match a regular
PendingIntent alarm, it will attempt to fetch the binder of the
regular alarm's direct listener, which is null, and crash the
system with an NPE.

Cherry-picked from 9b43ce0c98ce9f865d6db547529d098c8982cc
Bug: 25823676
Change-Id: I85fb98b43436930a2513274dc5ab408f7d41d97f
2015-12-10 16:06:50 -08:00
Christopher Tate
4aa47e58c4 DO NOT MERGE Introduce direct listener API for alarm delivery
The Alarm Manager now supports a set() variant that takes a listener
callback to invoke at alarm trigger time rather than a PendingIntent.
This is much lower overhead and has guaranteed low delivery latency
from the trigger time.  The tradeoff is that the app must be running
*continuously* from the time the alarm is set to the time it is
delivered.  If the app exits for any reason before the alarm fires,
the listener becomes invalid and the alarm will be dropped.  This is
more or less equivalent to setting an alarm with a broadcast
PendingIntent that matches only a runtime-registered receiver.

The app's alarm listener can be any object that implements the new
AlarmManager.OnAlarmListener interface and implements its onAlarm()
method.  There is no data delivered at alarm trigger time: whatever
state needs to be associated with the specific alarm instance should
simply be packaged inside the OnAlarmListener instance.

An alarm using OnAlarmListener can request that the onAlarm() method
be called on an arbitrary handler.  If the program passes 'null' for
this parameter when setting the alarm, the callback occurs on the
application's main Looper thread.

Cherry-picked from 14a7bb0d370fffdf902a4e2345f46754ed2d7684
Bug 20157436

Change-Id: I2eb030a24efdd466a2eee1666c5231201b43684b
2015-12-10 16:06:50 -08:00
Dianne Hackborn
13a6158d6e DO NOT MERGE Add some debugging for device idle alarms.
Cherry-picked from ae78bf8552d0a3ff83b8300630d47188434173ea
Change-Id: I6792f0ffc5cc40af5ec35cb03ab78b52c17678fd
2015-12-10 16:06:50 -08:00
Erik Kline
7cb501310e DO NOT MERGE Refactor netlink and IpReachabilityMonitor into services/net
- netlink from core to services/net/netlink
    - IpReachabilityMonitor from core to services/net/ip

Cherry-picked from 02cc5a030a6f132e776b754dd5684ae632009f76
Change-Id: I45ac3f591bade45dd5ec441111b02b621234c0e4
2015-12-10 16:06:50 -08:00
Chad Brubaker
167fb24d12 DO NOT MERGE Allow uid to be passed for more operations
This expands get, getmtime, exportKey, getKeyCharacteristcs and begin to
accept a uid to run as. This is only for system to use keys owned by
Wifi and VPN, and not something that can be used to do operations as
another arbitrary application.

Cherry-picked from 5bbf04803f050296a6deab10a3c7104743c4e38c
Bug: 23978113
Change-Id: I06aa089859edc934a5415e3b184b917d6d171ae2
2015-12-10 16:06:50 -08:00
Alex Klyubin
c99c2461b8 DO NOT MERGE Support cross-UID access from AndroidKeyStore.
This is meant for exposing the pre-existing cross-UID access to keys
backed by the keystore service via higher-level JCA API. For example,
this lets system_server use Wi-Fi or VPN UID keys via JCA API.

To obtain a JCA AndroidKeyStore KeyStore for another UID, use the
hidden system API AndroidKeyStoreProvider.getKeyStoreForUid(uid).

To generate a key owned by another UID, invoke setUid(uid) on
KeyGenParameterSpec.Builder.

This CL does not change the security policy, such as which UID can
access/modify which UIDs' keys. The policy is that only certain system
UIDs are permitted to access keys of certain other system UIDs.

Cherry-picked from 3876b1be27e3aefde9a72eb2e4f856e94fc5f946
Bug: 23978113
Change-Id: Ie381530f41dc41c50d52f675fb9e68bc87c006de
2015-12-10 16:06:50 -08:00
Mitchell Wills
075698c35f DO NOT MERGE Expose gscan exponential backoff API
Will be ignored until scan scheduling supports it

Cherry-picked from 2564d9a4efb2f3a44dac5ae1e5e437e5355d19cf
Change-Id: I9d392080e6ec8dfa9a998f6c04ec37f9c6dad0b2
2015-12-10 16:06:50 -08:00
Mitchell Wills
21c748d091 DO NOT MERGE Moved Wifi InformationElement parsing to a common utility class
Cherry-picked from 97c46ef28632f275665384d64cf42b698ca70255
Change-Id: Iaa0cfc39ac4df375f80f01cf59eb5f0d0ae61879
2015-12-10 16:06:50 -08:00
Mitchell Wills
a23840e7a4 DO NOT MERGE Remove old APIs that are no longer used/implemented
All of these APIs were hidden and are no longer used by anyone. The scan
APIs are being replaced by the new WifiScanner API

Cherry-picked from 88d93cd68a32e7110f9328ff522226126c7e493e
Change-Id: I36ffef137d0620263278e5ef46bbc498a39c588f
2015-12-10 16:06:50 -08:00
Mitchell Wills
5220b4a6ae DO NOT MERGE Fix TimeUtils.formatDuration for exactly one of a unit
Previously printing a duration where a unit (except ms) was one and the
next smallest unit was zero would result in the duration being being
expressed in the next smallest unit. For example 1m0s0ms would be
formatted as 60s0ms.

Update testFormatHugeDuration to supporting times > 999 days
The implementation was fixed in 3d1933c45fe9ba2389ebd166d96abeceab1971d1

Cherry-picked from f9a80cbbfe5585772ea16fddfeb728c74bc04b2d
Change-Id: I9d609f7a0f82755ea653a205293a6e3785a10d1e
2015-12-10 16:06:50 -08:00