14109 Commits

Author SHA1 Message Date
Sanket Padawe
c29fff5032 Merge "Make some intents public in SubscriptionManager."
am: 35e9a94dee

Change-Id: Ic9812badf9368b1398110e446956641d27e6e2ff
2017-04-04 16:59:13 +00:00
Treehugger Robot
35e9a94dee Merge "Make some intents public in SubscriptionManager." 2017-04-04 16:48:33 +00:00
Sanket Padawe
e4f5f79c65 Make some intents public in SubscriptionManager.
+ As per https://docs.google.com/document/d/1K8C7Ly8YVu032FQlwEdkv3ovcTYQCTvy0PaMax5PmZI/edit#heading=h.g6rt8vhyfjj1

Bug: 36572866
Test: Builds successfully.
Change-Id: Ibb1d1faae9a002ccb530446e24897955c12076e1
Merged-in: Ibb1d1faae9a002ccb530446e24897955c12076e1
2017-04-03 15:53:05 -07:00
Nathan Harold
5eaf5393a5 IpSecManager and IpSecTransform API Cleanup
am: 48b566557d

Change-Id: I1524f8381c8a73ba4dc7a36b343e11066b75c08d
2017-04-02 00:18:42 +00:00
nharold
464dc5c07e Merge changes from topic 'ipsec-transport-impl'
* changes:
  Add Initial IPsec APIs to IpSecService
  IpSecManager and IpSecTransform API Cleanup
2017-04-02 00:10:35 +00:00
Jakub Pawlowski
8c5b5b0c4b Merge "Bluetooth 5 advertising duration refactoring (4/4)"
am: 3946df68ed

Change-Id: I04f7f867a1387d1816d007ba4bdebf9eecc66b06
2017-04-01 04:42:45 +00:00
Jakub Pawlowski
5a355610fe Bluetooth 5 advertising duration refactoring (4/4)
Expose both duration and maximum extended advertising events to limit
advertising time.

Test: manual
Bug: 30622771
Change-Id: I44df300995ef985526b93f8c24389775720b3432
2017-04-01 04:34:40 +00:00
Nathan Harold
48b566557d IpSecManager and IpSecTransform API Cleanup
-Remove Int-based SPI usage from the IpSecTransform.Builder
 This is essentially a less-safe method overload, and it is both
 unnecessary and difficult to implement: the cross-validation
 between SPI and Transform is actually useful, and the kernel
 requires two different mechanisms to use an unreserved vs a
 reserved (alloc'd) SPI: CREATESA vs UPDATESA, which makes this
 hard to support. API Council has questioned the value of this,
 and they are right: everything points to "remove this". In the
 future, if we find that SPI reservation is overhead, we can
 always add it back.

-Hiding the TunnelMode builder method and application/remove
 methods. These will not land by the time the next API
 stabilizes, so better to hide them now that this is a
 near-certainty. Expectation is to un-hide them in the subsequent
 API bump.

Bug: 36073210
Test: Compilation, verified nobody is calling these stubs
Change-Id: Ic1a3f2cf7128633318ac175d6b56b45eb8d21cab
2017-03-31 11:21:10 -07:00
Tyler Gunn
9fab4ad9b3 Merge "Self Managed CS Implementation"
am: 98fad21a8a

Change-Id: I8c972f521270e6c973c2524a2684aa32a65ca0fd
2017-03-31 04:26:27 +00:00
Treehugger Robot
98fad21a8a Merge "Self Managed CS Implementation" 2017-03-31 04:11:54 +00:00
Tyler Gunn
3765356699 Self Managed CS Implementation
- Add API guide for developers giving an overview of what they need
to implement.
- Add @hide setLabel method in PhoneAccount; used when registering a
self-managed CS's phone account; we override it with their app label to
ensure they don't try to give themselves another name.

Test: Unit
Bug: 34159263
Change-Id: I0c890dc2feeb3ee438a80ed425db2aaf1f4c1fdd
2017-03-30 19:00:41 -07:00
Nathan Harold
6d3c10495e Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
am: d118826971

Change-Id: Ie59322c4e80aab89d784a2fcb3edd6458677bbb7
2017-03-30 03:39:46 +00:00
Treehugger Robot
d118826971 Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" 2017-03-30 03:33:13 +00:00
Jakub Pawlowski
c06722e788 Merge "Hide periodic scanning"
am: ca7544ea15

Change-Id: Icedae1d34de063d6b708a30bdc6217d48ed373ef
2017-03-30 03:26:18 +00:00
Nathan Harold
c4f879925b Change reserveSecurityParameterIndex() to take a remoteAddress
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.

Bug: 36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
2017-03-29 17:46:47 -07:00
Jakub Pawlowski
63fad69a19 Hide periodic scanning
Bug: 30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
2017-03-29 17:11:59 -07:00
Etan Cohen
9bc8e05da2 Merge "[AWARE] Remove Publish/Subscribe Count configuration"
am: 5d81b9d67d

Change-Id: I6f7545c6665d4381cdeed03290cf928bc21aef17
2017-03-29 17:08:51 +00:00
Etan Cohen
2cbaf22bba [AWARE] Remove Publish/Subscribe Count configuration
Simplify API: semantics of publish/subscribe count restrictions
aren't clear at the app level. They depend on DW configuration as
well as discovery session type - number of packets transmitted over
the air.

There's already an app-facing discovery session lifetime configuration -
the TTL. That has clearer semantics and is sufficient (for now).

Bug: 36446307
Test: unit tests and integration (sl4a) tests.
Change-Id: I9129975bd2e1a61b3d23a4b6acaae703b42216c7
2017-03-28 11:25:21 -07:00
Ying Xu
b2558c4ec1 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode""
am: 23393da165

Change-Id: Iaeae098f1185b045483334ff100e47a9be608c64
2017-03-28 17:04:04 +00:00
Ying Xu
23393da165 Merge "Add a carrier option to hide the option of "Enhanced 4G LTE Mode"" 2017-03-28 16:55:10 +00:00
Lorenzo Colitti
37afaac70d Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."
am: a1e206a335

Change-Id: I71fabdff9deb0f7ba40a545090bd09ddc66994a8
2017-03-27 19:16:17 +00:00
Lorenzo Colitti
a1e206a335 Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." 2017-03-27 19:08:25 +00:00
yinxu
34016ae405 Add a carrier option to hide the option of "Enhanced 4G LTE Mode"
The option "Enhanced 4G LTE Mode" currently may be hidden according to
the VoLTE state of the plateform and device. With this new option we can
choose to hide the "Enhanced 4G LTE Mode" irrespective of VoLTE state.

Bug: 36220377
Test: manual
Change-Id: I516ad050e623a368f2c2ef3d81650eb20c20fd5b
2017-03-24 10:31:28 -07:00
Jack Yu
9b7d3a86bd Merge "Deprecated getDeviceId and added getMeid and getImei"
am: ad2e7405ad

Change-Id: I4e006290c54a371fc5f080c37f86ca946507d871
2017-03-24 17:10:54 +00:00
Jack Yu
ad2e7405ad Merge "Deprecated getDeviceId and added getMeid and getImei" 2017-03-24 17:02:59 +00:00
Peter Qiu
aadbb2d45e Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
am: 44ef19d131

Change-Id: I65b22e41ae62172cc7b241fe68c6d1c92c782a69
2017-03-23 23:00:06 +00:00
Jack Yu
f301dab471 Deprecated getDeviceId and added getMeid and getImei
Added two new public APIs getMeid and getImei. Deprecated the exisintg
getDeviceId API because it can't return a constant id when phone type
changes.

Test: CTS and manual
bug: 34233620, 10831289

Merged-In: Iad4c05d2fd2efc538214f466861497c973882dfe
Change-Id: Iad4c05d2fd2efc538214f466861497c973882dfe
2017-03-23 14:42:33 -07:00
Peter Qiu
ed1fc64efd wifi: use android.graphics.drawable.Icon for Passpoint icon data
Bug: 35857805
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: Ib076cd7f565638613173c7373ea5ea61affb876d
2017-03-23 11:42:49 -07:00
Przemyslaw Szczepaniak
b89ec268ab Merge "Track libcore commit a2d9879b"
am: 4aa106a790

Change-Id: I447493da10ec6e42b9b8fcc379ddae578ee78e91
2017-03-23 16:31:28 +00:00
Treehugger Robot
4aa106a790 Merge "Track libcore commit a2d9879b" 2017-03-23 16:20:24 +00:00
Lorenzo Colitti
87b59632e7 Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi.
Fix: 34721574
Test: builds, apicheck passes
Change-Id: If921f265c02ffb57d5ac717f924f91f664dd991f
2017-03-23 16:11:30 +09:00
Jakub Pawlowski
cde107da6c Merge "Bluetooth 5 Enable->Enabled (1/2)"
am: fa69eeac5c

Change-Id: Ia09cf5db2f69659a3b77e4c5e663d5977793df48
2017-03-23 01:25:31 +00:00
Jakub Pawlowski
2a32d04a24 Merge "BluetoothGattCallbackExt removal"
am: e2ddacaff4

Change-Id: I59ba6c9950997ea447a5b021d509a72abc546661
2017-03-23 00:44:06 +00:00
Jakub Pawlowski
7998be9e44 Bluetooth 5 Enable->Enabled (1/2)
Test: manual
Bug: 30622771
Change-Id: I37b198927076a0267de67e1bd94eaea9e88e53bb
2017-03-22 15:42:53 -07:00
Jakub Pawlowski
d64bb883d8 BluetoothGattCallbackExt removal
New methods should be added to BluetoothGattCallback, instead of
creating Ext class.

Test: manual
Bug: 30622771
Change-Id: I2567df5baace6bd2d2f30c36d2f62056408ca5d0
2017-03-22 18:27:10 +00:00
Jakub Pawlowski
8d06b41826 Merge "Add setScannable to AdvertisingSetParameters (1/2)"
am: 7f14b8f095

Change-Id: I26846383be5c0fe88501ffd1011b27f39896a74a
2017-03-21 18:44:36 +00:00
Jakub Pawlowski
d12b5688f0 Add setScannable to AdvertisingSetParameters (1/2)
There must be a proper way to specify if advertisment is scannable, when
updating the parameters.

Test: manual
Bug: 30622771
Change-Id: Ie520609d3fff07ccc2960015c19311d773842852
2017-03-21 18:37:16 +00:00
Przemyslaw Szczepaniak
f3638be2b2 Track libcore commit a2d9879b
Test: make -j 32
Bug: 36461944
Change-Id: I0cf924a0f07d3d048f75edb4061b20f065ba80b1
2017-03-21 17:23:50 +00:00
Jakub Pawlowski
375741e99a Merge "Bluetooth 5 AdvertisingSet implementation (1/4)"
am: f0c963a5b6

Change-Id: Ia401ccf8935b8cb315849803c5c82d1d7dd64b81
2017-03-20 22:26:42 +00:00
Jakub Pawlowski
6a55da9018 Bluetooth 5 AdvertisingSet implementation (1/4)
Test: manual
Bug: 30622771
Change-Id: Ia89718c0c2ab2eaa71b158ecdcae989af907769f
2017-03-20 20:00:36 +00:00
Jakub Pawlowski
07d79aa3b0 Merge "Bluetooth 5 move timeout parameter (1/2)"
am: d9f2f67a5f

Change-Id: Iee7d485461f5e02ab65ec9f7311e962deb603543
2017-03-17 22:34:24 +00:00
Jakub Pawlowski
adbf2eef2f Bluetooth 5 move timeout parameter (1/2)
Timeout is not a parameter, it is a property of enabling the
advertising. Move it into more proper place.

Test: manual
Bug: 30622771
Change-Id: I09ebc6c770bc02938ea16a9738a7e03dc8006fde
2017-03-17 22:23:57 +00:00
Jakub Pawlowski
2fc3834f4d Merge "LE Maximum Advertising Data Length (1/4)"
am: 74f2e1a303

Change-Id: I3b6599937ddd04a9c13573d156cc721152c0005a
2017-03-17 05:19:57 +00:00
Jakub Pawlowski
ad10affa4e LE Maximum Advertising Data Length (1/4)
Add ability to check maximum advertising data length.

Bug: 30622771
Test: manual
Change-Id: I281f7e9f294c40a47a67a22809cc753b6693f7c4
2017-03-16 18:27:01 -07:00
Peter Qiu
39df78ecc7 Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
am: 5df03b3d74

Change-Id: Ic1822a3203da5522a5a103c34fb45a6498cd6428
2017-03-14 16:24:11 +00:00
Peter Qiu
9c0f6f3db7 hotspot2: hide validate method for Passpoint configuration
am: b5ca6f36b5

Change-Id: I268b0db6c844ec1746b6374c87768f233b719b3f
2017-03-14 16:22:28 +00:00
Peter Qiu
c4d5850d3e hotspot2: update Passpoint intent definitions
am: 5679145d9a

Change-Id: I4e59efbcd9a9d33ceac8cc359155770c2de5a0fd
2017-03-14 16:19:19 +00:00
Treehugger Robot
5df03b3d74 Merge changes from topics 'Passpoint API update', 'Passpoint intent update'
* changes:
  hotspot2: update Passpoint configuration management APIs
  hotspot2: hide validate method for Passpoint configuration
  Osu: temporarily comment out the usage of deprecated intent definitions
  hotspot2: update Passpoint intent definitions
2017-03-14 16:07:47 +00:00
Peter Qiu
3efd531e2f hotspot2: update Passpoint configuration management APIs
Address API Councils comment to update both
WifiManager#addOrUpdatePasspointConfiguration and
WifiManager#removePasspointConfiguration to return void and throw
exception on failure instead of returning a boolean.

Bug: 35858311,35856174
Test: make -j32
Change-Id: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
Merged-In: Iac421eba7aa90e8bc3ffaf5d81210302c7557e95
2017-03-13 11:21:14 -07:00
Peter Qiu
b5ca6f36b5 hotspot2: hide validate method for Passpoint configuration
The validate method is used by Framework only, no need to expose
to app developers. So hide it.

Bug: 35756298
Test: make -j32
Change-Id: I15ccae472f30d7ae968816479f6ea35d90248fe0
Merged-In: I15ccae472f30d7ae968816479f6ea35d90248fe0
2017-03-13 11:21:13 -07:00