drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
296,745 Commits 1 Branch 0 Tags
Commit Graph

1692 Commits

Author SHA1 Message Date
Etan Cohen
0413327d74 [NAN-AWARE] Rename NAN to Aware 
~Rename only (and any reformatting needed to pass lint) - no
functional changes!

Remove android.net.wifi.nan.STATE_CHANGED from manifest:
redundant/remnant of an older configuration.

(cherry-pick of commit a61b9fb569153917a650f1d48efa20ba8846a9f3)
(cherry-pick of commit b061f21e7e59a99834e163e2baa1c82229e419a6)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Change-Id: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
 2016-11-04 15:42:08 -07:00
Sohani Rao
3bdcf16870 Update REQUEST_PEERS message with calling package 
The service enforces location permissions on the caller,
verifies the calling package is registered with the uid.

BUG: 30760540
Test: Unit tests, P2p scan to get peer list and
       establishing a Wifi Direct connection
Change-Id: Ia0eb466a370a00c0264944871ce348841a17abc3
 2016-11-04 11:39:26 -07:00
Peter Qiu
821de7335e Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" am: ef0cc62058 am: bb8f3a3bbf am: e6effcd7a6 
am: a01e6667d9

Change-Id: I555251fc739284af57179dfac48a4fb46c5a2a59
 2016-10-26 23:03:08 +00:00
Peter Qiu
a5b5993e48 wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string am: bae4becf69 am: 2fb7775d2a am: 90e40ee843 
am: e07f54e0b1

Change-Id: I381912a511089fd55f010806f75915c5989a66f7
 2016-10-26 22:59:46 +00:00
Peter Qiu
12b8b24942 wifi: hotspot2: initial implementation of PasspointConfiguration am: e557c35d95 am: 6f426e3b17 am: 47047555bc 
am: a465821df8

Change-Id: I97ec6baa738f65ea3fa55e4d80b2008da7ac308a
 2016-10-26 22:58:22 +00:00
Peter Qiu
bb8f3a3bbf Merge "wifi: hotspot2: omadm: add parsing support for PPS MO tree" 
am: ef0cc62058

Change-Id: Id5b7771a25905d8e8e074b62c6ef70363c459d08
 2016-10-26 22:30:37 +00:00
Peter Qiu
2fb7775d2a wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string 
am: bae4becf69

Change-Id: I2b8510cc8dc6fad443f0507a86f960ce1ae9a0d6
 2016-10-26 22:28:55 +00:00
Peter Qiu
6f426e3b17 wifi: hotspot2: initial implementation of PasspointConfiguration 
am: e557c35d95

Change-Id: I0ece2aef3408de46c2c92b311c78e711c09c99b9
 2016-10-26 22:27:56 +00:00
Peter Qiu
2a658a152a wifi: hotspot2: omadm: add parsing support for PPS MO tree 
This parser will convert a PPS MO (PerProviderSubscription Management Object)
tree XML string to a PasspointConfiguration parcelable object.

Bug: 32129686
Change-Id: Ia80b6d73828436ded57a3817f5eca7b79c618de4
Test: frameworks/base/wifi/tests/runtests.sh
 2016-10-26 11:52:30 -07:00
Peter Qiu
bae4becf69 wifi: hotspot2: omadm: add XML parser for parsing OMA-DM XML string 
The XML parser will parse an XML string into a tree-like structure
represented by XMLNode, which will be used by an object specific parser
(e.g. PerProviderSubscription Management Object tree parser) for further
processing.

Bug: 32129686
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I69c1931b2e8a6f3551e4eba5cffa3d2d0877872a
 2016-10-26 11:52:24 -07:00
Peter Qiu
e557c35d95 wifi: hotspot2: initial implementation of PasspointConfiguration 
Only support nodes under HomeSP and Credential subtree that are used
by Hotspot 2.0 Release 1.

These classes are used for data exchanges between the app and the system
service (WifiService).  All the business logics and validations will be
done on the service side (WifiService).

Bug: 31813706
Test: frameworks/base/wifi/tests/runtests.sh

Change-Id: I6b08f52dd7b1a7b337899ab80f11d062c8e2f532
 2016-10-26 10:23:09 -07:00
Peter Qiu
466321e1eb Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am: 05d950ee3b am: c1beaa3424 am: 9515f91d9e 
am: f97eb26db2

Change-Id: I79560200eeeff85bbf2f3468feca9805e1eb8217
 2016-10-06 18:04:25 +00:00
Peter Qiu
f97eb26db2 Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am: 05d950ee3b am: c1beaa3424 
am: 9515f91d9e

Change-Id: Ie62a95760cefb678a5c53c9c394ee80e226563eb
 2016-10-06 17:58:25 +00:00
Peter Qiu
398e3f1ed7 Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am: 0169a3b094 am: 5f03e24ef0 am: dfd9e7637e 
am: 813f48e968

Change-Id: I4a7818fa8a3d67aeb31840a8d4ad22684d16e576
 2016-10-06 17:48:57 +00:00
Peter Qiu
813f48e968 Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" am: 0169a3b094 am: 5f03e24ef0 
am: dfd9e7637e

Change-Id: I7f8439ef2659288c17df867f97a8185ad7b2db0d
 2016-10-06 17:45:25 +00:00
Treehugger Robot
05d950ee3b Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" 2016-10-06 17:35:33 +00:00
Treehugger Robot
0169a3b094 Merge "wifi: add ParcelUtil for parcelizing non-parcelable objects" 2016-10-06 17:21:44 +00:00
Etan Cohen
7e78a0e3ae Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11 am: 84b7932077 
am: 3b7703ee23

Change-Id: If1addbc02547f017548bd50a035babe03a86310f
 2016-10-06 05:04:51 +00:00
Etan Cohen
3b7703ee23 Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11 
am: 84b7932077

Change-Id: I3b7366e623b8b97b57bd73fdd618033f79225a5e
 2016-10-06 04:59:23 +00:00
Etan Cohen
f12c6e4f5e Merge "[NAN] Expose NAN characteristics as an API" 2016-10-06 04:45:29 +00:00
Etan Cohen
e64c62fd02 [NAN] Expose NAN characteristics as an API 
Expose NAN characteristics as an API.

(cherry-pick of commit 3a9de10963d869fa8f721432ce12785de384c560)

Bug: 31912101
Test: build and validate API updates
Change-Id: If02942d738aab8fa2f2f47489c6840af1bc38280
 2016-10-05 20:00:53 -07:00
Etan Cohen
9c954fe294 Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6 am: 97b3d99577 
am: 95fad688c3

Change-Id: I07444f201db7c5629413f9e96a2837c1d24a8b11
 2016-10-06 02:25:30 +00:00
Etan Cohen
95fad688c3 Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6 
am: 97b3d99577

Change-Id: Ie9eeeb5b5a898a8b147628d8aacf1e365fa6e91a
 2016-10-06 02:21:04 +00:00
Etan Cohen
19bab012d9 Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1 am: 6619d5b545 am: f633e57b26 
am: 3a6a9a441f

Change-Id: Iae08a3e996ce7813058b2b127527a6976d35180e
 2016-10-05 22:52:58 +00:00
Etan Cohen
2a4c81b7a7 [NAN] Add COARSE_LOCATION permission check to NAN discovery 
NAN discovery can expose location based on service signatures.

(cherry-pick of commit e1d8a5a6fc3661f226afff3fde59a3eb2c06d718)

Bug: 31907534
Test: unit test + integrated (sl4a) testing
Change-Id: Iec0fae507dfdae65fe08ab6e2ddb89334c15def5
 2016-10-05 15:23:21 -07:00
Etan Cohen
3a6a9a441f Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1 am: 6619d5b545 
am: f633e57b26

Change-Id: I5a26b60dcf8a6925a62faffa63df6e274c6a5eb2
 2016-10-05 05:32:59 +00:00
Etan Cohen
99997dc1ab [NAN] Use NAN capability information to validate configurations 
Validate publish and subscribe configurations and message length using
the NAN configuration retrieved from the firmware.

(cherry-pick of commit 65eaa6d82170140b351d48342550a27c971d2a37)

Bug: 31912101
Test: unit tests
Change-Id: I0328cabf1aafb3f350c5fe38e6d03b0e002c693b
 2016-10-04 18:37:19 -07:00
Peter Qiu
1e9dd72b64 wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates 
Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: Ie013c0637e66fb970746ad8f80bca03515b72443
 2016-10-04 10:18:50 -07:00
Peter Qiu
49f2684f31 wifi: add ParcelUtil for parcelizing non-parcelable objects 
This CL adds the support for X509Certificate and PrivateKey objects.

Bug: 31834143
Test: frameworks/base/wifi/tests/runtest.sh

Change-Id: I1416a2aeeb0dfdd4a562d1a3b578addf55deb4ab
 2016-10-04 10:18:44 -07:00
Etan Cohen
8332931311 [NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8bede am: c3066c1d68 am: 4cb72b6125 
am: 234039affa

Change-Id: Ifc17620907d779f4ad5a8b9c031f476c3e48f8c2
 2016-10-01 00:02:12 +00:00
Randy Pan
678b928a4a Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3 am: 3629b4eddf 
am: 8f41a28f21

Change-Id: I87889b34c0fbc5c00411ce2409bbd10a99d4fbe8
 2016-09-30 23:29:49 +00:00
Etan Cohen
234039affa [NAN] Update API javadoc to clarify NAN status change broadcast scope am: 4c22e8bede am: c3066c1d68 
am: 4cb72b6125

Change-Id: I9decc48fd6486e5ef82c359c95d3b472ee5543d0
 2016-09-30 21:13:09 +00:00
Etan Cohen
4c22e8bede [NAN] Update API javadoc to clarify NAN status change broadcast scope 
(cherry-pick of commit 1fceaf9d63cd572cad57e71f6cb66f0cb59183b5)

Bug: 31675932
Test: make -j 32 update-api (to generate doc)
Change-Id: I7263a15902c423c1c71c2c457c82e8caef5abceb
 2016-09-30 11:31:47 -07:00
Randy Pan
8f41a28f21 Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234 am: 63224d9ea3 
am: 3629b4eddf

Change-Id: I2b148d84b278c92f2a1f0b12f9ca2ff231b4602c
 2016-09-30 17:52:39 +00:00
Randy Pan
634d97add8 Remove the obsoleted ScanResult.isAutoJoinCandidate 
Bug: 31565767
Test: unit tests
Change-Id: I3e1ee0e919c800c4d5eeaf94fdc68123b6de542e
 2016-09-29 13:12:55 -07:00
Peter Qiu
f84ed077fa Merge "wifi: add test target/directory for unit testing WiFi framework APIs" am: afbe615993 am: 2b30cb4885 am: 887c9224af 
am: 588a2dc0c2

Change-Id: Ied494b958eeb2f2c0b31d37ed0b72b457efa1826
 2016-09-29 02:47:48 +00:00
Peter Qiu
588a2dc0c2 Merge "wifi: add test target/directory for unit testing WiFi framework APIs" am: afbe615993 am: 2b30cb4885 
am: 887c9224af

Change-Id: I2ae1c51a40b61b74ce0f4f7dfe369f91378fa6ea
 2016-09-28 23:16:22 +00:00
Treehugger Robot
afbe615993 Merge "wifi: add test target/directory for unit testing WiFi framework APIs" 2016-09-28 22:52:31 +00:00
Etan Cohen
2fe15078b8 Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad210 am: 62bceaabe9 am: fd033a47e9 
am: cc9a933ea0

Change-Id: Ifb75b7c5e9809b6a0ce4c93708ef588d49fc477d
 2016-09-28 20:54:56 +00:00
Etan Cohen
cc9a933ea0 Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad210 am: 62bceaabe9 
am: fd033a47e9

Change-Id: Ifab50666a6d71b3dfe18f06be5cb3137533998ee
 2016-09-28 20:46:04 +00:00
Etan Cohen
60add8ad01 [NAN] Remove builder API using String to translate to byte[] 
Per API review: String accessor was not needed (duplicate, semantics
not accurate, trivial use-case).

(cherry-pick of commit c76ccf3e7e673fb21f27ea8e7482021900b113cf)

Bug: 31470256
Test: unit tests & integration (sl4a) testing.
Change-Id: Id307702627afd8ee579b540d4c2f65359bf9a925
 2016-09-28 11:47:24 -07:00
Etan Cohen
ca58352b87 Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e am: 66741c2c0f am: a96c6e222b 
am: 5d09ab4812

Change-Id: I974612e889f581d7361dadc69f176c6912661cca
 2016-09-28 05:31:39 +00:00
Etan Cohen
5d09ab4812 Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e am: 66741c2c0f 
am: a96c6e222b

Change-Id: I2bb9a0eb5040d0dd37ec2ffda5fa06bde9ee6a50
 2016-09-28 05:25:52 +00:00
Etan Cohen
f085c1951a [NAN] Use a hidden class for peer ID opaque handle 
Results in clearer run-time exception (relatively to using Integer).

(cherry-pick of commit 57db2b3eea5333e5ee144ea29e4a4af02fae7309)

Bug: 31689166
Test: unit-tests + integrated (sl4a).
Change-Id: I79d0e8061204834b9775b02d503cb18fd03ed8c6
 2016-09-27 16:42:05 -07:00
Peter Qiu
601964b927 wifi: add test target/directory for unit testing WiFi framework APIs 
The existing tests for the WiFi frameworks API android.net.wifi are
copied from frameworks/opt/wifi/tests, and will be removed in
frameworks/opt/wifi/tests.

Bug: 31745421
Change-Id: I789e983bc7dd02b6c3fa6a982ca671347912be0f
Test: frameworks/base/wifi/runtests.sh
 2016-09-27 15:13:20 -07:00
Etan Cohen
1ae6a6bb37 Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95 am: 62be010f2a am: fb43e8509b 
am: fe985955c2

Change-Id: I984bec4b050f93486030a2e7c6320b53d990f776
 2016-09-27 20:18:23 +00:00
Etan Cohen
fe985955c2 Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95 am: 62be010f2a 
am: fb43e8509b

Change-Id: Icba27b160eaf410d79605b49f6e3e566403c41e0
 2016-09-27 20:12:33 +00:00
Etan Cohen
6c48c33735 [NAN] Rename setTerminateNotificationEnabled per API review 
(cherry-pick of commit 7df9b7a1039ea8e34e82e650cebd1025a2591580)

Bug: 31470256
Test: unit tests + integrated (sl4a) tests
Change-Id: I1554b5b7961a5c46656a40ad395431125da7aa7f
 2016-09-27 10:53:47 -07:00
Etan Cohen
8d3b963c87 Merge "[NAN] Fix javadoc links" am: 4ad6291b08 am: 2cd4514323 am: c9b156f945 
am: 996aa83d88

Change-Id: I1b9e641027701f85fe32be7572127503beb28856
 2016-09-27 02:01:00 +00:00
Etan Cohen
996aa83d88 Merge "[NAN] Fix javadoc links" am: 4ad6291b08 am: 2cd4514323 
am: c9b156f945

Change-Id: If0413d6fc68d072bb81f39ce10c15a1515e4debe
 2016-09-26 23:43:50 +00:00