Commit Graph

252584 Commits

Author SHA1 Message Date
Brad Ebinger
d51df736f6 Merge "Readability improvements in Logging" 2016-11-17 19:18:00 +00:00
Treehugger Robot
f68cb55cc1 Merge "Fix coretests: Remove dependency on libnativehelper" 2016-11-17 18:37:42 +00:00
Przemyslaw Szczepaniak
caa816451c Merge "Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7" 2016-11-17 15:28:53 +00:00
Treehugger Robot
3ebcf1218b Merge "Don't disconnect an A2DP device when connecting to same device" 2016-11-17 06:58:43 +00:00
Pavlin Radoslavov
eb067ba741 Don't disconnect an A2DP device when connecting to same device
When processing a connect request for an A2DP device, Settings
would trigger a disconnect request for all A2DP devices that
have state of CONNECTED, CONNECTING or DISCONNECTING, including
eventually the device we are connecting to.
This could create timing-related issues, and is not necessary.
Now we explicitly check to avoid disconnecting the device we are
connecting to.

Test: Manual A2DP testing with a phone and wireless headsets
Bug: 32688022
Change-Id: I572dd87c071829b734513c4b928a4d65fe539520
2016-11-17 05:29:08 +00:00
Dimitry Ivanov
43b1b3ff0b Fix coretests: Remove dependency on libnativehelper
This dependency was never needed and it makes test app
depend on private platform libraries - which is no longer allowed.

This change fixes these problems by removing dependency and renaming
JNI method.

Test: Install the test and start it.
Change-Id: I9878627148917c1b5928b98f3c86f6e6097093d6
2016-11-16 18:35:35 -08:00
Treehugger Robot
a908e65b66 Merge "wifi: add constant definition for EAP types" 2016-11-17 02:10:23 +00:00
Jerry Zhang
b37d826204 Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.
2016-11-16 23:59:33 +00:00
Treehugger Robot
a3c0324824 Merge "Add security capabilities enums to ScanResult" 2016-11-16 23:42:25 +00:00
Peter Qiu
4a79ac2c82 wifi: add constant definition for EAP types
Bug: 32810711
Test: frameworks/base/wifi/tests/runtests.sh
Change-Id: Ia62f2674e8cdf975d1380f733a8687bdb15ed197
2016-11-16 13:49:22 -08:00
Ningyuan Wang
d150b2b001 Add security capabilities enums to ScanResult
This adds enums of security parameters, including
protocol, key management, and cipher suites.

Bug: 32512793
Test: compile

Change-Id: Ibf784d79695ca5e261c6bfe623406bc693c5ac17
2016-11-16 11:13:42 -08:00
Brad Ebinger
0c3541be65 Readability improvements in Logging
We now truncate Session method paths and IDs based on the Logging level
to improve Session Logging readability in logcat. If another external
session is started off of an existing external Session, the preceding
histories are replaced with "..." so that the Session information is not
overwhelming.

Bug: 26571395
Test: Unit Tests and manual tests pass
Change-Id: I9ffda3d64f1072fa6228a82a86116a5e47d18c96
2016-11-16 11:05:15 -08:00
Yifan Hong
efd7b9f57d Merge "Fix include after spliting HidlSupport.h" 2016-11-16 19:01:00 +00:00
Treehugger Robot
3b379ee94e Merge "Preload2: Fix dependencies" 2016-11-16 18:15:06 +00:00
Martijn Coenen
87cafe8f33 Merge "Fix deprecated range_x calls." 2016-11-16 09:48:31 +00:00
Treehugger Robot
224d9e48fa Merge "CountDownTimer: not skip onTick()" 2016-11-16 07:55:27 +00:00
Treehugger Robot
1813ae0159 Merge "Fixed the issue when some apps were gone and couldn't be installed successfully after updating from KK to M via OTA." 2016-11-16 02:54:26 +00:00
Yifan Hong
ddf31f604e Fix include after spliting HidlSupport.h
Test: mma

Bug: 32756130
Change-Id: Ia4fa02726d79681753fe9c8c7135a28fffb508b4
2016-11-15 16:02:40 -08: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
Jerry Zhang
935372bfd6 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5)
2016-11-15 15:29:45 -08:00
Jerry Zhang
dfacad026d Clean up persistent usb state on boot.
b/31814300 was fixed, but mtp can still stick around in the
persistent config even after flashing. This block of code
will only run once, but will ensure that mtp is not in
the config after the update.

Bug: 31814300
Test: Manual
Change-Id: Icf02be38c9e1f769412ac963ed6afc14e6092bfb
(cherry-picked from commit a45dac0e83)
2016-11-15 15:29:36 -08:00
Jerry Zhang
0269ebe0fe Fixed handling of usb state during adb changes.
When changing state to adb from mtp (charging), we want to disable
the old mtp function. Similarly when change to away from adb to
charging, enable the mtp function.

Also the mtp function should never be persisted.

Bug: 31818377
Bug: 31814300
Test: Manually verify that the correct usb configuration is displayed.
Test: Manually verify that logcat is not kicked during boot.
Change-Id: Idcb7f53be39ea38712d5de45b323d8daeb552129
(cherry-picked from commit 58018d01a3)
2016-11-15 15:29:22 -08: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
Martijn Coenen
90213f341d Fix deprecated range_x calls.
Test: builds
Change-Id: I98412e51a54ef9f9e26c72ecd810dcea77aefdbb
2016-11-15 09:07:12 +01:00
Treehugger Robot
e9514808d7 Merge "osu: remove calls to deprecated APIs" 2016-11-15 03:59:57 +00:00
Andreas Gampe
da69216ac6 Preload2: Fix dependencies
Also depend on and package tools-common.

Test: m
Test: preload-tool
Change-Id: I19a8844f87417f2292e50ffaaebb5fa24a2eca24
2016-11-14 19:08:22 -08:00
Treehugger Robot
8cc1343724 Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." 2016-11-15 02:59:52 +00: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
584b5cee49 Merge "Add WiFi toggle prompts - framework" 2016-11-14 20:59:36 +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
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
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
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
Treehugger Robot
866658261f Merge "Make AmrInputStream use MediaCodec" 2016-11-11 19:54:39 +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
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