drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
277,097 Commits 1 Branch 0 Tags
Commit Graph

277097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andre Eisenbach
51d7a455aa Merge "BT: Don't switch devices when one of the connected BT headsets disconnects" am: 0bebfe76fc 
am: 2fe13541ad

Change-Id: Iba20aef49c4d34875d8521cba82e6ffc26051ac3
 2016-11-03 23:25:37 +00: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
10840d1897 Merge "Update service test runner to allow test args" am: 56b92e8191 
am: dde9ea21e4

Change-Id: I59d572e233720ecf0ddc6cbb5893323b563a3241
 2016-11-03 20:32:54 +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
Richard Coles
0092dbabe0 Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am: be19fe5e8a 
am: 9c47f5c87a

Change-Id: Ia5d867468080e0e48a4e5b3c08b1ee627e16cebe
 2016-11-03 14:48:05 +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
0d5da175a0 Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c 
am: 8527f13251

Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f
 2016-11-02 22:28:28 +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
neo.chae
3e15d09ed4 Merge "Fix idmap leak in zygote process" am: f5ad44b60a 
am: 4720125a3c

Change-Id: If66e9476583ec50d2dca5a15376a4b84ae2a2885
 2016-11-02 21:21:32 +00: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
a895383b44 Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours 
am: ccec8919fe

Change-Id: I27443a9024ea4aff209a24a9049832a76f252476
 2016-11-02 20:55:16 +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
d7df704d98 Merge "Fix String is empty issue" am: 80af1ba47b 
am: 38c585cb8d

Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7
 2016-11-02 18:29:24 +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
c50005ee6c Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master 
am: def235760e

Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798
 2016-11-02 17:43:49 +00:00
Brad Ebinger
c5eacceb3f resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp 
Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034
 2016-11-02 10:33:27 -07: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
5e8b2e4110 Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 am: cf4dc9236e 
am: f41abccf80

Change-Id: I12c36ffe83fbab6bb33d1d60581d6253f6f52fd0
 2016-11-02 01:11:53 +00:00
Joseph Pirozzo
5602b26f41 MAP MCE am: b8fc0679e8 
am: b13240028b

Change-Id: I62a9a758bc46fbb1174fbce4d50f488932d65113
 2016-11-02 01:11:04 +00:00
Joseph Pirozzo
1c21f0378a Pbap disconnect durring connect am: a4f0127fbb 
am: a31933abc3

Change-Id: I73772d90dea4b9f3f70daef1b7b6ce44cfafb0e5
 2016-11-02 01:10:02 +00:00
Joseph Pirozzo
c412914520 MAP MCE am: 631768d814 
am: d94c280a7f

Change-Id: I6a765b9a07204afca2763fb98fdb2e92e08292e5
 2016-11-02 01:09:14 +00: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
Joseph Pirozzo
d94c280a7f MAP MCE 
am: 631768d814

Change-Id: I155fd0e8b44539bf79cec2c6ddb2a4d71b0c23d9
 2016-11-02 01:03:51 +00:00
Sanket Agarwal
cf4dc9236e Merge changes Icac17694,Ic0b651f3,Ifa2cdea7 
* changes:
  MAP MCE
  Pbap disconnect durring connect
  MAP MCE
 2016-11-02 00:55:40 +00:00
Tomasz Mikolajewski
de915e3ade Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 
am: 4c65d49a92

Change-Id: I534e70f5218e0f9be73d919a4c9dd509211729f8
 2016-11-02 00:39:45 +00:00
Joseph Pirozzo
b8fc0679e8 MAP MCE 
Fix @LINK to @link in javadoc.

Bug: 30467210
Change-Id: Icac176947bee971c3f5d11fd4166cf8ceb0a437e
(cherry picked from commit f5fba751d360bbe8294c4640f5ad12a990f13122)
 2016-11-01 17:39:16 -07:00
Joseph Pirozzo
a4f0127fbb Pbap disconnect durring connect 
Durring a connect call disconnect from all other pbap devices rather
than from the device you are trying to connect to.

bug: 28406739
Change-Id: Ic0b651f32a0da18950fbc190b1d4503d69ebd203
(cherry picked from commit bdd24942e47811ffe6bb9814934e6b08a8190e7e)
 2016-11-01 17:39:16 -07:00
Joseph Pirozzo
631768d814 MAP MCE 
Add MAP client code into packages/apps/Bluetooth.  Changes here are to
define the MAP MCE interface and enable its selection when running on a
device that is also running a PBAP client (Car Kitt).

Bug: 30467210
Change-Id: Ifa2cdea7d67f63a2b5f3d971df8ec6d321dc5fee
(cherry picked from commit 433b3054847951e8e7b3864d11990604a66b8651)
 2016-11-01 17:39:16 -07:00
Tomasz Mikolajewski
4c65d49a92 Merge "Add support for opening JAR/ZIP files via FD." 
am: 7f64c195f7

Change-Id: I88af6f42ccd5e6edafa57fd0f147f676da8aa096
 2016-11-02 00:34:47 +00:00
Tomasz Mikolajewski
7f64c195f7 Merge "Add support for opening JAR/ZIP files via FD." 2016-11-02 00:24:07 +00:00
Bryce Lee
e07c4cb4e6 Merge "Add a way to query for supported Bluetooth profiles." am: 0a86c936a6 
am: 6f84631d8d

Change-Id: I8d9bce44587a1740f0acbd09552baf7d8b6990a5
 2016-11-01 23:24:42 +00:00
Bryce Lee
6f84631d8d Merge "Add a way to query for supported Bluetooth profiles." 
am: 0a86c936a6

Change-Id: Id10ad10a5dbcab92e390a7a245772d2b551ad30c
 2016-11-01 23:20:16 +00:00
Treehugger Robot
0a86c936a6 Merge "Add a way to query for supported Bluetooth profiles." 2016-11-01 23:12:22 +00:00
Bryce Lee
f6b74dea04 Add a way to query for supported Bluetooth profiles. 
Currently there is no way to get the profiles supported by the Bluetooth
adapter. Asking for a profile proxy of an unsupported profile does not
fail and can lead to code indefinitely waiting for the proxy response. This
new code will allow for checking the supported profiles before asking for
the proxies.

Bug: 26451648
Change-Id: I4b48e7151f5ca53851aa3b967c143fae140ecd34
(cherry picked from commit b1301fa2849bafd6daa422281dc5200863bc761e)
 2016-11-01 15:13:04 -07:00
Andreas Gampe
8a8f33416b Merge "Zygote: Avoid string concatentation for systrace" am: 8bcd159234 
am: fdfc79a878

Change-Id: I105f07f2b2ca925139da6fc78641ee486eb68410
 2016-11-01 17:24:19 +00:00
Andreas Gampe
fdfc79a878 Merge "Zygote: Avoid string concatentation for systrace" 
am: 8bcd159234

Change-Id: I484e5a56b790f57d097970f727959438debafafb
 2016-11-01 17:19:44 +00:00
Brad Ebinger
5beba8c4d1 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-01 09:29:29 -07:00