Commit Graph

277484 Commits

Author SHA1 Message Date
liangweikang
a9c9bf5106 fixed applyConfigurationToResourcesLocked WeakReference is null
https://code.google.com/p/android/issues/detail?id=226956

Test: compile anr monkey test

Signed-off-by: liangweikang <liangweikang900911@gmail.com>
2016-11-09 01:40:33 +00:00
Randy Pan
7872f39869 Wifi Tx/Rx rate computation
Factor in the timestamp when computing the Tx/Rx rates. The
reported rate is a combination of current and previous rates
with a heavier weight from the current rate.

Bug: 30982272
Test: Ran the new image and compared the results against the
      old algorithm.

Change-Id: I485b7002416f382993353d9f6240ea63cb08ddae
2016-11-09 00:39:39 +00:00
Steven Moreland
3dcee9882d Merge "Update for namespaced services in hwservicemanager."
am: 605df82c9e

Change-Id: I38d861ca107665f1f865f19eebd1be368a8c77a4
2016-11-08 21:20:57 +00:00
Treehugger Robot
605df82c9e Merge "Update for namespaced services in hwservicemanager." 2016-11-08 21:10:07 +00:00
Jordan Liu
d109a6b2cd Add KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY
Add the key to CarrierConfigManager and remove the old configs which are
no longer needed.

Bug: 29873049
Change-Id: I2197cabca2addbbbe15f0f13985a6f5d8794d64a
Merged-In: I2197cabca2addbbbe15f0f13985a6f5d8794d64a
2016-11-08 11:15:20 -08:00
Sohani Rao
72d6dca09e 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
Merged-In: Ia0eb466a370a00c0264944871ce348841a17abc3
2016-11-08 11:02:52 -08:00
Tyler Gunn
06c65cc2a0 Merge "Add voip audio mode configuration for ims call"
am: 4296aa3b2b

Change-Id: I4b0cdaf7864f4db427b0c1736e51d09618f17b06
2016-11-08 18:37:42 +00:00
Tyler Gunn
4296aa3b2b Merge "Add voip audio mode configuration for ims call" 2016-11-08 18:27:51 +00:00
Steven Moreland
f3c53496c0 Update for namespaced services in hwservicemanager.
Test: end to end, hidl_test_java
Bug: 31861268
Change-Id: I3e91cf8a87f9345d4ae0650e521414407c7fc780
2016-11-08 08:53:16 -08:00
Jimmy Wu
27a88b32c9 Add voip audio mode configuration for ims call
Add config_use_voip_mode_for_ims key. Set to false if ims
audio routing is via modem; set to true if it is via rtp
stream.

Change-Id: I539d24d1d666b2d61a4a92d5b1e3fb762a2766dc
2016-11-08 11:20:45 +00:00
Etan Cohen
60e6734100 Merge "[AWARE] Fix visibility of Aware Characteristics API"
am: 13c76b77dc

Change-Id: Ie12c01e0d8e29e13e2ebcf1f49c56a1a8f705637
2016-11-07 23:35:37 +00:00
Etan Cohen
13c76b77dc Merge "[AWARE] Fix visibility of Aware Characteristics API" 2016-11-07 23:19:01 +00:00
Marco Nelissen
1d10b88f40 Merge "Use libaudioclient"
am: 0a05c49248

Change-Id: I134c9c5b95e446fcc18e2b35a3eca2a4a794e8c8
2016-11-07 17:22:36 +00:00
Etan Cohen
29b3e79ae2 [AWARE] Fix visibility of Aware Characteristics API
Hide the get characteristics API - since the underlying characteristics
class is (still hidden). Will be opened in a separate phase from the parent
class.

Bug: 31912101
Test: update-api succeeded when opening the parent class
Change-Id: Ibe2f282027cd4b1c03bfb2b1e151551c34314541
2016-11-07 09:14:46 -08:00
Marco Nelissen
0a05c49248 Merge "Use libaudioclient" 2016-11-07 17:14:25 +00:00
Etan Cohen
6571007101 Merge "[NAN-AWARE] Rename NAN to Aware"
am: 74b1131cc8

Change-Id: I2e788e19a11f2709f2e542dbdc4b58433a3574bf
2016-11-06 03:13:31 +00:00
Etan Cohen
74b1131cc8 Merge "[NAN-AWARE] Rename NAN to Aware" 2016-11-06 03:05:40 +00:00
Etan Cohen
0849ded008 [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 a61b9fb569)

Bug: 32263750
Test: All unit tests and integration (sl4a) tests pass.
Merged-In: Ie4ff675fa61041e8fcf6a9bf9900ea835d0a7614
Change-Id: I4206d2fd722dc7dec9df4aee5c818101d7f9dccc
2016-11-05 09:41:38 -07:00
Marco Nelissen
74abdda6a0 Use libaudioclient
Test: build/boot
Change-Id: I7c730bfd47297f311e00798b5927888ddc3f5062
2016-11-04 19:31:54 -07:00
Colin Cross
e81eb61399 Merge "Move one more libandroidfw header"
am: c5c74f9f49

Change-Id: Ib4d1c81aba13543da2454140548252cf013c95e1
2016-11-05 00:15:01 +00:00
Colin Cross
c5c74f9f49 Merge "Move one more libandroidfw header" 2016-11-05 00:05:38 +00:00
Colin Cross
1d80addee4 Move one more libandroidfw header
The libandroidfw headers were moved into the library directory, move one
more that did not exist in the original patch.

Test: builds
Change-Id: Ic74a41558e1bc3984d98dd766f69d081edd8fc08
2016-11-04 15:49:43 -07:00
John Reck
946d11d216 Merge "Re-unite sources with their headers"
am: e43444a00b

Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
2016-11-04 21:47:34 +00:00
Treehugger Robot
e43444a00b Merge "Re-unite sources with their headers" 2016-11-04 21:41:01 +00:00
John Reck
03b5d506bc Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.

Also fixes -Werror issues that resulted in
no longer being -isystem.

Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6)
2016-11-04 13:27:37 -07:00
Andre Eisenbach
2fe13541ad Merge "BT: Don't switch devices when one of the connected BT headsets disconnects"
am: 0bebfe76fc

Change-Id: Ibd4c4f9defec469bb14a282c53d64932123d4905
2016-11-03 23:22:07 +00:00
Andre Eisenbach
0bebfe76fc Merge "BT: Don't switch devices when one of the connected BT headsets disconnects" 2016-11-03 23:13:18 +00:00
Satish Kodishala
2980980a75 BT: Don't switch devices when one of the connected BT headsets disconnects
Usecase:
1. Enable multi-hf.
2. Connect to HS1.
3. Connect to HS2.
4. Make a call on AG. Here call audio is present on HS2.
5. Now disconnect HS1 from AG.

Failure:
When HS1 is disconnected, call audio is routed to handset/speaker.

Root cause:
When hs1 disconnection intent is received, SCO path is cleared
and audio is routed to handset/speaker.

Fix:
Check if the device being disconnected is same as the device
call audio is present before clearing SCO path.

Change-Id: If83325679b70b5893e44e8d844000ee028d0246c
2016-11-03 20:57:56 +00:00
Etan Cohen
dde9ea21e4 Merge "Update service test runner to allow test args"
am: 56b92e8191

Change-Id: Ib5f44685228bab61d50dea4c5bd226c4b80c2dd1
2016-11-03 20:26:29 +00:00
Etan Cohen
56b92e8191 Merge "Update service test runner to allow test args" 2016-11-03 20:18:53 +00:00
Przemyslaw Szczepaniak
d96bbb238f Track libcore change Ib691c81b158ec37419a903bfa4261a12139fbff7
Test: CtsLibcoreTestCases
Bug: 29935305
Change-Id: Iccbcfce86e31e37378d45b82574cb29cceff7823
2016-11-03 17:25:37 +00:00
Richard Coles
9c47f5c87a Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
am: be19fe5e8a

Change-Id: I85e2e13f395dac085616838670c19ddbedc67e9d
2016-11-03 14:42:08 +00:00
Richard Coles
be19fe5e8a Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." 2016-11-03 14:34:50 +00:00
Steven Moreland
8527f13251 Merge "Update for hidlized hwservicemanager."
am: 8d0c4ed74c

Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa
2016-11-02 22:23:45 +00:00
Treehugger Robot
8d0c4ed74c Merge "Update for hidlized hwservicemanager." 2016-11-02 22:17:25 +00:00
Paul Stewart
07f4d23a88 Add capability flag for 802.11r fast BSS transition
Not only isn't there a way to query this capability from the
driver, but there may be valid reasons to disable this feature
per-platform.

Bug: 32607043
Change-Id: Iea23e430efc61ffe0f6b68502c89a14bdcd318bb
Test: Compile
2016-11-02 14:43:30 -07:00
Paul Stewart
e72f7dc385 Add constants for 802.11r
Add constants FT-EAP and FT-PSK, which implement 802.11r Fast
BSS Transition.

Bug: 32607043
Change-Id: Ic089bf9331723f1fce3978253437f5759c6d61e9
Test: Build (constants only)
2016-11-02 14:43:17 -07:00
neo.chae
4720125a3c Merge "Fix idmap leak in zygote process"
am: f5ad44b60a

Change-Id: Ia9977c8166f797ad716284eda03076e282a9fde7
2016-11-02 21:16:33 +00:00
Treehugger Robot
f5ad44b60a Merge "Fix idmap leak in zygote process" 2016-11-02 21:09:03 +00:00
Brad Ebinger
ccec8919fe Merge "Modify ConnectionServiceAdapter to include Session"
am: f231db7786  -s ours

Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507
2016-11-02 20:51:36 +00:00
Steven Moreland
a813686b9d Update for hidlized hwservicemanager.
Bug: 32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28
2016-11-02 13:43:28 -07:00
Brad Ebinger
f231db7786 Merge "Modify ConnectionServiceAdapter to include Session" 2016-11-02 20:39:41 +00:00
pengzhicai
38c585cb8d Merge "Fix String is empty issue"
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
2016-11-02 18:23:26 +00:00
Treehugger Robot
80af1ba47b Merge "Fix String is empty issue" 2016-11-02 18:14:50 +00:00
Brad Ebinger
def235760e Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master 2016-11-02 16:59:33 +00:00
Brad Ebinger
4d75bee99b Modify ConnectionServiceAdapter to include Session
Modifies the ConnectionServiceAdapter to include Session Information in
the AIDL interface so that external Sessions can be started in Telecom
from Telephony.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403
2016-11-02 09:20:22 -07:00
pengzhicai
7c30bb8e0f Fix String is empty issue
Maybe the string is empty
https://code.google.com/p/android/issues/detail?id=226739

Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d
Signed-off-by: pengzhicai <pengzhicai@xiaomi.com>
2016-11-02 09:42:44 +08:00
Sanket Agarwal
f41abccf80 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7
am: cf4dc9236e

Change-Id: I9ca9384c21903fbe97f4cb1c0bc64c27e04b5401
2016-11-02 01:05:20 +00:00
Joseph Pirozzo
b13240028b MAP MCE
am: b8fc0679e8

Change-Id: Id82f047bc2d0eb7e4f04c14cfc216854e066156f
2016-11-02 01:05:14 +00:00
Joseph Pirozzo
a31933abc3 Pbap disconnect durring connect
am: a4f0127fbb

Change-Id: Ib2f65418dee82893a377b780647d823cfa274dd6
2016-11-02 01:04:33 +00:00