Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
190,006 Commits 3 Branches 0 Tags
c9bb40ea95101f8a46fab29beac02cc7204be320
Commit Graph

563 Commits

Author SHA1 Message Date
Etan Cohen
237a59767d Fix documentation - non-public API. 
Change-Id: I418bf47b197936b2f50b231425312d5b6d272df8
 2015-04-24 18:06:59 -07:00
Etan Cohen
fd840dd603 Bluetooth document fix: remove reference from open API to hidden entities 
Change-Id: I183ae1083727d2e2b96aa503d0e90d81ce3b1a82
 2015-04-24 14:06:58 -07:00
Etan Cohen
b271d27dbc Merge commit 'db1dbb8' into merge2 2015-04-24 14:06:00 -07:00
Etan Cohen
5c0d6f61ab Merge commit '6ddbb5e' into merge2 2015-04-24 13:44:05 -07:00
Prerepa Viswanadham
571bb54c73 Reduce log spam in BluetoothAdapter for getState. 
Change-Id: I38995fc55f12b000d58a769ed67aff623865169b
 2015-04-23 22:31:29 +00:00
Prerepa Viswanadham
db1dbb8895 Manage onfound/lost resources (1/2) 
Provide error callback to app if advertisement tracking resources
can't be reserved

Change-Id: Ie66b2ec7a64b24bbdf3bb22003a4a7eb46623792
 2015-04-21 23:19:22 +00:00
Yorke Lee
6a30835551 Fix make update-api 
Change-Id: Iaee002c64096fbd6ba05d6484cc50840146a4af0
 2015-04-15 23:46:03 -07:00
Casper Bonde
2a5f608e7a Add support for Bluetooth Sim Access Profile (2/4) 
Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
 2015-04-15 23:45:51 -07:00
Nitin Arora
d055adbe2c Bluetooth LE background operation mode (2/2) 
Changes include new framework APIs to enable and disable Bluetooth LE
separately from Bluetooth Classic. Along with handling the new states
in the Bluetooth manager service.

Change-Id: Idf667981f48fcbcb6dfda1aa77ea8bab1b2361f0
 2015-04-15 23:45:30 -07:00
Yorke Lee
b67927126f Fix make update-api 
Change-Id: Iaee002c64096fbd6ba05d6484cc50840146a4af0
 2015-04-15 11:55:20 -07:00
Casper Bonde
d05bd467ba Add support for Bluetooth Sim Access Profile (2/4) 
Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
 2015-04-15 10:54:08 -07:00
Nitin Arora
6ddbb5e55f Bluetooth LE background operation mode (2/2) 
Changes include new framework APIs to enable and disable Bluetooth LE
separately from Bluetooth Classic. Along with handling the new states
in the Bluetooth manager service.

Change-Id: Idf667981f48fcbcb6dfda1aa77ea8bab1b2361f0
 2015-04-15 16:26:42 +00:00
Vinit Deshpande
80047faad9 am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release 
557d2f5 Merge "Add ConnectivityManager.reportNetworkConnectivity() API" into m-wireless-dev
ab5267a Fix onLost/onFound logic in isSettingsAndFilterComboAllowed
bfd17b7 Add ConnectivityManager.reportNetworkConnectivity() API
238e0f9 OBEX Over L2CAP + SDP search API for BT profiles
31a94f4 Add ConnectivityManager.getActiveNetwork(). Rework NetID allocation in ConnectivityService so registerNetworkAgent() can return the allocated NetID.
bf18bed Merge "Non-functional code cleanup of ConnectivityService." into m-wireless-dev
db8784e Merge "Cleanup of Video Call pause functionality." into m-wireless-dev
e75b9e3 Non-functional code cleanup of ConnectivityService.
e593d0a Onfound onlost feature.
0326f58 Merge "API for config app." into m-wireless-dev
e9b056f API for config app.
d5351e7 RTT framework interface update
582b868 Unhide Network.openConnection(URL, Proxy).
0d719ca Fix typos in ConnectivityManager documentation.

Change-Id: Ib4c88f6d7ad1b24227b032555c62a5804194384b
 2015-04-14 16:15:02 -07:00
tturney
ab5267a403 Fix onLost/onFound logic in isSettingsAndFilterComboAllowed 
bug: b/20185066

Change-Id: If9e3fecd12ee86aa12fa63688babeff694bee62e
 2015-04-13 14:56:27 -07:00
Prerepa Viswanadham
d4ea01b4ac Merge "Merge commit 'e593d0a' into merge_work" 2015-04-12 21:46:15 +00:00
Casper Bonde
238e0f934f OBEX Over L2CAP + SDP search API for BT profiles 
- Updated OBEX to support SRM
- Added support for OBEX over l2cap and SRM.
- Minor bugfixes, and reduce CPU load ALOT
- Added support to send responses without body data.
- Extend BluetoothSocket to support L2CAP
- Added functionality to get the channel number
  needed to be able to create an SDP record with the channel number.
- Added interface to get socket type and max packet sizes.
- Added interface to perform SDP search and get the resulting
  SDP record data.

Change-Id: I9d37a00ce73dfffc0e3ce03eab5511ba3a86e5b8
 2015-04-11 01:49:11 +00:00
Prerepa Viswanadham
57bf2a8a38 Merge commit 'e593d0a' into merge_work 
Change-Id: I4f8ae40fc446cd9cda4d5c6ec99469a98dda595b
 2015-04-10 15:58:10 -07:00
Scott Kennedy
e7b03631d2 Fix a typo in BluetoothLeScanner documentation 
Change-Id: Id19dae9a583c0ef621789604277e3f6c6aead80c
 2015-04-10 10:25:34 -07:00
Prerepa Viswanadham
e593d0aec6 Onfound onlost feature. 
Change-Id: I5475cb21183abab8cf04af486ff7692396801b92
Signed-off-by: Prerepa Viswanadham <dham@google.com>
 2015-04-07 22:32:41 +00:00
Etan Cohen
eb864d4000 Merge commit 'd91f193' into merge2 2015-04-01 09:31:43 -07:00
Wei Wang
d91f19354d Add API for BLE_SCAN_ALWAYS_AVAILABLE feature. 
Change-Id: I83e966d4db076db367ded71bfb50c39e57568156
 2015-03-27 14:05:37 -07:00
Prerepa Viswanadham
4209a28270 Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge 
Change-Id: I49aab437af220f1139cfd2d0a9c362acce31074e
 2015-03-24 13:46:08 -07:00
Wei Wang
e1d0f58aa8 Make Opportunistic Scan API public. 
Change-Id: I47da0f7e385f0a72815e493852283a44370aa1ce
 2015-03-18 16:38:08 -07:00
Wei Wang
4190762d94 Add opportunistic ble scan mode. (1/2) 
Bug: 19003667
Change-Id: Ibed7e9ec604cb11a58736d168d3d19ece53fc77a
(cherry picked from commit 7508ddf8b53bf350a3424ef71f1ce62ea17006b8)
 2015-03-17 22:04:01 +00:00
Adam Lesinski
488caeb702 Change WiFi and Bluetooth ActivityEnergyInfo classes 
Have them take an elapsed time millis timestamp instead
of having the constructor call System.currentTimeMillis.

Change-Id: Ic9ca8f92347c336beee8ebcc3407de2c1e5b4073
 2015-03-09 15:28:29 -07:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base. 
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
 2015-02-28 14:47:49 -05:00
Andre Eisenbach
7518ade9f6 am cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit 'cd623416455100f64ef3f0be7ced27ffc04938a8':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:50:06 +00:00
Andre Eisenbach
cd62341645 am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '8f31fa81e0a79f51ceb301193a2c77ca7f619769':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:42:55 +00:00
Andre Eisenbach
455502b750 Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 2015-02-10 00:21:43 +00:00
Matthew Xie
be96280fda am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit 'a96869fc1323faa5989803c5235c4c28e1094a16':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 22:22:29 +00:00
Matthew Xie
a96869fc13 am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit '24c02c418673a18a287ce0820f0024f7a18ff181':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 22:14:10 +00:00
Andre Eisenbach
2b8696e3a9 Add API to check if a Bluetooth connection is encrypted (1/2) 
Bug: 19186961
Change-Id: I24656a07ee23ebfe067a9dfb9c1bc4041c782d8c
 2015-02-09 11:31:06 -08:00
Matthew Xie
60675b2273 Separate the protection of mProxyServiceStateCallbacks from that of mService 
The overuse of mManagerCallback caused a deaklock.
Bug: 19264190

Change-Id: Iff20019ff0c99bb5f36435feb15e43e280a8e102
 2015-02-06 14:13:56 -08:00
RoboErik
4197cb60bc Move mute/unmute handling to adjust volume paths 
This deprecates the setStreamMute and setStreamSolo APIs. Soloing is no
longer supported and muting is redirected through the adjust volume APIs.

Also updates the hidden master versions of these APIs.

Change-Id: I65d2a5d5fc15b386bd497abf8ca6869fec75a26a
 2015-01-29 16:14:30 -08:00
Prerepa Viswanadham
543945669b am 76552bb9: am e77adabe: Don\'t compute flags length for scan response 
automerge: 34c32f4

* commit '34c32f4034f64306efde87a52e28f56c3e5c1d2a':
  Don't compute flags length for scan response
 2015-01-23 18:10:40 +00:00
Prerepa Viswanadham
34c32f4034 am 76552bb9: am e77adabe: Don\'t compute flags length for scan response 
* commit '76552bb96398e03b21c7d88a302a6ffb59641c16':
  Don't compute flags length for scan response
 2015-01-23 18:01:54 +00:00
Prerepa Viswanadham
e77adabeaf Don't compute flags length for scan response 
Bug 19041626

Change-Id: I7d8aa12e133477fc60d12b474f57313961021975
 2015-01-23 17:51:43 +00:00
Andre Eisenbach
284e66e23c am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
automerge: 7ea97e2

* commit '7ea97e28e6a2271fd4d60c07b4fa83e019e3474a':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:30:33 +00:00
Andre Eisenbach
7ea97e28e6 am f6b62a9d: am cd460538: Merge "Don\'t send the onServiceDisconnected callback after close." into lmp-mr1-dev 
* commit 'f6b62a9d913441cb400fc60f3187fc9c1f28dc97':
  Don't send the onServiceDisconnected callback after close.
 2014-12-16 17:27:46 +00:00
Benjamin Franz
c88b6bdcfa Don't send the onServiceDisconnected callback after close. 
Bug: 18667402
Change-Id: Ia029fd861d643f6646fb124d76ca2a1d2a1a695a
 2014-12-16 15:33:03 +00:00
Andre Eisenbach
1ee272b064 am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393 
* commit 'f60f29d060a538bd59b79ab8bd69ca6a31d26c29':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 21:57:40 +00:00
Andre Eisenbach
f60f29d060 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
automerge: e832393

* commit 'e8323934c7dd01228b6550ac5dcad08999371a61':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 18:49:41 +00:00
Andre Eisenbach
0fd06a19bd Prevent NullPointerException in getStringValue if no value is set 
Bug: 18686365
Change-Id: I5f5d07ef49500e0d8118ba04aaf373ae4514f034
 2014-12-09 16:42:14 -08:00
Justin Harrison
04e8a5fb4c am e0b2fa5c: am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit 'e0b2fa5c57c64ffbfebcdcca0b2c96a70cf49983':
  Add UUID for Pbap client
 2014-12-09 00:18:35 +00:00
Benjamin Franz
9c0e993d4e am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3':
  Change the routing path of bluetooth headset connections.
 2014-12-09 00:17:44 +00:00
Justin Harrison
e0b2fa5c57 am 87797c05: am 4a9cecb1: Merge "Add UUID for Pbap client" into lmp-mr1-dev 
* commit '87797c056c98eb527c85ccb7b7da33c99093e1bc':
  Add UUID for Pbap client
 2014-12-08 19:16:37 +00:00
Benjamin Franz
f4a76651b0 am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev 
* commit '5f1ea2e68b138316f2a56d0a1de382ac47f7b11c':
  Change the routing path of bluetooth headset connections.
 2014-12-08 19:14:56 +00:00
Prerepa Viswanadham
fd5e847cb6 am 12120998: am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
* commit '12120998f8b34c809d8f29790a8f74e624b26e38':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
 2014-12-05 21:19:53 +00:00
Prerepa Viswanadham
12120998f8 am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
 2014-12-05 20:18:38 +00:00
Justin Harrison
4a9cecb1f0 Merge "Add UUID for Pbap client" into lmp-mr1-dev 2014-12-05 19:41:55 +00:00