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
dfc1202879 Merge "[NAN] Fix incorrect log message" am: fe0f393116 am: e452d1e317 am: df82082e51 
am: 626446e464

Change-Id: I926cc3f841d426f3918fb963c22e5c7ec7cebb58
 2016-09-26 21:13:56 +00:00
Etan Cohen
626446e464 Merge "[NAN] Fix incorrect log message" am: fe0f393116 am: e452d1e317 
am: df82082e51

Change-Id: I05e21dca880f481c4795ff7609a1e0185a23fb9f
 2016-09-26 21:07:34 +00:00
Etan Cohen
7c724e6708 [NAN] Fix javadoc links 
(cherry-pick of commit ee3d9fc5e60ce4b57dbba7483ac323ed29df2e4a)

Bug: 31470256
Test: builds (javadoc only)
Change-Id: I645525660b9a6759f968d9e62cd79d6a851815bf
 2016-09-26 13:54:50 -07:00
Etan Cohen
3ef824fb58 Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8 am: bc74135d6a am: b319bc2bf7 
am: 37db2fbfbd

Change-Id: I4762a3d4af935081c5d456ca30daf561fcd312f5
 2016-09-26 19:40:46 +00:00
Etan Cohen
37db2fbfbd Merge "[NAN] Replace int peerId with more opaqure Object peerHandle per API review" am: 88da460cd8 am: bc74135d6a 
am: b319bc2bf7

Change-Id: Ib0d578323b719b90d3330993d61079dc3885bf52
 2016-09-26 19:06:11 +00:00
Etan Cohen
41d6f375be [NAN] Fix incorrect log message 
(cherry-pick of commit 0d7863406b1542c3092fa976cfb41b09a97dd8bd)

Bug: 31678708
Test: integrated (sl4a) test
Change-Id: I822c66619642f08d1d8f68cc8257185360da60be
 2016-09-26 11:53:28 -07:00
Etan Cohen
27c18cbb5b [NAN] Replace int peerId with more opaqure Object peerHandle per API review 
(cherry-pick of commit f02ae5e23cb59fcbd364907ecb1199424fc5eb62)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I0225027b8e1a2d7cb5d27afc91b97ef9643f5dff
 2016-09-26 10:14:35 -07:00
Etan Cohen
8b82662df2 Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 am: f95a3703c1 am: c83ae8d290 
am: b041ae49d6

Change-Id: Ibd5e08c00a6ef753b4a5cac744c1a0119f88bc80
 2016-09-26 17:04:25 +00:00
Etan Cohen
b041ae49d6 Merge "[NAN] Change Broadcast for NAN status change to notification only" am: e1513a8cc6 am: f95a3703c1 
am: c83ae8d290

Change-Id: I1b8db56db307ce8d81a8df5833030d823724f42e
 2016-09-26 16:58:27 +00:00
Etan Cohen
38764e088e Merge "[NAN] Remove failure reason codes from API per API review" am: a7b2fff388 am: 3f1c33c7b8 am: 11b8fe0340 
am: fe06766539

Change-Id: Ic569e4d201aea1344c84de99344dce8345fc72a1
 2016-09-26 15:14:57 +00:00
Etan Cohen
fe06766539 Merge "[NAN] Remove failure reason codes from API per API review" am: a7b2fff388 am: 3f1c33c7b8 
am: 11b8fe0340

Change-Id: I505cc2614754afa9039126bd502a9e58f45184b3
 2016-09-26 15:09:48 +00:00
Etan Cohen
93617997bb [NAN] Change Broadcast for NAN status change to notification only 
Remove information about current status of NAN. Receiver will have
to query that information explicitly. New pattern (per API council
review) - helps reduce window for having old information.

(cherry-pick of commit 905077a590d5b63a262d6f1f4f6e555ad9b79359)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: If3d0873989389e6c69feb0d02e5d0c79cdf9679e
 2016-09-26 07:53:57 -07:00
Etan Cohen
471227d547 Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a am: a6c2aa4131 am: 10132fb994 
am: 60aad2a2ba

Change-Id: I0b58a49cb980fb799b1e69ccc8e672ed8745fb2c
 2016-09-26 13:20:17 +00:00
Etan Cohen
60aad2a2ba Merge "[NAN] Reorder parameters of send message method(s) per API review" am: 1dd012a41a am: a6c2aa4131 
am: 10132fb994

Change-Id: I0be79dd5b8d21a94fd6a40fd08d054ed30003a8b
 2016-09-26 13:15:38 +00:00
Etan Cohen
5542ccc59c [NAN] Remove failure reason codes from API per API review 
Not all codes are actionable. Will add back if/as needed.

(cherry-pick of commit 4b47c3f5b869a5fb072b122c47bf2c9e87f582e9)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: Ibfc9df4dbd3b569caf4ade1da9d2ef43d99269a8
 2016-09-26 06:05:06 -07:00
Etan Cohen
1dd012a41a Merge "[NAN] Reorder parameters of send message method(s) per API review" 2016-09-26 12:58:14 +00:00
Etan Cohen
cd607bf5e1 Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef9355 am: c8f03c33df am: 3c94a1c56c 
am: 7fa6ab7f9a

Change-Id: I0d4e3abc35213a0c8eae5a764e73d59e1b336596
 2016-09-26 09:36:05 +00:00
Etan Cohen
7fa6ab7f9a Merge "[NAN] Add Handler to publish/subscribe per API review" am: 95abef9355 am: c8f03c33df 
am: 3c94a1c56c

Change-Id: I3e8726f736066943164bb937f1f3aba6b415e1aa
 2016-09-26 00:30:53 +00:00
Etan Cohen
8a66410296 [NAN] Reorder parameters of send message method(s) per API review 
Move messageId before message in the argument list.

(cherry-pick of commit 3da7c88425d826e1a5e662f3d8671900e2ad15e5)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I6bfd673a0f92d9908c5b837b713120927b1a0123
 2016-09-25 17:19:05 -07:00
Etan Cohen
4448e661a8 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97 am: a29bcecad9 am: 0517a6dcc7 
am: 4c83ebbc4d

Change-Id: I28b2e7b87908f7f3175ed4f786bf56d25983b11c
 2016-09-25 20:16:26 +00:00
Christopher Wiley
17ab5d3239 Remove WifiManager#get/setFrequencyBand am: 79ec1736be am: a7394a4a70 am: af51ffe814 
am: 531348c37a

Change-Id: Ic70371212f16fe015ab7c328ddb4f92501c11436
 2016-09-24 01:51:46 +00:00
Etan Cohen
ede1d0f211 [NAN] Add Handler to publish/subscribe per API review 
All callback registrations must have handlers.

(cherry-pick of commit 9b04fd2475f5ebecb81e75a8272cf410ba3f5854)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I5ecc04f997e45b76710f526f378e4cf6e0e28fb9
 2016-09-23 10:16:26 -07:00
Etan Cohen
4c83ebbc4d Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am: bc3d106b97 am: a29bcecad9 
am: 0517a6dcc7

Change-Id: I2c19aade571d63aabcea5962a1e4956c164c99f6
 2016-09-23 04:22:17 +00:00
Etan Cohen
bc3d106b97 Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." 2016-09-23 03:59:40 +00:00
Christopher Wiley
531348c37a Remove WifiManager#get/setFrequencyBand am: 79ec1736be am: a7394a4a70 
am: af51ffe814

Change-Id: Id522f1b468f7f83484db4b3a039648cf3ca19d9c
 2016-09-23 00:04:50 +00:00
Christopher Wiley
a7394a4a70 Remove WifiManager#get/setFrequencyBand 
am: 79ec1736be

Change-Id: I9b5b298fc3e47e77a59701e7f9d4dc18680f12b8
 2016-09-22 23:50:58 +00:00
Christopher Wiley
430904a4ab Merge changes from topic 'remove-set-frequency-band' 
* changes:
  Remove ability to set frequency from WifiAssociationTest
  Remove WifiManager#get/setFrequencyBand
 2016-09-22 23:34:17 +00:00
Etan Cohen
2d8f65d441 Merge "[NAN] Method renames based on API council feedback" am: dcac00f325 am: 3501748dea am: 6b6c719dd2 
am: d48845629b

Change-Id: I45506aeab052bb2585ac5050388606be7bbec1d0
 2016-09-22 23:09:22 +00:00
Etan Cohen
d48845629b Merge "[NAN] Method renames based on API council feedback" am: dcac00f325 am: 3501748dea 
am: 6b6c719dd2

Change-Id: I5ea3e18bbaec7875b3720febfd4bbdcb97c92883
 2016-09-22 20:04:04 +00:00
Etan Cohen
78ef40a668 [NAN] Separate ATTACH from IDENTITY_CHANGE callbacks. 
Provide separate mechanism to attach with a request for identity
change listener.

(cherry-pick of commit 78e33f277eff5183f4525ce2a699acf2ad848177)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I26b3bf4e904f3c3822578185fa55e2de5e63b71b
 2016-09-21 18:11:33 -07:00
Etan Cohen
7ea61d28a6 Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am: 84b3d2040a am: 337baf9d42 am: ebe497e40b 
am: 307572149f

Change-Id: I2595b3dfca3bf67c3fd57a1fe04ca5614ad3bbb2
 2016-09-21 21:59:07 +00:00
Etan Cohen
b68ed2876c [NAN] Method renames based on API council feedback 
- Fix tenses throughout
- connect -> attach
- disconnect/terminate -> destroy
- IsUsable -> IsAvailable

Note: pure rename operation - no functional changes

(cherry-pick of commit 34a0342ab515762f3fc594ffbc4784e56e79ccbf)

Bug: 31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2
 2016-09-21 13:46:21 -07:00
Etan Cohen
307572149f Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am: 84b3d2040a am: 337baf9d42 
am: ebe497e40b

Change-Id: I336641dfcfba46ad80936acbc73db869e0a0922a
 2016-09-21 20:35:02 +00:00
Etan Cohen
bd4bf35d22 [NAN] Refactor WifiNanManager to create separate sessions per connect. 
Separate session enables separate namespace for functions which depend
on a connection to exist.

(cherry-pick of commit a2eb21d1233e921487e3dada1d10ba3e14611168)

Bug: 31470256
Test: unit tests, integration (sl4a) tests.
Change-Id: I8be0bc609e55319446cef149ba49cd6f7a5f446a
 2016-09-21 10:54:42 -07:00
Etan Cohen
e6338578bd Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46 am: ad864c8fd9 
am: b7f1a665b5

Change-Id: Icfb2cc41125f14add10c2d8881d651c51c484b6c
 2016-09-21 05:42:24 +00:00
Rebecca Silberstein
3d25ec4479 Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2 am: c507bcaf63 am: 6d2cca0f43 
am: 683bc64b6b

Change-Id: I39e4061c2afac1f841bb800b40d15f32d529f214
 2016-09-21 04:53:53 +00:00
Christopher Wiley
79ec1736be Remove WifiManager#get/setFrequencyBand 
These methods are marked @hide and only partially implemented by
the WifiService.  In general, it seems wrong to strictly prefer
one WiFi band over another for all WiFi operations.  To reduce
implementation complexity, cause setFrequencyBand to become a noop
and getFrequencyBand to reflect the underlying reality, which is
that we will always operate on all supported bands.

Bug: 31148223
Test: Compiles
Change-Id: Iccff517915f7d5ed7e96bf56e4f195b2cda80f0a
 2016-09-20 15:33:38 -07:00
Etan Cohen
b7f1a665b5 Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46 
am: ad864c8fd9

Change-Id: I338cd7ddf54997bdf19a95056e5793103ffc2e23
 2016-09-20 17:07:31 +00:00
Etan Cohen
5706a8f535 Merge "[NAN] Rename to make discovery explicit" 2016-09-20 16:41:04 +00:00
Rebecca Silberstein
683bc64b6b Merge "WifiScanner: retrieve single scan results" am: 3c70a2fad2 am: c507bcaf63 
am: 6d2cca0f43

Change-Id: I1fd17ac75a6bd69cbe775b8d202f1520750006b6
 2016-09-20 16:10:12 +00:00
Rebecca Silberstein
3c70a2fad2 Merge "WifiScanner: retrieve single scan results" 2016-09-20 15:50:08 +00:00
Etan Cohen
ed40a56e8f Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 am: c074f1bb7f am: 82842e8223 
am: 1173c27fdf

Change-Id: I4f81d0da47d13cb4a417ae97f51552b6eefe0581
 2016-09-20 06:20:24 +00:00
Etan Cohen
1173c27fdf Merge "[NAN] Update API: replace looper with handler" am: 0027ddf990 am: c074f1bb7f 
am: 82842e8223

Change-Id: I51b625ca4f3ae18b3331830cce1bb2653893c5be
 2016-09-20 00:34:30 +00:00
Etan Cohen
3855370c24 [NAN] Rename to make discovery explicit 
Pure rename operation - no other functional changes.

(cherry-pick of commit ddb5f646562f31d7e78778a978e546f85312b009)

Bug: 31470256
Test: unit tests, integrated (sl4a) tests.
Change-Id: I5110d1a673b7ba4e39350d723b5984586fec585a
 2016-09-19 21:52:14 +00:00
Etan Cohen
0fbeb0543e [NAN] Update API: replace looper with handler 
Per API council guidelines.

(cherry-pick of commit 0ff5bf0092eb25f579e2e93fb2f93bc953b39211)

Bug: 31377060
Test: unit tests, integrated (sl4a) tests
Change-Id: I05142001fb593399fb4675fbec965d7e08e0fac1
 2016-09-19 20:47:15 +00:00
Etan Cohen
75e324f44f Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac35a am: 5a07e3b2e8 am: eb1c7afdcf 
am: ff64f55acb

Change-Id: I8ae44b6f28d8e6a2c7e2e311b8404d6d089d4f50
 2016-09-19 16:31:29 +00:00
Etan Cohen
ff64f55acb Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac35a am: 5a07e3b2e8 
am: eb1c7afdcf

Change-Id: If0f1f4de0fd28c0c65cb46bd958b99f76fed854b
 2016-09-19 16:25:31 +00:00
Etan Cohen
8c3354f719 [NAN] Make parcelable class final - per API linter 
(cherry-pick of feef60406e961afcda8893c7560382382c358910)

Bug: 31380952
Test: build + sl4a integration test (WifiNanManagerTest:test_nan_discovery_session)
Change-Id: I74c079763d6b3a4f0119b16acd7a18014a10ebbd
 2016-09-19 14:09:42 +00:00
Rebecca Silberstein
bfc76e0646 WifiScanner: retrieve single scan results 
Add a new CMD_GET_SINGLE_SCAN_RESULTS message type and
getSingleScanResults method that allow WifiService to get
scan results directly from WifiScanner.

BUG: 31444878
Test: manually tested on angler
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh on angler
Test: ran GTS CtsNetTestCases on angler
Change-Id: I705233d7dc4ae7e8480c53ff0f9e1b6c8875fecb
 2016-09-17 01:38:33 -07:00
Roshan Pius
88262f3650 Merge "WifiScanner: Change hidden/PNO scan params" am: b1161c83f9 am: afef95d3c5 am: 821cc37981 
am: 6738608ac5

Change-Id: Ief5ad973c356ab1c8f507f64bdb0f38b9d4080e5
 2016-09-17 00:02:07 +00:00