Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
191,440 Commits 3 Branches 0 Tags
f555887237665fd2cd16182e63dd7ff5f4b7e708
Commit Graph

581 Commits

Author SHA1 Message Date
Prerepa Viswanadham
d1808401ca Merge changes from topic 'mwd-merge-050415' into mnc-dev 
* changes:
  Merge commit 'b6f59f4' into master_merge
  Merge commit 'f6db0ce' into master_merge
  Merge commit '17455a3' into master_merge
  Merge commit 'b4d5b32' into master_merge
  Merge commit 'a1a2fa7' into master_merge
  Merge commit '8dfdb98' into master_merge
  Merge commit 'eba66c3' into master_merge
 2015-05-05 01:06:38 +00:00
Andre Eisenbach
ab2581398c BluetoothSap class should not be public 
Bug: 20823932
Change-Id: I87dfa10b994f7a14c123bb384925c08b34bfbe67
 2015-05-04 23:20:28 +00:00
Andre Eisenbach
f455986a45 Add documentation for BluetoothSocket.getConnectionType() 
Bug: 20824264
Change-Id: I58aa8f5bbe08ddb252f01f4ad187ae8741963f0b
 2015-05-04 21:56:17 +00:00
Prerepa Viswanadham
971cd2b952 Merge commit 'eba66c3' into master_merge 2015-05-01 10:10:22 -07:00
Wei Wang
3af0a8e48d am 17004d63: am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev 
* commit '17004d636712c092d7ac8fdfcf933572481cebfb':
  Fix a bug in ScanSettings constructor.
 2015-05-01 09:19:54 +00:00
Wei Wang
f2cfe6c0a9 Merge "Fix a bug in ScanSettings constructor." into mnc-dev 2015-05-01 07:51:40 +00:00
Wei Wang
c5065ee98d Fix a bug in ScanSettings constructor. 
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
 2015-05-01 00:50:32 -07:00
Wei Wang
3b72899c71 am c869bbfd: am 50b37f8c: am c90c7604: Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 
* commit 'c869bbfd94549039624f76740f9bf858b25cfa56':
  Honor Ble scanning settings from Settings UI.
 2015-05-01 05:41:17 +00:00
Wei Wang
c90c760431 Merge "Honor Ble scanning settings from Settings UI." into mnc-dev 2015-05-01 05:10:18 +00:00
tturney
5d818eb675 am 129a0b8b: am 94d7494a: am 56c58a2e: Merge "Fix typo. bug: b/20610710" into mnc-dev 
* commit '129a0b8bf9a0e531792ac576d217fbc6e0de96c6':
  Fix typo. bug: b/20610710
 2015-05-01 01:35:02 +00:00
tturney
56c58a2e27 Merge "Fix typo. bug: b/20610710" into mnc-dev 2015-05-01 00:17:41 +00:00
Wei Wang
67d8416b8e Honor Ble scanning settings from Settings UI. 
Bug:20643039

Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
 2015-04-30 14:45:17 -07:00
Wei Wang
4f261b1dc6 am fb63b682: am 46fa9a96: am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev 
* commit 'fb63b6820d13ae3cf66418014a2051e87445edf9':
  Temp workaround to track max beacons.
 2015-04-30 15:34:51 +00:00
Wei Wang
fc9f2d71a6 Temp workaround to track max beacons. 
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
 2015-04-30 00:07:53 -07:00
tturney
1b43e43cb1 Fix typo. 
bug: b/20610710

Change-Id: I7b8e0331daddadcb31f45650f5cd937b1f4f90ff
 2015-04-29 12:01:00 -07:00
Tor Norbye
7b4b844fdf Merge "Annotate some APIs with threading annotations" 2015-04-27 22:51:35 +00:00
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
Tor Norbye
83c6896cbf Annotate some APIs with threading annotations 
Change-Id: I24bda29261cdecbe78b2529866624b9313ca5c03
 2015-04-23 22:14:19 +00:00
Prerepa Viswanadham
5882f5455f Make onlost/onfound APIs public 
Change-Id: I455124478d953d652f216f71d5813782fc9633ab
 2015-04-22 12:04:38 -07: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