217585 Commits

Author SHA1 Message Date
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
Etan Cohen
ddb9ef0357 Allow NetworkFactories to match any network specifier on a request
Current usage of NetworkSpecifier: network factory will match a request
if the request has either a (1) empty network specifier, or (2) a
network specifier which is identical to that of the network factory.
Note: 'matching' w.r.t. network specifier - all other matching rules
are still in effect.

Change: add rule (3) or the network specifier of the network factory
is the special string (which is defined as "*" and which user-facing
network requests aren't allowed to use).

Rationale: allows on-demand network creation.

Example:
- Can specify a Wi-Fi NetworkRequest with NetworkSpecifier="ssid"
- It will match a Wi-Fi network factory specifying NetworkSpecifier="*"
- That network factory will bring up a Wi-Fi network, connecting to the
  specified SSID.
- Once the network is created it will create a NetworkAgent which will
  now have a NetworkSpecifier matching that of the request (not the
  match-all special string!)

That final step of making sure that the NetworkAgent matches the request
and not the match-all is critical to delivering any subsequent callbacks
correctly. I.e. your network will only get callbacks which match it.

Bug: 26192833
Change-Id: I49e3b492e0bb48a3f6e9a34e3f94f0e1cf89741f
2015-12-15 08:06:54 -08: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
Mitchell Wills
deced11e1a DO NOT MERGE Don't cache ScanResults in WifiTracker if there is no SSID
Cherry-picked from 9df79043907870fd4c1bd30b460b138169b92bbf
Bug: 23528076
Change-Id: I118cfafb526fe760bf1d545e09a1559e3867ce06
2015-12-10 16:06:50 -08:00
Mitchell Wills
5374e36bb5 DO NOT MERGE Add missing ap threshold config for hotlists
Cherry-picked from ff4fdceafe4646998629587248fff22400f44765
Change-Id: I9e31e72560840ea57ab191e820acf8e3faf00c36
2015-12-10 16:06:50 -08:00
Mitchell Wills
d1ed98f833 DO NOT MERGE Check if link stats are supported when reporting activity info
Cherry-picked from 9a568e6f2f69cc923bbfc1ffb07c2f194acdb981
Bug: 23286362
Change-Id: I42c91d488acd39341a6874797788d3e5357f0270
2015-12-10 16:06:50 -08:00
Mitchell Wills
b4bcdfc14b DO NOT MERGE Remove driver stop delay config as it is no longer used
Cherry-picked from a4c1f6f0618d709ab05d7545fce663a6b2803bc4
Bug: 22808676
Change-Id: I5c29a6d024cc34514876e56a349b496a2f734c8f
2015-12-10 16:06:50 -08:00
Jan Nordqvist
255d41dce1 DO NOT MERGE Hotspot 2.0 relase 2 first cut.
CP mods to take a URL as a parameter, and new ScanInfo object.

Cherry-picked from 52eb29f0822f129f2b14bacec23dd492f2260ac0
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
2015-12-10 16:06:50 -08:00
Vinit Deshpande
d0266d3b63 DO NOT MERGE Re-enable wifi firmware debugging
This will be enabled till we are ready to ship
devices again.

Change-Id: I0440ebd9482412d538b1cdb7c768c8e238bea269

Cherry-picked from 794395465b6a785d313ea1018ed37bf3bb8c3978
2015-12-10 22:10:32 +00:00
Jack Yu
6714030083 merge from master
Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
2015-12-10 12:27:58 -08:00
Jim Kaye
8366fdd6a8 Merge "Extend the \'qwerty\' key layout" am: 9a83f115ad
am: e579edc76b

* commit 'e579edc76b6f3f8c977d96db6af01d73e6c93804':
  Extend the 'qwerty' key layout
2015-11-24 19:42:15 +00:00
Jim Kaye
e579edc76b Merge "Extend the \'qwerty\' key layout"
am: 9a83f115ad

* commit '9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
  Extend the 'qwerty' key layout
2015-11-24 19:33:57 +00:00
Jim Kaye
9a83f115ad Merge "Extend the 'qwerty' key layout" 2015-11-24 19:27:46 +00:00
Sergio Giro
5da9170bd6 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" am: d5a5d547d0
am: d9942006e4

* commit 'd9942006e4a45884fffda8e5888d9657f40b48d2':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
2015-11-24 15:51:14 +00:00
Sergio Giro
d9942006e4 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
am: d5a5d547d0

* commit 'd5a5d547d05eee9d626db1d7977c11acbf83b0c7':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
2015-11-24 15:43:06 +00:00
Sergio Giro
d5a5d547d0 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" 2015-11-24 11:14:24 +00:00
Jim Kaye
b45d99d7d9 Extend the 'qwerty' key layout
Add the App Switch (Recents) key.
Add media control keys.

These are needed to support Emulator UI
buttons for these functions.

Change-Id: I3e9479bb49e21400f7bfd1435c50886038bbe0ff
2015-11-23 12:22:59 -08:00
Sergio Giro
46972b2d82 ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Needed by AbstractVerifier in framework/base

DistinguishedNameParser taken from libcore, commit
b5259fcf87994ee18658f07887156aef3cab3b56

Change-Id: I924dc7cd21262e5e91857edf178e46c9916f3f6b
2015-11-23 15:46:15 +00:00
Chris Tate
984f548dca Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde
am: b5a38f6da5

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions
2015-11-20 18:10:22 +00:00
Chris Tate
b5a38f6da5 Merge "Don\'t back up / restore EAP network definitions"
am: 14a0981fde

* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
  Don't back up / restore EAP network definitions
2015-11-20 18:05:04 +00:00
Chris Tate
14a0981fde Merge "Don't back up / restore EAP network definitions" 2015-11-20 18:01:10 +00:00
Geoff Mendal
829cf33ec4 Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours
am: 1bd58bfd5b  -s ours

* commit '1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
  Import translations. DO NOT MERGE
2015-11-20 01:30:38 +00:00
Geoff Mendal
1bd58bfd5b Import translations. DO NOT MERGE am: bddde9b83d -s ours
am: d0709c3a32  -s ours

* commit 'd0709c3a329ce555d9d968bc1808fec5bcc1fb10':
  Import translations. DO NOT MERGE
2015-11-20 01:25:11 +00:00