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

212888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
613c63c742 Merge "BluetoothMidiDevice: change write type to support JamStik" 
am: 6079b990f1

* commit '6079b990f1461011a9dedb47cc65db1ce062e199':
  BluetoothMidiDevice: change write type to support JamStik
 2015-11-02 23:06:04 +00:00
Glenn Kasten
bd32753700 Merge "BLE-MIDI: change binding for BluetoothMidiService" 
am: 5831944a6e

* commit '5831944a6e99eff746e70d6ee9532ec3e3f32918':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-11-02 23:04:42 +00:00
Glenn Kasten
d8a8500429 Merge "MidiBluetoothService: add new device to HashMap" 
am: 9b07ba4bc3

* commit '9b07ba4bc33319d6db8de173a24eb13b2d7f0b50':
  MidiBluetoothService: add new device to HashMap
 2015-11-02 23:03:18 +00:00
Glenn Kasten
58f41c3b76 Merge "MidiManager: fix double BTLE callback" 
am: bbf34d0bd1

* commit 'bbf34d0bd1bc4f85c9af614291925f5da1fa0459':
  MidiManager: fix double BTLE callback
 2015-11-02 23:01:49 +00:00
Glenn Kasten
350dc16475 Merge "MidiService: update listener with current status when registered" 
am: d4e9b9e4ac

* commit 'd4e9b9e4ac4196d37b0a5e59867f5a51018f4087':
  MidiService: update listener with current status when registered
 2015-11-02 23:00:15 +00:00
Glenn Kasten
6079b990f1 Merge "BluetoothMidiDevice: change write type to support JamStik" 2015-11-02 22:51:29 +00:00
Glenn Kasten
5831944a6e Merge "BLE-MIDI: change binding for BluetoothMidiService" 2015-11-02 22:51:18 +00:00
Glenn Kasten
9b07ba4bc3 Merge "MidiBluetoothService: add new device to HashMap" 2015-11-02 22:51:12 +00:00
Glenn Kasten
bbf34d0bd1 Merge "MidiManager: fix double BTLE callback" 2015-11-02 22:51:02 +00:00
Glenn Kasten
d4e9b9e4ac Merge "MidiService: update listener with current status when registered" 2015-11-02 22:50:50 +00:00
Phil Burk
d11e59ec6b BluetoothMidiDevice: change write type to support JamStik 
Temporarily use a Request instead of a Command so that the JamStik
will be properly enabled.

Bug: 24207964
Change-Id: I3d11732958c46e6039405b5969d5af0db8032fb9
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 95129f50c68c734c5ebdf32ff6b8b9c63cc1ada7)
 2015-11-02 13:31:29 -08:00
Phil Burk
ff23e1b4cb BLE-MIDI: change binding for BluetoothMidiService 
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.

Bug: 23219556
Bug: 23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
 2015-11-02 13:31:29 -08:00
Phil Burk
2e48f1b96e MidiBluetoothService: add new device to HashMap 
The HashMap is being used but devices never added to the map.

Bug: 23429459
Change-Id: I1da5305a56f5bd48e1c5d9345e721ea8dd2eed4e
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit e5f722e55c5708c2b48b8c9688c135e451225032)
 2015-11-02 13:31:29 -08:00
Phil Burk
a471e2cf8c MidiManager: fix double BTLE callback 
Stop openBluetoothDevice() from calling its callback twice.

Bug: 23218338
Change-Id: I2e738b22a124c0336c46bef05680a82ee1f59e79
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit 0ca998d79fe95ded26ec4ff0a1e0a8dc4802684b)
 2015-11-02 13:31:29 -08:00
Phil Burk
3698fca0dc MidiService: update listener with current status when registered 
This will give an app an opportunity to learn whether an input port is busy
before the user tries to connect and then fails.

Bug: 22825043
Change-Id: Ifede60f166dfe66ea15453044fce06f4a8452b18
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit b2355940e3e697deeecd1b6511cd5094f9dc553a)
 2015-11-02 13:31:29 -08:00
Lorenzo Colitti
bce5116b8d Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d am: e4aacaeec9 
am: c52503acf0

* commit 'c52503acf0a5e4140376391f57de539fbe60ea8f':
  Don't crash if a DHCP server doesn't send the server ID option.
 2015-10-29 08:16:31 +00:00
Lorenzo Colitti
c52503acf0 Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev am: a2cc04736d 
am: e4aacaeec9

* commit 'e4aacaeec950691700d717efa894a7b51bc87fe2':
  Don't crash if a DHCP server doesn't send the server ID option.
 2015-10-29 08:09:27 +00:00
Lorenzo Colitti
e4aacaeec9 Merge "Don\'t crash if a DHCP server doesn\'t send the server ID option." into mnc-dr-dev 
am: a2cc04736d

* commit 'a2cc04736d0f9b9621c87ce8d244fd8fd909df7d':
  Don't crash if a DHCP server doesn't send the server ID option.
 2015-10-29 08:02:31 +00:00
Lorenzo Colitti
a2cc04736d Merge "Don't crash if a DHCP server doesn't send the server ID option." into mnc-dr-dev 2015-10-29 07:57:13 +00:00
Bryce Lee
698b33ea7f Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev am: 4636770f0d 
am: 3b6f9f78cf

* commit '3b6f9f78cf0ea09176250059653d05cf6a5282c4':
  Add ability to set whether audio route is allowed in BluetoothHeadsetClient
 2015-10-29 07:23:06 +00:00
Bryce Lee
3b6f9f78cf Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev 
am: 4636770f0d

* commit '4636770f0df6e91cd7fbdf01b958fbdda688db7a':
  Add ability to set whether audio route is allowed in BluetoothHeadsetClient
 2015-10-29 07:16:07 +00:00
Bryce Lee
4636770f0d Merge "Add ability to set whether audio route is allowed in BluetoothHeadsetClient" into cw-e-dev 2015-10-29 07:10:15 +00:00
Lorenzo Colitti
7611f1cdb4 Don't crash if a DHCP server doesn't send the server ID option. 
This violates a MUST in RFC2131, but apparently some
implementations don't know or care.

Bug: 25343517
Change-Id: I80459b58ffe231e7ed64e77bafa157a96b745149
 2015-10-29 16:09:16 +09:00
Bryce Lee
dc13382622 Add ability to set whether audio route is allowed in BluetoothHeadsetClient 
Bug: 25332357
Change-Id: I942ac0dea3e4f8580c44e027a570d0b59822a257
 2015-10-28 22:21:54 -07:00
Bryce Lee
8faa19c826 Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev am: 0a80294c81 
am: 2adf45bee0

* commit '2adf45bee0b423fa6ca758b806a16b968c0a3c65':
  Revert "Declare new interface for headset client bluetooth profile to query."
 2015-10-29 05:19:19 +00:00
Bryce Lee
2adf45bee0 Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev 
am: 0a80294c81

* commit '0a80294c81d86a8bcdc6545b6e31929645cab306':
  Revert "Declare new interface for headset client bluetooth profile to query."
 2015-10-29 05:10:41 +00:00
Bryce Lee
0a80294c81 Merge "Revert "Declare new interface for headset client bluetooth profile to query."" into cw-e-dev 2015-10-29 05:04:06 +00:00
Bryce Lee
70d4210e2e Revert "Declare new interface for headset client bluetooth profile to query." 
This reverts commit 694251eaaa8ea70a9b0427d55e9ede437c83a6d5.

Change-Id: I588206d8aedb96254c27494dddb32ddc3b6ea0ea
 2015-10-29 04:58:38 +00:00
Bryce Lee
2b47b6eed2 Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev am: a841973dee 
am: 8b4f21b108

* commit '8b4f21b108828c08833767c1f3f908e1cd7f8477':
  Declare new interface for headset client bluetooth profile to query.
 2015-10-29 04:53:01 +00:00
Bryce Lee
8b4f21b108 Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev 
am: a841973dee

* commit 'a841973deea9281bbb21035055918c0b0cb3230f':
  Declare new interface for headset client bluetooth profile to query.
 2015-10-29 04:45:09 +00:00
Bryce Lee
a841973dee Merge "Declare new interface for headset client bluetooth profile to query." into cw-e-dev 2015-10-29 04:39:08 +00:00
Bryce Lee
694251eaaa Declare new interface for headset client bluetooth profile to query. 
This is needed in order to allow implementations of the HFP HF side to
define when audio can be routed to the device. This allows for calls dialed
from an AG to be kept on the AG if desired.

Bug: 25332357
Change-Id: I35a554cfc53f88c7dd3059bf52df5c69df9c7415
 2015-10-28 21:06:27 -07:00
Svetoslav Ganov
a1b8d77ca3 Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a am: 35151fbc8b 
am: 08d013d3a1

* commit '08d013d3a1e6306533c2fae1a4581986ffc9a642':
  Make SYSTEM_ALERT_WINDOW development permission
 2015-10-29 01:33:09 +00:00
Svetoslav Ganov
08d013d3a1 Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev am: 2658cb002a 
am: 35151fbc8b

* commit '35151fbc8b028f6633f477fd36044032a03b2bff':
  Make SYSTEM_ALERT_WINDOW development permission
 2015-10-29 01:24:38 +00:00
Svetoslav Ganov
35151fbc8b Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev 
am: 2658cb002a

* commit '2658cb002abae9341c9a82bfeaed764ba5bf97c8':
  Make SYSTEM_ALERT_WINDOW development permission
 2015-10-29 01:16:46 +00:00
Svetoslav Ganov
2658cb002a Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-dev 2015-10-29 01:10:46 +00:00
Anthony Hugh
d592a5a43a Merge "Update permission label strings" into cw-e-dev am: b69cab65d1 
am: 41579ff8fc

* commit '41579ff8fc06ad655e158b1ab825624437489c83':
  Update permission label strings
 2015-10-28 18:38:32 +00:00
Anthony Hugh
41579ff8fc Merge "Update permission label strings" into cw-e-dev 
am: b69cab65d1

* commit 'b69cab65d180c3166ac84e47da0aa0c1c27bbc67':
  Update permission label strings
 2015-10-28 18:29:06 +00:00
Anthony Hugh
b69cab65d1 Merge "Update permission label strings" into cw-e-dev 2015-10-28 18:22:41 +00:00
Ching Tzung Lin
a05beb29da Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e 
am: c45009906a

* commit 'c45009906ade7b25b6c01c02113c044bd9290ffb':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
 2015-10-28 17:41:24 +00:00
Ching Tzung Lin
c45009906a Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev 
am: 36da2a208e

* commit '36da2a208e253d0635bb569cb92ea0e11f489b4e':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset
 2015-10-28 17:33:03 +00:00
Ching Tzung Lin
36da2a208e Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev 2015-10-28 17:25:24 +00:00
Geoff Mendal
4fcebfe20e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours am: d2b3815dda -s ours 
am: 9aa91f99b2  -s ours

* commit '9aa91f99b26ddac01c7045e1a18b6f0116b4eec7':
  Import translations. DO NOT MERGE
 2015-10-28 15:00:44 +00:00
Geoff Mendal
9aa91f99b2 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: c7522c0b1c -s ours 
am: d2b3815dda  -s ours

* commit 'd2b3815dda57702ebbd00a6422d21a52b0604dfa':
  Import translations. DO NOT MERGE
 2015-10-28 14:52:31 +00:00
Geoff Mendal
d2b3815dda Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
am: c7522c0b1c  -s ours

* commit 'c7522c0b1c3b8f445ddc1b75f0600363ecbd27a6':
  Import translations. DO NOT MERGE
 2015-10-28 14:43:38 +00:00
Geoff Mendal
a4993f6f2f Merge "Import translations. DO NOT MERGE" into cw-e-dev am: a4f0ea406d -s ours 
am: 4c55431f51  -s ours

* commit '4c55431f51a3c3c67b3234e4902e7fda5cb81c76':
  Import translations. DO NOT MERGE
 2015-10-28 14:39:12 +00:00
Geoff Mendal
c7522c0b1c Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-28 14:38:11 +00:00
Geoff Mendal
bcefa34c3f Import translations. DO NOT MERGE 
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a
Auto-generated-cl: translation import
 2015-10-28 07:37:31 -07:00
Geoff Mendal
4c55431f51 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: a4f0ea406d  -s ours

* commit 'a4f0ea406d9c4de166ec65541581666e782b3846':
  Import translations. DO NOT MERGE
 2015-10-28 14:29:50 +00:00
Geoff Mendal
e21f906153 Import translations. DO NOT MERGE am: b8afc77c0a -s ours am: 7934d4e206 -s ours 
am: 32076214a4  -s ours

* commit '32076214a40a98553a7c634d8d8a8d1eb2efb625':
  Import translations. DO NOT MERGE
 2015-10-28 14:26:00 +00:00