diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2015-02-10 00:26:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-10 00:26:51 +0000 |
| commit | 3ca77ccf873f12e116a66d1c1a417fe89f75af85 (patch) | |
| tree | e4793280eee38c992b484bbbce9e6b46fc66a4c4 /api/system-current.txt | |
| parent | d67aff686d467c439970aef4a57a29838bf005c2 (diff) | |
| parent | 455502b7501bdbc55a739083878431c3ba7ef81a (diff) | |
| download | frameworks_base-3ca77ccf873f12e116a66d1c1a417fe89f75af85.zip frameworks_base-3ca77ccf873f12e116a66d1c1a417fe89f75af85.tar.gz frameworks_base-3ca77ccf873f12e116a66d1c1a417fe89f75af85.tar.bz2 | |
am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev
* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
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 d84b1dc..8d24e83 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6415,6 +6415,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); |