276486 Commits

Author SHA1 Message Date
Peter Qiu
afb8f37711 Merge changes from topic 'HS2 API Cleanup'
am: 41fd0f1faf

Change-Id: Ic53fa2cad082484ebbbc9198511b0539dad97382
2016-11-16 00:04:44 +00:00
Peter Qiu
1b39c61ce7 wifi: remove unused hidden Hotspot 2.0 Release 1 API
am: 1c3054ea87

Change-Id: I5a13979aedb39ad347099fd25e7515b099b9ac19
2016-11-16 00:00:06 +00:00
Peter Qiu
a9a9a9bb8d wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
am: a38558b539

Change-Id: I48766f0c259693496dc9b63ad0dd287b93185787
2016-11-15 23:59:20 +00:00
Treehugger Robot
41fd0f1faf Merge changes from topic 'HS2 API Cleanup'
* changes:
  wifi: remove unused hidden Hotspot 2.0 Release 1 API
  wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
2016-11-15 23:50:18 +00:00
Neil Fuller
98f03f4980 Merge "Correctly handle when the user has no explicit time_12_24 setting"
am: 8631e19d38

Change-Id: I70533c5ff4ac8cdeef1b42337bb47b09c8bbf927
2016-11-15 16:50:29 +00:00
Neil Fuller
8631e19d38 Merge "Correctly handle when the user has no explicit time_12_24 setting" 2016-11-15 16:39:42 +00:00
Peter Qiu
30874ed6ed Merge "osu: remove calls to deprecated APIs"
am: e9514808d7

Change-Id: If7c31b7d901ef8cc8561b7f0933d803498105e75
2016-11-15 04:15:59 +00:00
Treehugger Robot
e9514808d7 Merge "osu: remove calls to deprecated APIs" 2016-11-15 03:59:57 +00:00
TreeHugger Robot
9f078049cf Merge "Add WiFi toggle prompts - framework" into stage-aosp-master 2016-11-15 03:18:26 +00:00
Yifan Hong
2187dc5ca1 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am: 8cc1343724

Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109
2016-11-15 03:06:44 +00:00
Treehugger Robot
8cc1343724 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." 2016-11-15 02:59:52 +00:00
Svetoslav Ganov
6c3032f16b Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit d3663c04a721e0848dd3e9179c84ba585d91839d)
2016-11-14 18:34:40 -08:00
Peter Qiu
28a3d44536 osu: remove calls to deprecated APIs
The hidden APIs WifiManager#addPasspointManagmentObject and
WifiManager#addPasspointManagementObject will removed, so remove
all callsites.

The OSU app is still under developement and is not included
in any device builds.  However, it is being built by the Treehugger
for generic AOSP builds.

So fix it to allow the API removal CLs to be submitted.

Bug: 32509661
Test: None
Merged-In: Ic405695ee8edfd0c08b831834797f163fe445595
Change-Id: If418c64e69f1836575257b9d5b2f5c4373050a31
2016-11-15 02:12:57 +00:00
Peter Qiu
1c3054ea87 wifi: remove unused hidden Hotspot 2.0 Release 1 API
WifiManager#buildWifiConfig was used by the Hotspot 2.0 Release 1
app (WifiInstaller) for parsing Release 1 installation data into
a WifiConfiguration object.  WifiInstaller will be updated to use
the new framework API (android.net.wifi.hotspot2.ConfigBuilder)
instead. So this API is no longer needed.

Bug: 32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iacee739a9ed12ea00b1b7457e22e790ef4a177da
2016-11-14 13:23:01 -08:00
Peter Qiu
a38558b539 wifi: remove hidden unused Hotspot 2.0 Release 2 APIs
These APIs are used for installing/modifying the PerProviderSubscription
Management Object tree in XML string representation and are used only by
the unreleased Hotspot 2.0 Release 2 app (OSU app).  The OSU app will be
updated to use the new APIs which uses Parcelable objects to represent
provider configuration.

Bug: 32509661
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Iff6b6e4b95b76d48201eeeb47f441b7c94f359bb
2016-11-14 13:23:01 -08:00
Sohani Rao
31082a0824 Merge "Add WiFi toggle prompts - framework"
am: 584b5cee49  -s ours

Change-Id: I9dd54beb08f771be886c03fa0f8a3335f574c47c
2016-11-14 21:14:44 +00:00
Sohani Rao
584b5cee49 Merge "Add WiFi toggle prompts - framework" 2016-11-14 20:59:36 +00:00
Sohani Rao
7342bb84cd Merge "Permissions check for Wifi Display configuration"
am: f5c32a411c

Change-Id: I7a1c2d0f48728cd5e056076a2cf1499a7abb2438
2016-11-14 19:33:31 +00:00
Sohani Rao
f5c32a411c Merge "Permissions check for Wifi Display configuration" 2016-11-14 19:21:58 +00:00
Svetoslav Ganov
0efa843e72 Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Bug: 28715749
Test: Unit Tests

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-11-14 10:26:52 -08:00
Sohani Rao
ef401300e8 Permissions check for Wifi Display configuration
Wifi Display is configured using the AIDL call setMiracastMode()
and using a message over the async channel SET_WFD_INFO.
Enforce permissions on the calling uid before updating the config

Bug: 18668877
Test: Unit tests
Change-Id: I0be2d2af49070aad759f24bd31331f7df39a0422
Merged-In: I0be2d2af49070aad759f24bd31331f7df39a0422
2016-11-14 10:21:31 -08:00
Tyler Gunn
8b58e73c48 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount."
am: 8223dc1ae9

Change-Id: Id8c6077d099f9ef943c09242acb22173b6628c1a
2016-11-14 18:08:11 +00:00
Tyler Gunn
8223dc1ae9 Merge "Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount." 2016-11-14 16:23:43 +00:00
Neil Fuller
c66ec40d38 Correctly handle when the user has no explicit time_12_24 setting
The code would previously interpret "null" (meaning the user
hasn't touched the setting in the Settings app) as meaning
"use 12 hour format". The actual meaning of "null" is
generally accepted in the platform as
"use the locale default". For example, the Settings app does
this, as does the code in libcore.icu.LocaleData. For
locales where the default is "use 12 hour format" anyway
this wasn't obvious. However, locales like Germany should
default to  24 hour, and then the setting is displayed
incorrectly in the Settings app.

Also, German devices boot for the first time with 12 hour SHORT
and MEDIUM time formats too. After the user had explicitly set
the format the setting would be correct.

There appear to be no tests for this behavior, presumably
because of the difficulty in forcing the setting to "unset"
which would have to have to happen before the app was launched,
and the fact that CTS tests run in the US locale.

Bug: 32868036
Test: Manual testing with a device set to German
Change-Id: Ifd2e8d345f6afee467d7525d6793fc8fda37c900
2016-11-14 16:06:42 +00:00
Steven Moreland
5f9ac42029 Merge "hidl: Update for IFoo::descriptor -> const char *."
am: e17e68f139

Change-Id: Iefe4ae60d8e7f0473f1b417ac09c5e37b082d07b
2016-11-14 15:15:39 +00:00
Treehugger Robot
e17e68f139 Merge "hidl: Update for IFoo::descriptor -> const char *." 2016-11-14 15:03:32 +00:00
Yifan Hong
3bb65781ec Update for removing read/writeEmbeddedFrom/ToParcel methods.
Test: mma

Bug: 32756130

Change-Id: I179a1fbd4962e9b3be383cc25d95a6d492ef6a1f
2016-11-11 17:27:18 -08:00
Jakub Pawlowski
e3b71cd572 Merge "Bluetooth: advertising improvements"
am: 82c9ba9c55

Change-Id: I662ba0f326aa204f9f07ce88bc9d48f5b06770cb
2016-11-11 23:48:51 +00:00
Robert Sesek
a0d2e6f4b7 Merge "Respect force_mount_namespace in MountEmulatedStorage()."
am: b828b6bf6c

Change-Id: I9b4d0000c29d5e404f333d8e8c89af2425452a17
2016-11-11 23:44:49 +00:00
Marie Janssen
3d8d5dbb56 Merge "Bluetooth: BLE app tracking fixes"
am: 2174731449

Change-Id: Id07abb3d5ad76b318d1b7cee6d9fb9351737b141
2016-11-11 23:41:42 +00:00
Jakub Pawlowski
82c9ba9c55 Merge "Bluetooth: advertising improvements" 2016-11-11 23:33:15 +00:00
Jakub Pawlowski
3d83b0e90b Bluetooth: advertising improvements
This patch removes isPeripheralModeSupported(), hidden public method
which is always returning true. It also modify the BluetoothLeAdvertiser
to be able to use advertising instance with instance id equal 0.

Bug: 30622771
Bug: 24099160
Change-Id: Id31582621dbe56d5c3a8d4ee5cd296af66a5f026
2016-11-11 23:28:32 +00:00
Treehugger Robot
b828b6bf6c Merge "Respect force_mount_namespace in MountEmulatedStorage()." 2016-11-11 23:25:43 +00:00
Treehugger Robot
2174731449 Merge "Bluetooth: BLE app tracking fixes" 2016-11-11 23:22:55 +00:00
Marie Janssen
2977c3e372 Bluetooth: BLE app tracking fixes
Simplify tracking registered BLE Apps and clear the state when we
try to recover bluetooth from starting to ON.

Test: enable and disable bluetooth an LE-only app running
Bug: 32609235
Change-Id: I3233bf8402a3c8fc4886ef21b1e9411bc78d4e2c
2016-11-11 21:30:33 +00:00
Steven Moreland
ab2fca253b hidl: Update for IFoo::descriptor -> const char *.
Test: hidl_test, hidl_test_java
Bug: 32745840
Change-Id: I9e4dcaaf7365d03cb53a2e1e8cd6336fbc08417d
2016-11-11 12:33:41 -08:00
Marco Nelissen
618c1a9ae6 Merge "Make AmrInputStream use MediaCodec"
am: 866658261f

Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
2016-11-11 20:10:00 +00:00
Treehugger Robot
866658261f Merge "Make AmrInputStream use MediaCodec" 2016-11-11 19:54:39 +00:00
Jack Yu
3cfa510779 Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API"
am: 4469e48d5c

Change-Id: Id92b8eaeec12885af3748d1e839da1a5560e2619
2016-11-11 19:51:23 +00:00
Tyler Gunn
58cbd7a9c7 Add CAPABILITY_SUPPORTS_VIDEO_CALLING to PhoneAccount.
Adding companion PhoneAccount capability which is used to indicate when a
PhoneAccount supports video calling.  That is, whether it can potentially
make video calls, but not necessarily at the current time.

This is an often requested OEM enhancement which is used to drive UX (e.g.
imagine a video calling icon showing up if the device supports video, but
only being enabled when the device is in range of a VT capable tower).

See bug for reference to design doc.

Merged-Id: I38379a3a1cf1be04c6136b89b93ee95193ee7b6f
Bug: 27328615
Test: Manual
Change-Id: I08fc18950e6d35a8a7df47ce37aa2326624b9fd3
2016-11-11 19:43:57 +00:00
Jack Yu
4469e48d5c Merge "Expose getters for RSRP, RSRQ, RSSNR, and CQI in CellSignalStrengthLte. Regenerate api accordingly. BUG: 32609966 Test: CTS Testing new API" 2016-11-11 19:41:46 +00:00
Marco Nelissen
01d023e966 Make AmrInputStream use MediaCodec
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
2016-11-11 10:53:09 -08:00
liangweikang
45562df8bb Merge "fixed applyConfigurationToResourcesLocked WeakReference is null"
am: 264d1f12a3

Change-Id: Icfaf039b078d7ce43b23bed09cd0102427c6f047
2016-11-11 03:25:41 +00:00
Treehugger Robot
264d1f12a3 Merge "fixed applyConfigurationToResourcesLocked WeakReference is null" 2016-11-11 03:16:42 +00:00
Robert Sesek
06af1c0ede Respect force_mount_namespace in MountEmulatedStorage().
In Ieb75cc3009ed26b7366213409d5fad836f597084, the unshare step was
skipped if no storage is required. But the change failed to take the force
parameter into account

Test: m
Test: angler boots
Test: fugu boots

Bug: 21643067
Change-Id: I52447f02fd25f553628564733fd6bf2523c07f7c
2016-11-10 21:50:04 -05:00
Robert Sesek
ae06fba67a Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting."
am: c0aacbe513

Change-Id: I7199d687e2e67dd4672bcb388053c33db6b693f5
2016-11-11 00:13:57 +00:00
Treehugger Robot
c0aacbe513 Merge "In MountEmulatedStorage() don't create a mount namespace unless actually mounting." 2016-11-11 00:02:46 +00:00
Peter Qiu
5451f8279e Merge "wifi: hotspot2: add Passpoint APIs to WifiManager"
am: 0295d7bd38

Change-Id: I79279f22bfc9642ed7905d099dd43555714ea815
2016-11-10 22:07:11 +00:00
Ta-wei Yen
969a6eb2b8 Merge "Add createForPhoneAccountHandle() and getServicetate() Respect TelephonyManager's subId when listening to phone state"
am: 0a3b6b70dd

Change-Id: I512e68bccda115ad7c58ec1f1fbfbb2c69c86578
2016-11-10 22:02:17 +00:00
Treehugger Robot
0295d7bd38 Merge "wifi: hotspot2: add Passpoint APIs to WifiManager" 2016-11-10 21:56:56 +00:00