diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2015-02-10 00:34:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-10 00:34:43 +0000 |
| commit | 8f31fa81e0a79f51ceb301193a2c77ca7f619769 (patch) | |
| tree | e19a56059f8e811c11a71e92e57c5d616948df7b /api/system-current.txt | |
| parent | 24c02c418673a18a287ce0820f0024f7a18ff181 (diff) | |
| parent | 3ca77ccf873f12e116a66d1c1a417fe89f75af85 (diff) | |
| download | frameworks_base-8f31fa81e0a79f51ceb301193a2c77ca7f619769.zip frameworks_base-8f31fa81e0a79f51ceb301193a2c77ca7f619769.tar.gz frameworks_base-8f31fa81e0a79f51ceb301193a2c77ca7f619769.tar.bz2 | |
am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
Add API to check if a Bluetooth connection is encrypted (1/2)
Diffstat (limited to 'api/system-current.txt')
| -rw-r--r-- | api/system-current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index c6d7364..5929978 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6417,6 +6417,8 @@ package android.bluetooth { method public java.lang.String getName(); method public int getType(); method public android.os.ParcelUuid[] getUuids(); + method public boolean isConnected(); + method public boolean isEncrypted(); method public boolean setPairingConfirmation(boolean); method public boolean setPin(byte[]); method public void writeToParcel(android.os.Parcel, int); |