Additionally the Bluetooth Message Access profile allows a remote BT-MAP client to push a + * message to a folder - e.g. outbox or draft. The Bluetooth profile implementation will place a + * new message in one of these existing folders through the content provider. * - * ContentProvider.call() is used for these purposes, and the METHOD_UPDATE_FOLDER - * method name shall trigger an update of the specified folder for a specified - * account. + *
ContentProvider.call() is used for these purposes, and the METHOD_UPDATE_FOLDER method + * name shall trigger an update of the specified folder for a specified account. * - * This shall be a non blocking call simply starting the update, and the update should - * both send and receive messages, depending on what makes sense for the specified - * folder. - * Bundle extra parameter will carry two INTEGER (long) values: - * EXTRA_UPDATE_ACCOUNT_ID containing the account_id - * EXTRA_UPDATE_FOLDER_ID containing the folder_id of the folder to update + *
This shall be a non blocking call simply starting the update, and the update should both + * send and receive messages, depending on what makes sense for the specified folder. Bundle + * extra parameter will carry two INTEGER (long) values: EXTRA_UPDATE_ACCOUNT_ID containing the + * account_id EXTRA_UPDATE_FOLDER_ID containing the folder_id of the folder to update * - * The status for send complete of messages shall be reported by updating the sent-flag - * and e.g. for outbox messages, move them to the sent folder in the message table of the - * content provider and trigger a change notification to any attached content observer. + *
The status for send complete of messages shall be reported by updating the sent-flag and + * e.g. for outbox messages, move them to the sent folder in the message table of the content + * provider and trigger a change notification to any attached content observer. */ public static final String METHOD_UPDATE_FOLDER = "UpdateFolder"; + public static final String EXTRA_UPDATE_ACCOUNT_ID = "UpdateAccountId"; public static final String EXTRA_UPDATE_FOLDER_ID = "UpdateFolderId"; /** - * The Bluetooth Message Access profile allows a remote BT-MAP Client to update - * the owners presence and chat state + * The Bluetooth Message Access profile allows a remote BT-MAP Client to update the owners + * presence and chat state * - * ContentProvider.call() is used for these purposes, and the METHOD_SET_OWNER_STATUS - * method name shall trigger a change in owner/users presence or chat properties for an - * account or conversation. + *
ContentProvider.call() is used for these purposes, and the METHOD_SET_OWNER_STATUS method + * name shall trigger a change in owner/users presence or chat properties for an account or + * conversation. * - * This shall be a non blocking call simply setting the properties, and the change should - * be sent to the remote server/users, depending on what property is changed. - * Bundle extra parameter will carry following values: - * EXTRA_ACCOUNT_ID containing the account_id - * EXTRA_PRESENCE_STATE containing the presence state of the owner account - * EXTRA_PRESENCE_STATUS containing the presence status text from the owner - * EXTRA_LAST_ACTIVE containing the last activity time stamp of the owner account - * EXTRA_CHAT_STATE containing the chat state of a specific conversation - * EXTRA_CONVERSATION_ID containing the conversation that is changed + *
This shall be a non blocking call simply setting the properties, and the change should be + * sent to the remote server/users, depending on what property is changed. Bundle extra + * parameter will carry following values: EXTRA_ACCOUNT_ID containing the account_id + * EXTRA_PRESENCE_STATE containing the presence state of the owner account EXTRA_PRESENCE_STATUS + * containing the presence status text from the owner EXTRA_LAST_ACTIVE containing the last + * activity time stamp of the owner account EXTRA_CHAT_STATE containing the chat state of a + * specific conversation EXTRA_CONVERSATION_ID containing the conversation that is changed */ public static final String METHOD_SET_OWNER_STATUS = "SetOwnerStatus"; + public static final String EXTRA_ACCOUNT_ID = "AccountId"; // Is this needed public static final String EXTRA_PRESENCE_STATE = "PresenceState"; public static final String EXTRA_PRESENCE_STATUS = "PresenceStatus"; @@ -130,73 +125,71 @@ public final class BluetoothMapContract { * The Bluetooth Message Access profile can inform the messaging application of the Bluetooth * state, whether is is turned 'on' or 'off' * - * ContentProvider.call() is used for these purposes, and the METHOD_SET_BLUETOOTH_STATE - * method name shall trigger a change in owner/users presence or chat properties for an - * account or conversation. + *
ContentProvider.call() is used for these purposes, and the METHOD_SET_BLUETOOTH_STATE + * method name shall trigger a change in owner/users presence or chat properties for an account + * or conversation. * - * This shall be a non blocking call simply setting the properties. + *
This shall be a non blocking call simply setting the properties. * - * Bundle extra parameter will carry following values: - * EXTRA_BLUETOOTH_STATE containing the state of the Bluetooth connectivity + *
Bundle extra parameter will carry following values: EXTRA_BLUETOOTH_STATE containing the + * state of the Bluetooth connectivity */ public static final String METHOD_SET_BLUETOOTH_STATE = "SetBtState"; + public static final String EXTRA_BLUETOOTH_STATE = "BluetoothState"; /** - * These column names are used as last path segment of the URI (getLastPathSegment()). - * Access to a specific row in the tables is done by using the where-clause, hence - * support for .../#id if not needed for the Email clients. - * The URI format for accessing the tables are as follows: - * content://ProviderAuthority/TABLE_ACCOUNT - * content://ProviderAuthority/account_id/TABLE_MESSAGE - * content://ProviderAuthority/account_id/TABLE_FOLDER - * content://ProviderAuthority/account_id/TABLE_CONVERSATION - * content://ProviderAuthority/account_id/TABLE_CONVOCONTACT - **/ + * These column names are used as last path segment of the URI (getLastPathSegment()). Access to + * a specific row in the tables is done by using the where-clause, hence support for .../#id if + * not needed for the Email clients. The URI format for accessing the tables are as follows: + * content://ProviderAuthority/TABLE_ACCOUNT + * content://ProviderAuthority/account_id/TABLE_MESSAGE + * content://ProviderAuthority/account_id/TABLE_FOLDER + * content://ProviderAuthority/account_id/TABLE_CONVERSATION + * content://ProviderAuthority/account_id/TABLE_CONVOCONTACT + */ /** - * Build URI representing the given Accounts data-set in a - * Bluetooth provider. When queried, the direct URI for the account - * with the given accountID is returned. + * Build URI representing the given Accounts data-set in a Bluetooth provider. When queried, the + * direct URI for the account with the given accountID is returned. */ public static Uri buildAccountUri(String authority) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(TABLE_ACCOUNT) .build(); } /** - * Build URI representing the given Account data-set with specific Id in a - * Bluetooth provider. When queried, the direct URI for the account - * with the given accountID is returned. + * Build URI representing the given Account data-set with specific Id in a Bluetooth provider. + * When queried, the direct URI for the account with the given accountID is returned. */ public static Uri buildAccountUriwithId(String authority, String accountId) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(TABLE_ACCOUNT) .appendPath(accountId) .build(); } - /** - * Build URI representing the entire Message table in a - * Bluetooth provider. - */ + /** Build URI representing the entire Message table in a Bluetooth provider. */ public static Uri buildMessageUri(String authority) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(TABLE_MESSAGE) .build(); } /** - * Build URI representing the given Message data-set in a - * Bluetooth provider. When queried, the URI for the Messages - * with the given accountID is returned. + * Build URI representing the given Message data-set in a Bluetooth provider. When queried, the + * URI for the Messages with the given accountID is returned. */ public static Uri buildMessageUri(String authority, String accountId) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(accountId) .appendPath(TABLE_MESSAGE) @@ -204,12 +197,12 @@ public final class BluetoothMapContract { } /** - * Build URI representing the given Message data-set with specific messageId in a - * Bluetooth provider. When queried, the direct URI for the account - * with the given accountID is returned. + * Build URI representing the given Message data-set with specific messageId in a Bluetooth + * provider. When queried, the direct URI for the account with the given accountID is returned. */ public static Uri buildMessageUriWithId(String authority, String accountId, String messageId) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(accountId) .appendPath(TABLE_MESSAGE) @@ -218,12 +211,12 @@ public final class BluetoothMapContract { } /** - * Build URI representing the given Message data-set in a - * Bluetooth provider. When queried, the direct URI for the folder - * with the given accountID is returned. + * Build URI representing the given Message data-set in a Bluetooth provider. When queried, the + * direct URI for the folder with the given accountID is returned. */ public static Uri buildFolderUri(String authority, String accountId) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(accountId) .appendPath(TABLE_FOLDER) @@ -231,12 +224,12 @@ public final class BluetoothMapContract { } /** - * Build URI representing the given Message data-set in a - * Bluetooth provider. When queried, the direct URI for the conversation - * with the given accountID is returned. + * Build URI representing the given Message data-set in a Bluetooth provider. When queried, the + * direct URI for the conversation with the given accountID is returned. */ public static Uri buildConversationUri(String authority, String accountId) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(accountId) .appendPath(TABLE_CONVERSATION) @@ -244,24 +237,24 @@ public final class BluetoothMapContract { } /** - * Build URI representing the given Contact data-set in a - * Bluetooth provider. When queried, the direct URI for the contacts - * with the given accountID is returned. + * Build URI representing the given Contact data-set in a Bluetooth provider. When queried, the + * direct URI for the contacts with the given accountID is returned. */ public static Uri buildConvoContactsUri(String authority) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(TABLE_CONVOCONTACT) .build(); } /** - * Build URI representing the given Contact data-set in a - * Bluetooth provider. When queried, the direct URI for the contacts - * with the given accountID is returned. + * Build URI representing the given Contact data-set in a Bluetooth provider. When queried, the + * direct URI for the contacts with the given accountID is returned. */ public static Uri buildConvoContactsUri(String authority, String accountId) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(accountId) .appendPath(TABLE_CONVOCONTACT) @@ -269,13 +262,13 @@ public final class BluetoothMapContract { } /** - * Build URI representing the given Contact data-set in a - * Bluetooth provider. When queried, the direct URI for the contact - * with the given contactID and accountID is returned. + * Build URI representing the given Contact data-set in a Bluetooth provider. When queried, the + * direct URI for the contact with the given contactID and accountID is returned. */ - public static Uri buildConvoContactsUriWithId(String authority, String accountId, - String contactId) { - return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) + public static Uri buildConvoContactsUriWithId( + String authority, String accountId, String contactId) { + return new Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) .appendPath(accountId) .appendPath(TABLE_CONVOCONTACT) @@ -283,572 +276,529 @@ public final class BluetoothMapContract { .build(); } - /** - * @hide - */ + /** @hide */ public static final String TABLE_ACCOUNT = "Account"; + public static final String TABLE_MESSAGE = "Message"; public static final String TABLE_MESSAGE_PART = "Part"; public static final String TABLE_FOLDER = "Folder"; public static final String TABLE_CONVERSATION = "Conversation"; public static final String TABLE_CONVOCONTACT = "ConvoContact"; - /** - * Mandatory folders for the Bluetooth message access profile. - * The email client shall at least implement the following root folders. - * E.g. as a mapping for them such that the naming will match the underlying - * matching folder ID's. + * Mandatory folders for the Bluetooth message access profile. The email client shall at least + * implement the following root folders. E.g. as a mapping for them such that the naming will + * match the underlying matching folder ID's. */ public static final String FOLDER_NAME_INBOX = "inbox"; + public static final String FOLDER_NAME_SENT = "sent"; public static final String FOLDER_NAME_OUTBOX = "outbox"; public static final String FOLDER_NAME_DRAFT = "draft"; public static final String FOLDER_NAME_DELETED = "deleted"; public static final String FOLDER_NAME_OTHER = "other"; - /** - * Folder IDs to be used with Instant Messaging virtual folders - */ + /** Folder IDs to be used with Instant Messaging virtual folders */ public static final long FOLDER_ID_OTHER = 0; + public static final long FOLDER_ID_INBOX = 1; public static final long FOLDER_ID_SENT = 2; public static final long FOLDER_ID_DRAFT = 3; public static final long FOLDER_ID_OUTBOX = 4; public static final long FOLDER_ID_DELETED = 5; - /** - * To push RFC2822 encoded messages into a folder and read RFC2822 encoded messages from - * a folder, the openFile() interface will be used as follows: - * Open a file descriptor to a message. - * Two modes supported for read: With and without attachments. - * One mode exist for write and the actual content will be with or without - * attachments. + * To push RFC2822 encoded messages into a folder and read RFC2822 encoded messages from a + * folder, the openFile() interface will be used as follows: Open a file descriptor to a + * message. Two modes supported for read: With and without attachments. One mode exist for write + * and the actual content will be with or without attachments. * - * mode will be "r" for read and "w" for write, never "rw". + *
mode will be "r" for read and "w" for write, never "rw". * - * URI format: - * The URI scheme is as follows. - * For reading messages with attachments: - * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId - * Note: This shall be an offline operation, including only message parts and attachments - * already downloaded to the device. + *
URI format: The URI scheme is as follows. For reading messages with attachments: + * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId Note: This shall be an offline + * operation, including only message parts and attachments already downloaded to the device. * - * For reading messages without attachments: - * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId/FILE_MSG_NO_ATTACHMENTS - * Note: This shall be an offline operation, including only message parts already - * downloaded to the device. + *
For reading messages without attachments: + * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId/FILE_MSG_NO_ATTACHMENTS Note: This + * shall be an offline operation, including only message parts already downloaded to the device. * - * For downloading and reading messages with attachments: - * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId/FILE_MSG_DOWNLOAD - * Note: This shall download the message content and all attachments if possible, - * else throw an IOException. + *
For downloading and reading messages with attachments: + * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId/FILE_MSG_DOWNLOAD Note: This shall + * download the message content and all attachments if possible, else throw an IOException. * - * For downloading and reading messages without attachments: - * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId/FILE_MSG_DOWNLOAD_NO_ATTACHMENTS - * Note: This shall download the message content if possible, else throw an IOException. + *
For downloading and reading messages without attachments: + * content://ProviderAuthority/account_id/TABLE_MESSAGE/msgId/FILE_MSG_DOWNLOAD_NO_ATTACHMENTS + * Note: This shall download the message content if possible, else throw an IOException. * - * When reading from the file descriptor, the content provider shall return a stream - * of bytes containing a RFC2822 encoded message, as if the message was send to an email - * server. + *
When reading from the file descriptor, the content provider shall return a stream of bytes + * containing a RFC2822 encoded message, as if the message was send to an email server. * - * When a byte stream is written to the file descriptor, the content provider shall - * decode the RFC2822 encoded data and insert the message into the TABLE_MESSAGE at the ID - * supplied in URI - additionally the message content shall be stored in the underlying - * data base structure as if the message was received from an email server. The Message ID - * will be created using a insert on the TABLE_MESSAGE prior to calling openFile(). - * Hence the procedure for inserting a message is: - * - uri/msgId = insert(uri, value: folderId=xxx) - * - fd = openFile(uri/msgId) - * - fd.write (RFC2822 encoded data) + *
When a byte stream is written to the file descriptor, the content provider shall decode + * the RFC2822 encoded data and insert the message into the TABLE_MESSAGE at the ID supplied in + * URI - additionally the message content shall be stored in the underlying data base structure + * as if the message was received from an email server. The Message ID will be created using a + * insert on the TABLE_MESSAGE prior to calling openFile(). Hence the procedure for inserting a + * message is: - uri/msgId = insert(uri, value: folderId=xxx) - fd = openFile(uri/msgId) - + * fd.write (RFC2822 encoded data) * - * The Bluetooth Message Access Client might not know what to put into the From: - * header nor have a valid time stamp, hence the content provider shall check - * if the From: and Date: headers have been set by the message written, else - * it must fill in appropriate values. + *
The Bluetooth Message Access Client might not know what to put into the From: header nor + * have a valid time stamp, hence the content provider shall check if the From: and Date: + * headers have been set by the message written, else it must fill in appropriate values. */ public static final String FILE_MSG_NO_ATTACHMENTS = "NO_ATTACHMENTS"; + public static final String FILE_MSG_DOWNLOAD = "DOWNLOAD"; public static final String FILE_MSG_DOWNLOAD_NO_ATTACHMENTS = "DOWNLOAD_NO_ATTACHMENTS"; /** - * Account Table - * The columns needed to supply account information. - * The e-mail client app may choose to expose all e-mails as being from the same account, - * but it is not recommended, as this would be a violation of the Bluetooth specification. - * The Bluetooth Message Access settings activity will provide the user the ability to - * change the FLAG_EXPOSE values for each account in this table. - * The Bluetooth Message Access service will read the values when Bluetooth is turned on, - * and again on every notified change through the content observer interface. + * Account Table The columns needed to supply account information. The e-mail client app may + * choose to expose all e-mails as being from the same account, but it is not recommended, as + * this would be a violation of the Bluetooth specification. The Bluetooth Message Access + * settings activity will provide the user the ability to change the FLAG_EXPOSE values for each + * account in this table. The Bluetooth Message Access service will read the values when + * Bluetooth is turned on, and again on every notified change through the content observer + * interface. */ public interface AccountColumns { /** * The unique ID for a row. - *
Type: INTEGER (long)
+ * + *Type: INTEGER (long) */ String _ID = "_id"; /** - * The account name to display to the user on the device when selecting whether - * or not to share the account over Bluetooth. - * - * The account display name should not reveal any sensitive information e.g. email- - * address, as it will be added to the Bluetooth SDP record, which can be read by - * any Bluetooth enabled device. (Access to any account content is only provided to - * authenticated devices). It is recommended that if the email client uses the email - * address as account name, then the address should be obfuscated (i.e. replace "@" - * with ".") - *
Type: TEXT
- * read-only + * The account name to display to the user on the device when selecting whether or not to + * share the account over Bluetooth. + * + *The account display name should not reveal any sensitive information e.g. email- + * address, as it will be added to the Bluetooth SDP record, which can be read by any + * Bluetooth enabled device. (Access to any account content is only provided to + * authenticated devices). It is recommended that if the email client uses the email address + * as account name, then the address should be obfuscated (i.e. replace "@" with ".") + * + *
Type: TEXT read-only */ String ACCOUNT_DISPLAY_NAME = "account_display_name"; /** - * Expose this account to other authenticated Bluetooth devices. If the expose flag - * is set, this account will be listed as an available account to access from another - * Bluetooth device. + * Expose this account to other authenticated Bluetooth devices. If the expose flag is set, + * this account will be listed as an available account to access from another Bluetooth + * device. * - * This is a read/write flag, that can be set either from within the E-mail client - * UI or the Bluetooth settings menu. + *
This is a read/write flag, that can be set either from within the E-mail client UI or + * the Bluetooth settings menu. * - * It is recommended to either ask the user whether to expose the account, or set this - * to "show" as default. + *
It is recommended to either ask the user whether to expose the account, or set this to + * "show" as default. * - * This setting shall not be used to enforce whether or not an account should be shared - * or not if the account is bound by an administrative security policy. In this case - * the email app should not list the account at all if it is not to be sharable over BT. + *
This setting shall not be used to enforce whether or not an account should be shared + * or not if the account is bound by an administrative security policy. In this case the + * email app should not list the account at all if it is not to be sharable over BT. * - *
Type: INTEGER (boolean) hide = 0, show = 1
+ *Type: INTEGER (boolean) hide = 0, show = 1 */ String FLAG_EXPOSE = "flag_expose"; - /** * The account unique identifier representing this account. For most IM clients this will be * the fully qualified user name to which an invite message can be sent, from another use. * - * e.g.: "map_test_user_12345@gmail.com" - for a Hangouts account + *
e.g.: "map_test_user_12345@gmail.com" - for a Hangouts account * - * This value will only be visible to authenticated Bluetooth devices, and will be + *
This value will only be visible to authenticated Bluetooth devices, and will be * transmitted using an encrypted link. - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ String ACCOUNT_UCI = "account_uci"; - /** - * The Bluetooth SIG maintains a list of assigned numbers(text strings) for IM clients. - * If your client/account has such a string, this is the place to return it. - * If supported by both devices, the presence of this prefix will make it possible to - * respond to a message by making a voice-call, using the same account information. - * (The call will be made using the HandsFree profile) + * The Bluetooth SIG maintains a list of assigned numbers(text strings) for IM clients. If + * your client/account has such a string, this is the place to return it. If supported by + * both devices, the presence of this prefix will make it possible to respond to a message + * by making a voice-call, using the same account information. (The call will be made using + * the HandsFree profile) * https://www.bluetooth.org/en-us/specification/assigned-numbers/uniform-caller-identifiers * - * e.g.: "hgus" - for Hangouts + *
e.g.: "hgus" - for Hangouts * - *
Type: TEXT
- * read-only + *Type: TEXT read-only */ String ACCOUNT_UCI_PREFIX = "account_uci_PREFIX"; - } /** - * Message Data Parts Table - * The columns needed to contain the actual data of the messageparts in IM messages. - * Each "part" has its own row and represent a single mime-part in a multipart-mime + * Message Data Parts Table The columns needed to contain the actual data of the messageparts in + * IM messages. Each "part" has its own row and represent a single mime-part in a multipart-mime * formatted message. - * */ public interface MessagePartColumns { /** * The unique ID for a row. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String _ID = "_id"; + // FIXME add message parts for IM attachments /** - * is this a text part yes/no? - *
Type: TEXT
- * read-only + * is this a text part yes/no? + * + *Type: TEXT read-only */ String TEXT = "text"; /** - * The charset used in the content if it is text or 8BIT if it is - * binary data + * The charset used in the content if it is text or 8BIT if it is binary data * - *
Type: TEXT
- * read-only + *Type: TEXT read-only */ String CHARSET = "charset"; /** - * The filename representing the data file of the raw data in the database - * If this is empty, then it must be text and part of the message body. - * This is the name that the data will have when it is included as attachment + * The filename representing the data file of the raw data in the database If this is empty, + * then it must be text and part of the message body. This is the name that the data will + * have when it is included as attachment * - *
Type: TEXT
- * read-only + *Type: TEXT read-only */ - String FILENAME = "filename"; /** - * Identifier for the content in the data. This can be used to - * refer directly to the data in the body part. + * Identifier for the content in the data. This can be used to refer directly to the data in + * the body part. * - *
Type: TEXT
- * read-only + *Type: TEXT read-only */ - String CONTENT_ID = "cid"; /** * The raw data in either text format or binary format * - *
Type: BLOB
- * read-only + *Type: BLOB read-only */ String RAW_DATA = "raw_data"; - } /** - * The actual message table containing all messages. - * Content that must support filtering using WHERE clauses: - * - To, From, Cc, Bcc, Date, ReadFlag, PriorityFlag, folder_id, account_id - * Additional content that must be supplied: - * - Subject, AttachmentFlag, LoadedState, MessageSize, AttachmentSize - * Content that must support update: - * - FLAG_READ and FOLDER_ID (FOLDER_ID is used to move a message to deleted) - * Additional insert of a new message with the following values shall be supported: - * - FOLDER_ID + * The actual message table containing all messages. Content that must support filtering using + * WHERE clauses: - To, From, Cc, Bcc, Date, ReadFlag, PriorityFlag, folder_id, account_id + * Additional content that must be supplied: - Subject, AttachmentFlag, LoadedState, + * MessageSize, AttachmentSize Content that must support update: - FLAG_READ and FOLDER_ID + * (FOLDER_ID is used to move a message to deleted) Additional insert of a new message with the + * following values shall be supported: - FOLDER_ID * - * When doing an insert on this table, the actual content of the message (subject, - * date etc) written through file-i/o takes precedence over the inserted values and should - * overwrite them. + *
When doing an insert on this table, the actual content of the message (subject, date etc) + * written through file-i/o takes precedence over the inserted values and should overwrite them. */ public interface MessageColumns extends EmailMessageColumns { /** * The unique ID for a row. - *
Type: INTEGER (long)
+ * + *Type: INTEGER (long) */ String _ID = "_id"; /** - * The date the message was received as a unix timestamp - * (miliseconds since 00:00:00 UTC 1/1-1970). + * The date the message was received as a unix timestamp (miliseconds since 00:00:00 UTC + * 1/1-1970). * - *
Type: INTEGER (long)
- * read-only + *Type: INTEGER (long) read-only */ String DATE = "date"; - //TODO REMOVE WHEN Parts Table is in place + // TODO REMOVE WHEN Parts Table is in place /** * Message body. Used by Instant Messaging - *
Type: TEXT
- * read-only. + * + *Type: TEXT read-only. */ String BODY = "body"; /** * Message subject. - *
Type: TEXT
- * read-only. + * + *Type: TEXT read-only. */ String SUBJECT = "subject"; /** * Message Read flag - *
Type: INTEGER (boolean) unread = 0, read = 1
- * read/write + * + *Type: INTEGER (boolean) unread = 0, read = 1 read/write */ String FLAG_READ = "flag_read"; /** * Message Priority flag - *
Type: INTEGER (boolean) normal priority = 0, high priority = 1
- * read-only + * + *Type: INTEGER (boolean) normal priority = 0, high priority = 1 read-only */ String FLAG_HIGH_PRIORITY = "high_priority"; /** * Reception state - the amount of the message that have been loaded from the server. - *
Type: TEXT see RECEPTION_STATE_* constants below
- * read-only + * + *Type: TEXT see RECEPTION_STATE_* constants below read-only */ String RECEPTION_STATE = "reception_state"; /** * Delivery state - the amount of the message that have been loaded from the server. - *
Type: TEXT see DELIVERY_STATE_* constants below
- * read-only + * + *Type: TEXT see DELIVERY_STATE_* constants below read-only */ String DEVILERY_STATE = "delivery_state"; - /** To be able to filter messages with attachments, we need this flag. - *
Type: INTEGER (boolean) no attachment = 0, attachment = 1
- * read-only + /** + * To be able to filter messages with attachments, we need this flag. + * + *Type: INTEGER (boolean) no attachment = 0, attachment = 1 read-only */ String FLAG_ATTACHMENT = "flag_attachment"; - /** The overall size in bytes of the attachments of the message. - *
Type: INTEGER
+ /** + * The overall size in bytes of the attachments of the message. + * + *Type: INTEGER */ String ATTACHMENT_SIZE = "attachment_size"; - /** The mine type of the attachments for the message. - *
Type: TEXT
- * read-only + /** + * The mine type of the attachments for the message. + * + *Type: TEXT read-only */ String ATTACHMENT_MINE_TYPES = "attachment_mime_types"; - /** The overall size in bytes of the message including any attachments. - * This value is informative only and should be the size an email client - * would display as size for the message. - *
Type: INTEGER
- * read-only + /** + * The overall size in bytes of the message including any attachments. This value is + * informative only and should be the size an email client would display as size for the + * message. + * + *Type: INTEGER read-only */ String MESSAGE_SIZE = "message_size"; - /** Indicates that the message or a part of it is protected by a DRM scheme. - *
Type: INTEGER (boolean) no DRM = 0, DRM protected = 1
- * read-only + /** + * Indicates that the message or a part of it is protected by a DRM scheme. + * + *Type: INTEGER (boolean) no DRM = 0, DRM protected = 1 read-only */ String FLAG_PROTECTED = "flag_protected"; /** - * A comma-delimited list of FROM addresses in RFC2822 format. - * The list must be compatible with Rfc822Tokenizer.tokenize(); - *
Type: TEXT
- * read-only + * A comma-delimited list of FROM addresses in RFC2822 format. The list must be compatible + * with Rfc822Tokenizer.tokenize(); + * + *Type: TEXT read-only */ String FROM_LIST = "from_list"; /** - * A comma-delimited list of TO addresses in RFC2822 format. - * The list must be compatible with Rfc822Tokenizer.tokenize(); - *
Type: TEXT
- * read-only + * A comma-delimited list of TO addresses in RFC2822 format. The list must be compatible + * with Rfc822Tokenizer.tokenize(); + * + *Type: TEXT read-only */ String TO_LIST = "to_list"; /** * The unique ID for a row in the folder table in which this message belongs. - *
Type: INTEGER (long)
- * read/write + * + *Type: INTEGER (long) read/write */ String FOLDER_ID = "folder_id"; /** * The unique ID for a row in the account table which owns this message. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String ACCOUNT_ID = "account_id"; /** - * The ID identify the thread/conversation a message belongs to. - * If no thread id is available, set value to "-1" - *
Type: INTEGER (long)
- * read-only + * The ID identify the thread/conversation a message belongs to. If no thread id is + * available, set value to "-1" + * + *Type: INTEGER (long) read-only */ String THREAD_ID = "thread_id"; /** * The Name of the thread/conversation a message belongs to. - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ String THREAD_NAME = "thread_name"; } public interface EmailMessageColumns { - /** - * A comma-delimited list of CC addresses in RFC2822 format. - * The list must be compatible with Rfc822Tokenizer.tokenize(); - *
Type: TEXT
- * read-only + * A comma-delimited list of CC addresses in RFC2822 format. The list must be compatible + * with Rfc822Tokenizer.tokenize(); + * + *Type: TEXT read-only */ String CC_LIST = "cc_list"; /** - * A comma-delimited list of BCC addresses in RFC2822 format. - * The list must be compatible with Rfc822Tokenizer.tokenize(); - *
Type: TEXT
- * read-only + * A comma-delimited list of BCC addresses in RFC2822 format. The list must be compatible + * with Rfc822Tokenizer.tokenize(); + * + *Type: TEXT read-only */ String BCC_LIST = "bcc_list"; /** - * A comma-delimited list of REPLY-TO addresses in RFC2822 format. - * The list must be compatible with Rfc822Tokenizer.tokenize(); - *
Type: TEXT
- * read-only + * A comma-delimited list of REPLY-TO addresses in RFC2822 format. The list must be + * compatible with Rfc822Tokenizer.tokenize(); + * + *Type: TEXT read-only */ String REPLY_TO_LIST = "reply_to_List"; - - } - /** - * Indicates the complete message has been delivered to the recipient. - */ + /** Indicates the complete message has been delivered to the recipient. */ public static final String DELIVERY_STATE_DELIVERED = "delivered"; - /** - * Indicates that the complete message has been sent from the MSE to the remote network. - */ + + /** Indicates that the complete message has been sent from the MSE to the remote network. */ public static final String DELIVERY_STATE_SENT = "sent"; /** - * Indicates that the message, including any attachments, has been received from the - * server to the device. + * Indicates that the message, including any attachments, has been received from the server to + * the device. */ public static final String RECEPTION_STATE_COMPLETE = "complete"; - /** - * Indicates the message is partially received from the email server. - */ + + /** Indicates the message is partially received from the email server. */ public static final String RECEPTION_STATE_FRACTIONED = "fractioned"; - /** - * Indicates that only a notification about the message have been received. - */ + + /** Indicates that only a notification about the message have been received. */ public static final String RECEPTION_STATE_NOTIFICATION = "notification"; /** - * Message folder structure - * MAP enforces use of a folder structure with mandatory folders: - * - inbox, outbox, sent, deleted, draft - * User defined folders are supported. - * The folder table must provide filtering (use of WHERE clauses) of the following entries: - * - account_id (linking the folder to an e-mail account) - * - parent_id (linking the folders individually) - * The folder table must have a folder name for each entry, and the mandatory folders - * MUST exist for each account_id. The folders may be empty. - * Use the FOLDER_NAME_xxx constants for the mandatory folders. Their names must - * not be translated into other languages, as the folder browsing is string based, and - * many Bluetooth Message Clients will use these strings to navigate to the folders. + * Message folder structure MAP enforces use of a folder structure with mandatory folders: - + * inbox, outbox, sent, deleted, draft User defined folders are supported. The folder table must + * provide filtering (use of WHERE clauses) of the following entries: - account_id (linking the + * folder to an e-mail account) - parent_id (linking the folders individually) The folder table + * must have a folder name for each entry, and the mandatory folders MUST exist for each + * account_id. The folders may be empty. Use the FOLDER_NAME_xxx constants for the mandatory + * folders. Their names must not be translated into other languages, as the folder browsing is + * string based, and many Bluetooth Message Clients will use these strings to navigate to the + * folders. */ public interface FolderColumns { /** * The unique ID for a row. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String _ID = "_id"; /** * The folder display name to present to the user. - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ String NAME = "name"; /** * The _id-key to the account this folder refers to. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String ACCOUNT_ID = "account_id"; /** * The _id-key to the parent folder. -1 for root folders. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String PARENT_FOLDER_ID = "parent_id"; } /** * Message conversation structure. Enables use of a conversation structure for messages across - * folders, further binding contacts to conversations. - * Content that must be supplied: - * - Name, LastActivity, ReadStatus, VersionCounter - * Content that must support update: - * - READ_STATUS, LAST_ACTIVITY and VERSION_COUNTER (VERSION_COUNTER used to validity of _ID) - * Additional insert of a new conversation with the following values shall be supported: - * - FOLDER_ID - * When querying this table, the cursor returned must contain one row for each contact member - * in a thread. - * For filter/search parameters attributes to the URI will be used. The following columns must - * support filtering: - * - ConvoContactColumns.NAME - * - ConversationColumns.THREAD_ID - * - ConversationColumns.LAST_ACTIVITY - * - ConversationColumns.READ_STATUS + * folders, further binding contacts to conversations. Content that must be supplied: - Name, + * LastActivity, ReadStatus, VersionCounter Content that must support update: - READ_STATUS, + * LAST_ACTIVITY and VERSION_COUNTER (VERSION_COUNTER used to validity of _ID) Additional insert + * of a new conversation with the following values shall be supported: - FOLDER_ID When querying + * this table, the cursor returned must contain one row for each contact member in a thread. For + * filter/search parameters attributes to the URI will be used. The following columns must + * support filtering: - ConvoContactColumns.NAME - ConversationColumns.THREAD_ID - + * ConversationColumns.LAST_ACTIVITY - ConversationColumns.READ_STATUS */ public interface ConversationColumns extends ConvoContactColumns { /** * The unique ID for a row. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ -// Should not be needed anymore public static final String _ID = "_id"; + // Should not be needed anymore public static final String _ID = "_id"; /** * The unique ID for a Thread. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String THREAD_ID = "thread_id"; /** * The unique ID for a row. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ -// TODO: IS THIS NECESSARY - or do we need the thread ID to hold thread Id from message -// or can we be sure we are in control and can use the _ID and put that in the message DB - //public static final String THREAD_ID = "thread_id"; + // TODO: IS THIS NECESSARY - or do we need the thread ID to hold thread Id from message + // or can we be sure we are in control and can use the _ID and put that in the message + // DB + // public static final String THREAD_ID = "thread_id"; /** * The type of conversation, see {@link ConversationType} - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ -// TODO: IS THIS NECESSARY - no conversation type is available in the latest, -// guess it can be found from number of contacts in the conversation - //public static final String TYPE = "type"; + // TODO: IS THIS NECESSARY - no conversation type is available in the latest, + // guess it can be found from number of contacts in the conversation + // public static final String TYPE = "type"; /** * The name of the conversation, e.g. group name in case of group chat - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ String THREAD_NAME = "thread_name"; /** - * The time stamp of the last activity in the conversation as a unix timestamp - * (miliseconds since 00:00:00 UTC 1/1-1970) - *
Type: INTEGER (long)
- * read-only + * The time stamp of the last activity in the conversation as a unix timestamp (miliseconds + * since 00:00:00 UTC 1/1-1970) + * + *Type: INTEGER (long) read-only */ String LAST_THREAD_ACTIVITY = "last_thread_activity"; /** * The status on the conversation, either 'read' or 'unread' - *
Type: INTEGER (boolean) unread = 0, read = 1
- * read/write + * + *Type: INTEGER (boolean) unread = 0, read = 1 read/write */ String READ_STATUS = "read_status"; /** * A counter that keep tack of version of the table content, count up on ID reuse - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ -// TODO: IS THIS NECESSARY - skal den ligge i databasen? + // TODO: IS THIS NECESSARY - skal den ligge i databasen? // CB: If we need it, it must be in the database, or initialized with a random value at // BT-ON // UPDATE: TODO: Change to the last_activity time stamp (as a long value). This will @@ -856,110 +806,96 @@ public final class BluetoothMapContract { String VERSION_COUNTER = "version_counter"; /** - * A short description of the latest activity on conversation - typically - * part of the last message. - *
Type: TEXT
- * read-only + * A short description of the latest activity on conversation - typically part of the last + * message. + * + *Type: TEXT read-only */ String SUMMARY = "convo_summary"; - - } /** - * MAP enables access to contacts for the conversation - * The conversation table must provide filtering (using WHERE clauses) of following entries: - * - convo_id linking contacts to conversations - * - x_bt_uid linking contacts to PBAP contacts - * The conversation contact table must have a convo_id and a name for each entry. + * MAP enables access to contacts for the conversation The conversation table must provide + * filtering (using WHERE clauses) of following entries: - convo_id linking contacts to + * conversations - x_bt_uid linking contacts to PBAP contacts The conversation contact table + * must have a convo_id and a name for each entry. */ public interface ConvoContactColumns extends ChatStatusColumns, PresenceColumns { /** * The unique ID for a contact in Conversation - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ -// Should not be needed anymore public static final String _ID = "_id"; + // Should not be needed anymore public static final String _ID = "_id"; /** * The ID of the conversation the contact is part of. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String CONVO_ID = "convo_id"; /** * The name of contact in instant message application - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ String NAME = "name"; /** * The nickname of contact in instant message group chat conversation. - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ String NICKNAME = "nickname"; - /** * The unique ID for all Bluetooth contacts available through PBAP. - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String X_BT_UID = "x_bt_uid"; /** - * The unique ID for the contact within the domain of the interfacing service. - * (UCI: Unique Call Identity) - * It is expected that a message send to this ID will reach the recipient regardless - * through which interface the message is send. - * For E-mail this will be the e-mail address, for Google+ this will be the e-mail address - * associated with the contact account. - * This ID - *
Type: TEXT
- * read-only + * The unique ID for the contact within the domain of the interfacing service. (UCI: Unique + * Call Identity) It is expected that a message send to this ID will reach the recipient + * regardless through which interface the message is send. For E-mail this will be the + * e-mail address, for Google+ this will be the e-mail address associated with the contact + * account. This ID + * + *Type: TEXT read-only */ String UCI = "x_bt_uci"; } - /** - * The name of query parameter used to filter on recipient - */ + /** The name of query parameter used to filter on recipient */ public static final String FILTER_RECIPIENT_SUBSTRING = "rec_sub_str"; - /** - * The name of query parameter used to filter on originator - */ + /** The name of query parameter used to filter on originator */ public static final String FILTER_ORIGINATOR_SUBSTRING = "org_sub_str"; /** - * The name of query parameter used to filter on read status. - * - true - return only threads with all messages marked as read - * - false - return only threads with one or more unread messages - * - omitted as query parameter - do not filter on read status + * The name of query parameter used to filter on read status. - true - return only threads with + * all messages marked as read - false - return only threads with one or more unread messages - + * omitted as query parameter - do not filter on read status */ public static final String FILTER_READ_STATUS = "read"; /** - * Time in ms since epoch. For conversations this will be for last activity - * as a unix timestamp (miliseconds since 00:00:00 UTC 1/1-1970) + * Time in ms since epoch. For conversations this will be for last activity as a unix timestamp + * (miliseconds since 00:00:00 UTC 1/1-1970) */ public static final String FILTER_PERIOD_BEGIN = "t_begin"; /** - * Time in ms since epoch. For conversations this will be for last activity - * as a unix timestamp (miliseconds since 00:00:00 UTC 1/1-1970) + * Time in ms since epoch. For conversations this will be for last activity as a unix timestamp + * (miliseconds since 00:00:00 UTC 1/1-1970) */ public static final String FILTER_PERIOD_END = "t_end"; - /** - * Filter for a specific ThreadId - */ + /** Filter for a specific ThreadId */ public static final String FILTER_THREAD_ID = "thread_id"; - public interface ChatState { int UNKNOWN = 0; int INACITVE = 1; @@ -970,51 +906,49 @@ public final class BluetoothMapContract { } /** - * Instant Messaging contact chat state information - * MAP enables access to contacts chat state for the instant messaging application - * The chat state table must provide filtering (use of WHERE clauses) of the following entries: - * - contact_id (linking chat state to contacts) - * - thread_id (linking chat state to conversations and messages) - * The presence table must have a contact_id for each entry. + * Instant Messaging contact chat state information MAP enables access to contacts chat state + * for the instant messaging application The chat state table must provide filtering (use of + * WHERE clauses) of the following entries: - contact_id (linking chat state to contacts) - + * thread_id (linking chat state to conversations and messages) The presence table must have a + * contact_id for each entry. */ public interface ChatStatusColumns { -// /** -// * The contact ID of a instant messaging contact. -// *
Type: TEXT
-// * read-only -// */ -// public static final String CONTACT_ID = "contact_id"; -// -// /** -// * The thread id for a conversation. -// *Type: INTEGER (long)
-// * read-only -// */ -// public static final String CONVO_ID = "convo_id"; + // /** + // * The contact ID of a instant messaging contact. + // *Type: TEXT
+ // * read-only + // */ + // public static final String CONTACT_ID = "contact_id"; + // + // /** + // * The thread id for a conversation. + // *Type: INTEGER (long)
+ // * read-only + // */ + // public static final String CONVO_ID = "convo_id"; /** * The chat state of contact in conversation, see {@link ChatState} - *Type: INTERGER
- * read-only + * + *Type: INTERGER read-only */ String CHAT_STATE = "chat_state"; -// /** -// * The geo location of the contact -// *
Type: TEXT
-// * read-only -// */ -//// TODO: IS THIS NEEDED - not in latest specification -// public static final String GEOLOC = "geoloc"; + // /** + // * The geo location of the contact + // *Type: TEXT
+ // * read-only + // */ + //// TODO: IS THIS NEEDED - not in latest specification + // public static final String GEOLOC = "geoloc"; /** * The time stamp of the last time this contact was active in the conversation - *Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only */ String LAST_ACTIVE = "last_active"; - } public interface PresenceState { @@ -1028,196 +962,183 @@ public final class BluetoothMapContract { } /** - * Instant Messaging contact presence information - * MAP enables access to contacts presences information for the instant messaging application - * The presence table must provide filtering (use of WHERE clauses) of the following entries: - * - contact_id (linking contacts to presence) + * Instant Messaging contact presence information MAP enables access to contacts presences + * information for the instant messaging application The presence table must provide filtering + * (use of WHERE clauses) of the following entries: - contact_id (linking contacts to presence) * The presence table must have a contact_id for each entry. */ public interface PresenceColumns { -// /** -// * The contact ID of a instant messaging contact. -// *
Type: TEXT
-// * read-only -// */ -// public static final String CONTACT_ID = "contact_id"; + // /** + // * The contact ID of a instant messaging contact. + // *Type: TEXT
+ // * read-only + // */ + // public static final String CONTACT_ID = "contact_id"; /** * The presence state of contact, see {@link PresenceState} - *Type: INTERGER
- * read-only + * + *Type: INTERGER read-only */ String PRESENCE_STATE = "presence_state"; /** * The priority of contact presence - *
Type: INTERGER
- * read-only + * + *Type: INTERGER read-only */ -// TODO: IS THIS NEEDED - not in latest specification + // TODO: IS THIS NEEDED - not in latest specification String PRIORITY = "priority"; /** * The last status text from contact - *
Type: TEXT
- * read-only + * + *Type: TEXT read-only */ String STATUS_TEXT = "status_text"; /** * The time stamp of the last time the contact was online - *
Type: INTEGER (long)
- * read-only + * + *Type: INTEGER (long) read-only
*/
String LAST_ONLINE = "last_online";
-
}
+ /** A projection of all the columns in the Message table */
+ public static final String[] BT_MESSAGE_PROJECTION =
+ new String[] {
+ MessageColumns._ID,
+ MessageColumns.DATE,
+ MessageColumns.SUBJECT,
+ // TODO REMOVE WHEN Parts Table is in place
+ MessageColumns.BODY,
+ MessageColumns.MESSAGE_SIZE,
+ MessageColumns.FOLDER_ID,
+ MessageColumns.FLAG_READ,
+ MessageColumns.FLAG_PROTECTED,
+ MessageColumns.FLAG_HIGH_PRIORITY,
+ MessageColumns.FLAG_ATTACHMENT,
+ MessageColumns.ATTACHMENT_SIZE,
+ MessageColumns.FROM_LIST,
+ MessageColumns.TO_LIST,
+ MessageColumns.CC_LIST,
+ MessageColumns.BCC_LIST,
+ MessageColumns.REPLY_TO_LIST,
+ MessageColumns.RECEPTION_STATE,
+ MessageColumns.DEVILERY_STATE,
+ MessageColumns.THREAD_ID
+ };
+
+ public static final String[] BT_INSTANT_MESSAGE_PROJECTION =
+ new String[] {
+ MessageColumns._ID,
+ MessageColumns.DATE,
+ MessageColumns.SUBJECT,
+ MessageColumns.MESSAGE_SIZE,
+ MessageColumns.FOLDER_ID,
+ MessageColumns.FLAG_READ,
+ MessageColumns.FLAG_PROTECTED,
+ MessageColumns.FLAG_HIGH_PRIORITY,
+ MessageColumns.FLAG_ATTACHMENT,
+ MessageColumns.ATTACHMENT_SIZE,
+ MessageColumns.ATTACHMENT_MINE_TYPES,
+ MessageColumns.FROM_LIST,
+ MessageColumns.TO_LIST,
+ MessageColumns.RECEPTION_STATE,
+ MessageColumns.DEVILERY_STATE,
+ MessageColumns.THREAD_ID,
+ MessageColumns.THREAD_NAME
+ };
+
+ /** A projection of all the columns in the Account table */
+ public static final String[] BT_ACCOUNT_PROJECTION =
+ new String[] {
+ AccountColumns._ID, AccountColumns.ACCOUNT_DISPLAY_NAME, AccountColumns.FLAG_EXPOSE,
+ };
/**
- * A projection of all the columns in the Message table
- */
- public static final String[] BT_MESSAGE_PROJECTION = new String[]{
- MessageColumns._ID,
- MessageColumns.DATE,
- MessageColumns.SUBJECT,
- //TODO REMOVE WHEN Parts Table is in place
- MessageColumns.BODY,
- MessageColumns.MESSAGE_SIZE,
- MessageColumns.FOLDER_ID,
- MessageColumns.FLAG_READ,
- MessageColumns.FLAG_PROTECTED,
- MessageColumns.FLAG_HIGH_PRIORITY,
- MessageColumns.FLAG_ATTACHMENT,
- MessageColumns.ATTACHMENT_SIZE,
- MessageColumns.FROM_LIST,
- MessageColumns.TO_LIST,
- MessageColumns.CC_LIST,
- MessageColumns.BCC_LIST,
- MessageColumns.REPLY_TO_LIST,
- MessageColumns.RECEPTION_STATE,
- MessageColumns.DEVILERY_STATE,
- MessageColumns.THREAD_ID
- };
-
- public static final String[] BT_INSTANT_MESSAGE_PROJECTION = new String[]{
- MessageColumns._ID,
- MessageColumns.DATE,
- MessageColumns.SUBJECT,
- MessageColumns.MESSAGE_SIZE,
- MessageColumns.FOLDER_ID,
- MessageColumns.FLAG_READ,
- MessageColumns.FLAG_PROTECTED,
- MessageColumns.FLAG_HIGH_PRIORITY,
- MessageColumns.FLAG_ATTACHMENT,
- MessageColumns.ATTACHMENT_SIZE,
- MessageColumns.ATTACHMENT_MINE_TYPES,
- MessageColumns.FROM_LIST,
- MessageColumns.TO_LIST,
- MessageColumns.RECEPTION_STATE,
- MessageColumns.DEVILERY_STATE,
- MessageColumns.THREAD_ID,
- MessageColumns.THREAD_NAME
- };
-
- /**
- * A projection of all the columns in the Account table
- */
- public static final String[] BT_ACCOUNT_PROJECTION = new String[]{
- AccountColumns._ID, AccountColumns.ACCOUNT_DISPLAY_NAME, AccountColumns.FLAG_EXPOSE,
- };
-
- /**
- * A projection of all the columns in the Account table
- * TODO: Is this the way to differentiate
- */
- public static final String[] BT_IM_ACCOUNT_PROJECTION = new String[]{
- AccountColumns._ID,
- AccountColumns.ACCOUNT_DISPLAY_NAME,
- AccountColumns.FLAG_EXPOSE,
- AccountColumns.ACCOUNT_UCI,
- AccountColumns.ACCOUNT_UCI_PREFIX
- };
-
- /**
- * A projection of all the columns in the Folder table
- */
- public static final String[] BT_FOLDER_PROJECTION = new String[]{
- FolderColumns._ID,
- FolderColumns.NAME,
- FolderColumns.ACCOUNT_ID,
- FolderColumns.PARENT_FOLDER_ID
- };
-
-
- /**
- * A projection of all the columns in the Conversation table
- */
- public static final String[] BT_CONVERSATION_PROJECTION = new String[]{
- /* Thread information */
- ConversationColumns.THREAD_ID,
- ConversationColumns.THREAD_NAME,
- ConversationColumns.READ_STATUS,
- ConversationColumns.LAST_THREAD_ACTIVITY,
- ConversationColumns.VERSION_COUNTER,
- ConversationColumns.SUMMARY,
- /* Contact information */
- ConversationColumns.UCI,
- ConversationColumns.NAME,
- ConversationColumns.NICKNAME,
- ConversationColumns.CHAT_STATE,
- ConversationColumns.LAST_ACTIVE,
- ConversationColumns.X_BT_UID,
- ConversationColumns.PRESENCE_STATE,
- ConversationColumns.STATUS_TEXT,
- ConversationColumns.PRIORITY
- };
-
- /**
- * A projection of the Contact Info and Presence columns in the Contact Info in table
- */
- public static final String[] BT_CONTACT_CHATSTATE_PRESENCE_PROJECTION = new String[]{
- ConvoContactColumns.UCI,
- ConvoContactColumns.CONVO_ID,
- ConvoContactColumns.NAME,
- ConvoContactColumns.NICKNAME,
- ConvoContactColumns.X_BT_UID,
- ConvoContactColumns.CHAT_STATE,
- ConvoContactColumns.LAST_ACTIVE,
- ConvoContactColumns.PRESENCE_STATE,
- ConvoContactColumns.PRIORITY,
- ConvoContactColumns.STATUS_TEXT,
- ConvoContactColumns.LAST_ONLINE
- };
-
- /**
- * A projection of the Contact Info the columns in Contacts Info table
+ * A projection of all the columns in the Account table TODO: Is this the way to differentiate
*/
- public static final String[] BT_CONTACT_PROJECTION = new String[]{
- ConvoContactColumns.UCI,
- ConvoContactColumns.CONVO_ID,
- ConvoContactColumns.X_BT_UID,
- ConvoContactColumns.NAME,
- ConvoContactColumns.NICKNAME
- };
-
-
- /**
- * A projection of all the columns in the Chat Status table
- */
- public static final String[] BT_CHATSTATUS_PROJECTION = new String[]{
- ChatStatusColumns.CHAT_STATE, ChatStatusColumns.LAST_ACTIVE,
- };
-
- /**
- * A projection of all the columns in the Presence table
- */
- public static final String[] BT_PRESENCE_PROJECTION = new String[]{
- PresenceColumns.PRESENCE_STATE,
- PresenceColumns.PRIORITY,
- PresenceColumns.STATUS_TEXT,
- PresenceColumns.LAST_ONLINE
- };
-
+ public static final String[] BT_IM_ACCOUNT_PROJECTION =
+ new String[] {
+ AccountColumns._ID,
+ AccountColumns.ACCOUNT_DISPLAY_NAME,
+ AccountColumns.FLAG_EXPOSE,
+ AccountColumns.ACCOUNT_UCI,
+ AccountColumns.ACCOUNT_UCI_PREFIX
+ };
+
+ /** A projection of all the columns in the Folder table */
+ public static final String[] BT_FOLDER_PROJECTION =
+ new String[] {
+ FolderColumns._ID,
+ FolderColumns.NAME,
+ FolderColumns.ACCOUNT_ID,
+ FolderColumns.PARENT_FOLDER_ID
+ };
+
+ /** A projection of all the columns in the Conversation table */
+ public static final String[] BT_CONVERSATION_PROJECTION =
+ new String[] {
+ /* Thread information */
+ ConversationColumns.THREAD_ID,
+ ConversationColumns.THREAD_NAME,
+ ConversationColumns.READ_STATUS,
+ ConversationColumns.LAST_THREAD_ACTIVITY,
+ ConversationColumns.VERSION_COUNTER,
+ ConversationColumns.SUMMARY,
+ /* Contact information */
+ ConversationColumns.UCI,
+ ConversationColumns.NAME,
+ ConversationColumns.NICKNAME,
+ ConversationColumns.CHAT_STATE,
+ ConversationColumns.LAST_ACTIVE,
+ ConversationColumns.X_BT_UID,
+ ConversationColumns.PRESENCE_STATE,
+ ConversationColumns.STATUS_TEXT,
+ ConversationColumns.PRIORITY
+ };
+
+ /** A projection of the Contact Info and Presence columns in the Contact Info in table */
+ public static final String[] BT_CONTACT_CHATSTATE_PRESENCE_PROJECTION =
+ new String[] {
+ ConvoContactColumns.UCI,
+ ConvoContactColumns.CONVO_ID,
+ ConvoContactColumns.NAME,
+ ConvoContactColumns.NICKNAME,
+ ConvoContactColumns.X_BT_UID,
+ ConvoContactColumns.CHAT_STATE,
+ ConvoContactColumns.LAST_ACTIVE,
+ ConvoContactColumns.PRESENCE_STATE,
+ ConvoContactColumns.PRIORITY,
+ ConvoContactColumns.STATUS_TEXT,
+ ConvoContactColumns.LAST_ONLINE
+ };
+
+ /** A projection of the Contact Info the columns in Contacts Info table */
+ public static final String[] BT_CONTACT_PROJECTION =
+ new String[] {
+ ConvoContactColumns.UCI,
+ ConvoContactColumns.CONVO_ID,
+ ConvoContactColumns.X_BT_UID,
+ ConvoContactColumns.NAME,
+ ConvoContactColumns.NICKNAME
+ };
+
+ /** A projection of all the columns in the Chat Status table */
+ public static final String[] BT_CHATSTATUS_PROJECTION =
+ new String[] {
+ ChatStatusColumns.CHAT_STATE, ChatStatusColumns.LAST_ACTIVE,
+ };
+
+ /** A projection of all the columns in the Presence table */
+ public static final String[] BT_PRESENCE_PROJECTION =
+ new String[] {
+ PresenceColumns.PRESENCE_STATE,
+ PresenceColumns.PRIORITY,
+ PresenceColumns.STATUS_TEXT,
+ PresenceColumns.LAST_ONLINE
+ };
}
diff --git a/android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java b/android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
index 29e2f0de6395a1a9a90bf69f427ba36a7d22297d..a5ee32357f8cd3de44fe179f97eb6b7161c44cbf 100644
--- a/android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
+++ b/android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
@@ -38,9 +38,8 @@ import java.util.List;
import java.util.Map;
/**
- * A base implementation of the BluetoothMapEmailContract.
- * A base class for a ContentProvider that allows access to Email messages from a Bluetooth
- * device through the Message Access Profile.
+ * A base implementation of the BluetoothMapEmailContract. A base class for a ContentProvider that
+ * allows access to Email messages from a Bluetooth device through the Message Access Profile.
*/
public abstract class BluetoothMapEmailProvider extends ContentProvider {
@@ -57,32 +56,35 @@ public abstract class BluetoothMapEmailProvider extends ContentProvider {
private String mAuthority;
private UriMatcher mMatcher;
-
private PipeReader mPipeReader = new PipeReader();
private PipeWriter mPipeWriter = new PipeWriter();
/**
* Write the content of a message to a stream as MIME encoded RFC-2822 data.
+ *
* @param accountId the ID of the account to which the message belong
* @param messageId the ID of the message to write to the stream
* @param includeAttachment true if attachments should be included
- * @param download true if any missing part of the message shall be downloaded
- * before written to the stream. The download flag will determine
- * whether or not attachments shall be downloaded or only the message content.
+ * @param download true if any missing part of the message shall be downloaded before written to
+ * the stream. The download flag will determine whether or not attachments shall be
+ * downloaded or only the message content.
* @param out the FileOurputStream to write to.
* @throws IOException
*/
- protected abstract void WriteMessageToStream(long accountId, long messageId,
- boolean includeAttachment, boolean download, FileOutputStream out) throws IOException;
+ protected abstract void WriteMessageToStream(
+ long accountId,
+ long messageId,
+ boolean includeAttachment,
+ boolean download,
+ FileOutputStream out)
+ throws IOException;
/**
* @return the CONTENT_URI exposed. This will be used to send out notifications.
*/
protected abstract Uri getContentUri();
- /**
- * Implementation is provided by the parent class.
- */
+ /** Implementation is provided by the parent class. */
@Override
public void attachInfo(Context context, ProviderInfo info) {
mAuthority = info.authority;
@@ -105,37 +107,35 @@ public abstract class BluetoothMapEmailProvider extends ContentProvider {
super.attachInfo(context, info);
}
-
/**
- * Interface to write a stream of data to a pipe. Use with
- * {@link ContentProvider#openPipeHelper}.
+ * Interface to write a stream of data to a pipe. Use with {@link
+ * ContentProvider#openPipeHelper}.
*/
public interface PipeDataReader Mode will be "r" or "w".
*
- * URI format:
- * The URI scheme is as follows.
- * For messages with attachments:
- * content://com.android.mail.bluetoothprovider/Messages/msgId#
+ * URI format: The URI scheme is as follows. For messages with attachments:
+ * content://com.android.mail.bluetoothprovider/Messages/msgId#
*
- * For messages without attachments:
- * content://com.android.mail.bluetoothprovider/Messages/msgId#/NO_ATTACHMENTS
+ * For messages without attachments:
+ * content://com.android.mail.bluetoothprovider/Messages/msgId#/NO_ATTACHMENTS
*
- * UPDATE: For write.
- * First create a message in the DB using insert into the message DB
- * Then open a file handle to the #id
- * write the data to a stream created from the fileHandle.
+ * UPDATE: For write. First create a message in the DB using insert into the message DB Then
+ * open a file handle to the #id write the data to a stream created from the fileHandle.
*
* @param uri the URI to open. ../Messages/#id
- * @param mode the mode to use. The following modes exist: - UPDATE do not work - use URI
- * - "read_with_attachments" - to read an e-mail including any attachments
- * - "read_no_attachments" - to read an e-mail excluding any attachments
- * - "write" - to add a mime encoded message to the database. This write
- * should not trigger the message to be send.
+ * @param mode the mode to use. The following modes exist: - UPDATE do not work - use URI -
+ * "read_with_attachments" - to read an e-mail including any attachments -
+ * "read_no_attachments" - to read an e-mail excluding any attachments - "write" - to add a
+ * mime encoded message to the database. This write should not trigger the message to be
+ * send.
* @return the ParcelFileDescriptor
- * @throws FileNotFoundException
+ * @throws FileNotFoundException
*/
@Override
public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
final long callingId = Binder.clearCallingIdentity();
if (D) {
- Log.d(TAG, "openFile(): uri=" + uri.toString() + " - getLastPathSegment() = "
- + uri.getLastPathSegment());
+ Log.d(
+ TAG,
+ "openFile(): uri="
+ + uri.toString()
+ + " - getLastPathSegment() = "
+ + uri.getLastPathSegment());
}
try {
/* To be able to do abstraction of the file IO, we simply ignore the URI at this
@@ -348,40 +355,42 @@ public abstract class BluetoothMapEmailProvider extends ContentProvider {
}
/**
- * A helper function for implementing {@link #openFile}, for
- * creating a data pipe and background thread allowing you to stream
- * data back from the client. This function returns a new
- * ParcelFileDescriptor that should be returned to the caller (the caller
- * is responsible for closing it).
+ * A helper function for implementing {@link #openFile}, for creating a data pipe and background
+ * thread allowing you to stream data back from the client. This function returns a new
+ * ParcelFileDescriptor that should be returned to the caller (the caller is responsible for
+ * closing it).
*
* @param uri The URI whose data is to be written.
* @param mimeType The desired type of data to be written.
* @param opts Options supplied by caller.
* @param args Your own custom arguments.
- * @param func Interface implementing the function that will actually
- * stream the data.
- * @return Returns a new ParcelFileDescriptor holding the read side of
- * the pipe. This should be returned to the caller for reading; the caller
- * is responsible for closing it when done.
+ * @param func Interface implementing the function that will actually stream the data.
+ * @return Returns a new ParcelFileDescriptor holding the read side of the pipe. This should be
+ * returned to the caller for reading; the caller is responsible for closing it when done.
*/
- private "btColumnName" -> "emailColumnName as btColumnName" for each entry.
+ *
+ * This supports SQL statements in the emailColumnName entry.
*
- * This supports SQL statements in the emailColumnName entry.
* @param projection
* @param projectionMap "btColumnName" -> "imColumnName as btColumnName" for each entry.
+ *
+ * This supports SQL statements in the column name entry.
*
- * This supports SQL statements in the column name entry.
* @param projection
* @param projectionMap Will reject the OBEX connection, start a timer, and at timeout close the socket.
*/
public class ObexRejectServer extends ServerRequestHandler implements Handler.Callback {
@@ -51,8 +51,9 @@ public class ObexRejectServer extends ServerRequestHandler implements Handler.Ca
super();
mResult = result;
mSocket = socket;
- mHandlerThread = new HandlerThread("TestTimeoutHandler",
- android.os.Process.THREAD_PRIORITY_BACKGROUND);
+ mHandlerThread =
+ new HandlerThread(
+ "TestTimeoutHandler", android.os.Process.THREAD_PRIORITY_BACKGROUND);
mHandlerThread.start();
Looper timeoutLooper = mHandlerThread.getLooper();
mMessageHandler = new Handler(timeoutLooper, this);
diff --git a/android/app/src/com/android/bluetooth/ObexServerSockets.java b/android/app/src/com/android/bluetooth/ObexServerSockets.java
index bb4633f3a39278cd0125040a9a939590d18b06f2..b58b35d8637b62a5083fd410197103b90b174e35 100644
--- a/android/app/src/com/android/bluetooth/ObexServerSockets.java
+++ b/android/app/src/com/android/bluetooth/ObexServerSockets.java
@@ -1,17 +1,17 @@
/*
-* Copyright (C) 2015 Samsung System LSI
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (C) 2015 Samsung System LSI
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.android.bluetooth;
import android.annotation.RequiresPermission;
@@ -27,22 +27,22 @@ import com.android.obex.ServerSession;
import java.io.IOException;
/**
- * Wraps multiple BluetoothServerSocket objects to make it possible to accept connections on
- * both a RFCOMM and L2CAP channel in parallel. TODO: Make public when it becomes possible to determine that the listen-call failed
+ * due to channel-in-use.
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
- private static ObexServerSockets create(IObexConnectionHandler validator, int rfcommChannel,
- int l2capPsm, boolean isSecure) {
+ private static ObexServerSockets create(
+ IObexConnectionHandler validator, int rfcommChannel, int l2capPsm, boolean isSecure) {
Log.d(TAG, "create(rfcomm = " + rfcommChannel + ", l2capPsm = " + l2capPsm + ")");
BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter();
if (bt == null) {
@@ -145,8 +154,8 @@ public class ObexServerSockets {
if (!initSocketOK) {
// Need to break out of this loop if BT is being turned off.
int state = bt.getState();
- if ((state != BluetoothAdapter.STATE_TURNING_ON) && (state
- != BluetoothAdapter.STATE_ON)) {
+ if ((state != BluetoothAdapter.STATE_TURNING_ON)
+ && (state != BluetoothAdapter.STATE_ON)) {
Log.w(TAG, "initServerSockets failed as BT is (being) turned off");
break;
}
@@ -175,6 +184,7 @@ public class ObexServerSockets {
/**
* Returns the channel number assigned to the RFCOMM socket. This will be a static value, that
* should be reused for multiple connections.
+ *
* @return the RFCOMM channel number
*/
public int getRfcommChannel() {
@@ -184,6 +194,7 @@ public class ObexServerSockets {
/**
* Returns the channel number assigned to the L2CAP socket. This will be a static value, that
* should be reused for multiple connections.
+ *
* @return the L2CAP channel number
*/
public int getL2capPsm() {
@@ -191,9 +202,9 @@ public class ObexServerSockets {
}
/**
- * Initiate the accept threads.
- * Will create a thread for each socket type. an incoming connection will be signaled to
- * the {@link IObexConnectionValidator#onConnect()}, at which point both threads will exit.
+ * Initiate the accept threads. Will create a thread for each socket type. an incoming
+ * connection will be signaled to the {@link IObexConnectionValidator#onConnect()}, at which
+ * point both threads will exit.
*/
private void startAccept() {
Log.d(TAG, "startAccept()");
@@ -207,6 +218,7 @@ public class ObexServerSockets {
/**
* Called from the AcceptThreads to signal an incoming connection.
+ *
* @param device the connecting device.
* @param conSocket the socket associated with the connection.
* @return true if the connection is accepted, false otherwise.
@@ -216,9 +228,7 @@ public class ObexServerSockets {
return mConHandler.onConnect(device, conSocket);
}
- /**
- * Signal to the {@link IObexConnectionHandler} that an error have occurred.
- */
+ /** Signal to the {@link IObexConnectionHandler} that an error have occurred. */
private synchronized void onAcceptFailed() {
shutdown(false);
BluetoothAdapter mAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -230,8 +240,8 @@ public class ObexServerSockets {
/**
* Terminate any running accept threads
- * @param block Set true to block the calling thread until the AcceptThreads
- * has ended execution
+ *
+ * @param block Set true to block the calling thread until the AcceptThreads has ended execution
*/
public synchronized void shutdown(boolean block) {
Log.d(TAG, "shutdown(block = " + block + ")");
@@ -263,10 +273,9 @@ public class ObexServerSockets {
}
/**
- * A thread that runs in the background waiting for remote an incoming
- * connect. Once a remote socket connects, this thread will be
- * shutdown. When the remote disconnect, this thread shall be restarted to
- * accept a new connection.
+ * A thread that runs in the background waiting for remote an incoming connect. Once a remote
+ * socket connects, this thread will be shutdown. When the remote disconnect, this thread shall
+ * be restarted to accept a new connection.
*/
private class SocketAcceptThread extends Thread {
@@ -275,6 +284,7 @@ public class ObexServerSockets {
/**
* Create a SocketAcceptThread
+ *
* @param serverSocket shall never be null.
* @throws IllegalArgumentException if {@code serverSocket} is null
*/
@@ -286,8 +296,8 @@ public class ObexServerSockets {
}
/**
- * Run until shutdown of BT.
- * Accept incoming connections and reject if needed. Keep accepting incoming connections.
+ * Run until shutdown of BT. Accept incoming connections and reject if needed. Keep
+ * accepting incoming connections.
*/
@Override
public void run() {
@@ -332,9 +342,11 @@ public class ObexServerSockets {
new BluetoothObexTransport(connSocket);
// Create and detach a selfdestructing ServerSession to respond to any
// incoming OBEX signals.
- new ServerSession(obexTrans,
- new ObexRejectServer(ResponseCodes.OBEX_HTTP_UNAVAILABLE,
- connSocket), null);
+ new ServerSession(
+ obexTrans,
+ new ObexRejectServer(
+ ResponseCodes.OBEX_HTTP_UNAVAILABLE, connSocket),
+ null);
// now wait for a new connect
} else {
// now wait for a new connect
@@ -356,8 +368,8 @@ public class ObexServerSockets {
/**
* Shuts down the accept threads, and closes the ServerSockets, causing all related
- * BluetoothSockets to disconnect, hence do not call until all all accepted connections
- * are ready to be disconnected.
+ * BluetoothSockets to disconnect, hence do not call until all all accepted connections are
+ * ready to be disconnected.
*/
public void shutdown() {
if (!mStopped) {
diff --git a/android/app/src/com/android/bluetooth/SignedLongLong.java b/android/app/src/com/android/bluetooth/SignedLongLong.java
index 40bf20e7ff647d8ea8f3dc91b97e20257667709d..c84757f1f8df48e2e09d73b89ecd33900d1c85ec 100644
--- a/android/app/src/com/android/bluetooth/SignedLongLong.java
+++ b/android/app/src/com/android/bluetooth/SignedLongLong.java
@@ -1,18 +1,17 @@
/*
-* Copyright (C) 2015 Samsung System LSI
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
+ * Copyright (C) 2015 Samsung System LSI
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.android.bluetooth;
@@ -22,10 +21,9 @@ import java.io.UnsupportedEncodingException;
import java.util.Objects;
/**
- * Class to represent a 128bit value using two long member variables.
- * Has functionality to convert to/from hex-strings.
- * Mind that since signed variables are used to store the value internally
- * is used, the MSB/LSB long values can be negative.
+ * Class to represent a 128bit value using two long member variables. Has functionality to convert
+ * to/from hex-strings. Mind that since signed variables are used to store the value internally is
+ * used, the MSB/LSB long values can be negative.
*/
public class SignedLongLong implements Comparable The device should already be paired.
- * Connection policy can be one of:
- * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
- * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN},
- * {@link BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
+ * The device should already be paired. Connection policy can be one of: {@link
+ * BluetoothProfile#CONNECTION_POLICY_ALLOWED}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
*
* @param device Paired bluetooth device
* @param connectionPolicy is the connection policy to set to for this profile
@@ -641,12 +666,12 @@ public class A2dpService extends ProfileService {
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
- enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
- "Need BLUETOOTH_PRIVILEGED permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(device, BluetoothProfile.A2DP,
- connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(
+ device, BluetoothProfile.A2DP, connectionPolicy)) {
return false;
}
if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
@@ -660,17 +685,15 @@ public class A2dpService extends ProfileService {
/**
* Get the connection policy of the profile.
*
- * The connection policy can be any of:
- * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
- * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN},
- * {@link BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
+ * The connection policy can be any of: {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
+ * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
*
* @param device Bluetooth device
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager
- .getProfileConnectionPolicy(device, BluetoothProfile.A2DP);
+ return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.A2DP);
}
public void setAvrcpAbsoluteVolume(int volume) {
@@ -700,8 +723,8 @@ public class A2dpService extends ProfileService {
/**
* Gets the current codec status (configuration and capability).
*
- * @param device the remote Bluetooth device. If null, use the current
- * active A2DP Bluetooth device.
+ * @param device the remote Bluetooth device. If null, use the current active A2DP Bluetooth
+ * device.
* @return the current codec status
*/
public BluetoothCodecStatus getCodecStatus(BluetoothDevice device) {
@@ -724,14 +747,12 @@ public class A2dpService extends ProfileService {
/**
* Sets the codec configuration preference.
*
- * @param device the remote Bluetooth device. If null, use the currect
- * active A2DP Bluetooth device.
+ * @param device the remote Bluetooth device. If null, use the currect active A2DP Bluetooth
+ * device.
* @param codecConfig the codec configuration preference
*/
- public void setCodecConfigPreference(BluetoothDevice device,
- BluetoothCodecConfig codecConfig) {
- Log.d(TAG, "setCodecConfigPreference(" + device + "): "
- + Objects.toString(codecConfig));
+ public void setCodecConfigPreference(BluetoothDevice device, BluetoothCodecConfig codecConfig) {
+ Log.d(TAG, "setCodecConfigPreference(" + device + "): " + Objects.toString(codecConfig));
if (device == null) {
device = mActiveDevice;
}
@@ -754,8 +775,8 @@ public class A2dpService extends ProfileService {
/**
* Enables the optional codecs.
*
- * @param device the remote Bluetooth device. If null, use the currect
- * active A2DP Bluetooth device.
+ * @param device the remote Bluetooth device. If null, use the currect active A2DP Bluetooth
+ * device.
*/
public void enableOptionalCodecs(BluetoothDevice device) {
Log.d(TAG, "enableOptionalCodecs(" + device + ")");
@@ -782,8 +803,8 @@ public class A2dpService extends ProfileService {
/**
* Disables the optional codecs.
*
- * @param device the remote Bluetooth device. If null, use the currect
- * active A2DP Bluetooth device.
+ * @param device the remote Bluetooth device. If null, use the currect active A2DP Bluetooth
+ * device.
*/
public void disableOptionalCodecs(BluetoothDevice device) {
Log.d(TAG, "disableOptionalCodecs(" + device + ")");
@@ -811,18 +832,20 @@ public class A2dpService extends ProfileService {
* Checks whether optional codecs are supported
*
* @param device is the remote bluetooth device.
- * @return whether optional codecs are supported. Possible values are:
- * {@link OptionalCodecsSupportStatus#OPTIONAL_CODECS_SUPPORTED},
- * {@link OptionalCodecsSupportStatus#OPTIONAL_CODECS_NOT_SUPPORTED},
- * {@link OptionalCodecsSupportStatus#OPTIONAL_CODECS_SUPPORT_UNKNOWN}.
+ * @return whether optional codecs are supported. Possible values are: {@link
+ * OptionalCodecsSupportStatus#OPTIONAL_CODECS_SUPPORTED}, {@link
+ * OptionalCodecsSupportStatus#OPTIONAL_CODECS_NOT_SUPPORTED}, {@link
+ * OptionalCodecsSupportStatus#OPTIONAL_CODECS_SUPPORT_UNKNOWN}.
*/
public @OptionalCodecsSupportStatus int getSupportsOptionalCodecs(BluetoothDevice device) {
return mDatabaseManager.getA2dpSupportsOptionalCodecs(device);
}
public void setSupportsOptionalCodecs(BluetoothDevice device, boolean doesSupport) {
- int value = doesSupport ? BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED
- : BluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED;
+ int value =
+ doesSupport
+ ? BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED
+ : BluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED;
mDatabaseManager.setA2dpSupportsOptionalCodecs(device, value);
}
@@ -830,10 +853,10 @@ public class A2dpService extends ProfileService {
* Checks whether optional codecs are enabled
*
* @param device is the remote bluetooth device
- * @return whether the optional codecs are enabled. Possible values are:
- * {@link OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_ENABLED},
- * {@link OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_DISABLED},
- * {@link OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_UNKNOWN}.
+ * @return whether the optional codecs are enabled. Possible values are: {@link
+ * OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_ENABLED}, {@link
+ * OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_DISABLED}, {@link
+ * OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_UNKNOWN}.
*/
public @OptionalCodecsPreferenceStatus int getOptionalCodecsEnabled(BluetoothDevice device) {
return mDatabaseManager.getA2dpOptionalCodecsEnabled(device);
@@ -843,13 +866,13 @@ public class A2dpService extends ProfileService {
* Sets the optional codecs to be set to the passed in value
*
* @param device is the remote bluetooth device
- * @param value is the new status for the optional codecs. Possible values are:
- * {@link OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_ENABLED},
- * {@link OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_DISABLED},
- * {@link OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_UNKNOWN}.
+ * @param value is the new status for the optional codecs. Possible values are: {@link
+ * OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_ENABLED}, {@link
+ * OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_DISABLED}, {@link
+ * OptionalCodecsPreferenceStatus#OPTIONAL_CODECS_PREF_UNKNOWN}.
*/
- public void setOptionalCodecsEnabled(BluetoothDevice device,
- @OptionalCodecsPreferenceStatus int value) {
+ public void setOptionalCodecsEnabled(
+ BluetoothDevice device, @OptionalCodecsPreferenceStatus int value) {
if (value != BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN
&& value != BluetoothA2dp.OPTIONAL_CODECS_PREF_DISABLED
&& value != BluetoothA2dp.OPTIONAL_CODECS_PREF_ENABLED) {
@@ -862,15 +885,15 @@ public class A2dpService extends ProfileService {
/**
* Get dynamic audio buffer size supported type
*
- * @return support Possible values are
- * {@link BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_NONE},
- * {@link BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD},
- * {@link BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING}.
+ * @return support
+ * Possible values are {@link BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_NONE}, {@link
+ * BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_OFFLOAD}, {@link
+ * BluetoothA2dp#DYNAMIC_BUFFER_SUPPORT_A2DP_SOFTWARE_ENCODING}.
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
public int getDynamicBufferSupport() {
- enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
- "Need BLUETOOTH_PRIVILEGED permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
return mAdapterService.getDynamicBufferSupport();
}
@@ -881,8 +904,8 @@ public class A2dpService extends ProfileService {
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
public BufferConstraints getBufferConstraints() {
- enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
- "Need BLUETOOTH_PRIVILEGED permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
return mAdapterService.getBufferConstraints();
}
@@ -895,8 +918,8 @@ public class A2dpService extends ProfileService {
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setBufferLengthMillis(int codec, int value) {
- enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
- "Need BLUETOOTH_PRIVILEGED permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
return mAdapterService.setBufferLengthMillis(codec, value);
}
@@ -913,8 +936,11 @@ public class A2dpService extends ProfileService {
case A2dpStackEvent.CONNECTION_STATE_CONNECTING:
// Create a new state machine only when connecting to a device
if (!connectionAllowedCheckMaxDevices(device)) {
- Log.e(TAG, "Cannot connect to " + device
- + " : too many connected devices");
+ Log.e(
+ TAG,
+ "Cannot connect to "
+ + device
+ + " : too many connected devices");
return;
}
sm = getOrCreateStateMachine(device);
@@ -937,30 +963,45 @@ public class A2dpService extends ProfileService {
*
* @param device the remote device
* @param codecStatus the new codec status
- * @param sameAudioFeedingParameters if true the audio feeding parameters
- * haven't been changed
+ * @param sameAudioFeedingParameters if true the audio feeding parameters haven't been changed
*/
@VisibleForTesting
- public void codecConfigUpdated(BluetoothDevice device, BluetoothCodecStatus codecStatus,
- boolean sameAudioFeedingParameters) {
+ public void codecConfigUpdated(
+ BluetoothDevice device,
+ BluetoothCodecStatus codecStatus,
+ boolean sameAudioFeedingParameters) {
// Log codec config and capability metrics
BluetoothCodecConfig codecConfig = codecStatus.getCodecConfig();
int metricId = mAdapterService.getMetricId(device);
- BluetoothStatsLog.write(BluetoothStatsLog.BLUETOOTH_A2DP_CODEC_CONFIG_CHANGED,
- mAdapterService.obfuscateAddress(device), codecConfig.getCodecType(),
- codecConfig.getCodecPriority(), codecConfig.getSampleRate(),
- codecConfig.getBitsPerSample(), codecConfig.getChannelMode(),
- codecConfig.getCodecSpecific1(), codecConfig.getCodecSpecific2(),
- codecConfig.getCodecSpecific3(), codecConfig.getCodecSpecific4(), metricId);
+ BluetoothStatsLog.write(
+ BluetoothStatsLog.BLUETOOTH_A2DP_CODEC_CONFIG_CHANGED,
+ mAdapterService.obfuscateAddress(device),
+ codecConfig.getCodecType(),
+ codecConfig.getCodecPriority(),
+ codecConfig.getSampleRate(),
+ codecConfig.getBitsPerSample(),
+ codecConfig.getChannelMode(),
+ codecConfig.getCodecSpecific1(),
+ codecConfig.getCodecSpecific2(),
+ codecConfig.getCodecSpecific3(),
+ codecConfig.getCodecSpecific4(),
+ metricId);
List (Disconnected) | ^ CONNECT | | DISCONNECTED V | (Connecting)<--->(Disconnecting) | ^ CONNECTED
+ * | | DISCONNECT V | (Connected) NOTES: - If state machine is in "Connecting" state and the remote
+ * device sends DISCONNECT request, the state machine transitions to "Disconnecting" state. -
+ * Similarly, if the state machine is in "Disconnecting" state and the remote device sends CONNECT
+ * request, the state machine transitions to "Connecting" state.
*
- * (Disconnected)
- * | ^
- * CONNECT | | DISCONNECTED
- * V |
- * (Connecting)<--->(Disconnecting)
- * | ^
- * CONNECTED | | DISCONNECT
- * V |
- * (Connected)
- * NOTES:
- * - If state machine is in "Connecting" state and the remote device sends
- * DISCONNECT request, the state machine transitions to "Disconnecting" state.
- * - Similarly, if the state machine is in "Disconnecting" state and the remote device
- * sends CONNECT request, the state machine transitions to "Connecting" state.
- *
- * DISCONNECT
- * (Connecting) ---------------> (Disconnecting)
- * <---------------
- * CONNECT
- *
+ * DISCONNECT (Connecting) ---------------> (Disconnecting) <--------------- CONNECT
*/
-
package com.android.bluetooth.a2dp;
import static android.Manifest.permission.BLUETOOTH_CONNECT;
@@ -78,13 +62,11 @@ final class A2dpStateMachine extends StateMachine {
static final int CONNECT = 1;
static final int DISCONNECT = 2;
- @VisibleForTesting
- static final int STACK_EVENT = 101;
+ @VisibleForTesting static final int STACK_EVENT = 101;
private static final int CONNECT_TIMEOUT = 201;
// NOTE: the value is not "final" - it is modified in the unit tests
- @VisibleForTesting
- static int sConnectTimeoutMs = 30000; // 30s
+ @VisibleForTesting static int sConnectTimeoutMs = 30000; // 30s
private Disconnected mDisconnected;
private Connecting mConnecting;
@@ -95,14 +77,16 @@ final class A2dpStateMachine extends StateMachine {
private A2dpService mA2dpService;
private A2dpNativeInterface mA2dpNativeInterface;
- @VisibleForTesting
- boolean mA2dpOffloadEnabled = false;
+ @VisibleForTesting boolean mA2dpOffloadEnabled = false;
private final BluetoothDevice mDevice;
private boolean mIsPlaying = false;
private BluetoothCodecStatus mCodecStatus;
- A2dpStateMachine(BluetoothDevice device, A2dpService a2dpService,
- A2dpNativeInterface a2dpNativeInterface, Looper looper) {
+ A2dpStateMachine(
+ BluetoothDevice device,
+ A2dpService a2dpService,
+ A2dpNativeInterface a2dpNativeInterface,
+ Looper looper) {
super(TAG, looper);
// Let the logging framework enforce the log level. TAG is set above in the parent
@@ -127,11 +111,14 @@ final class A2dpStateMachine extends StateMachine {
setInitialState(mDisconnected);
}
- static A2dpStateMachine make(BluetoothDevice device, A2dpService a2dpService,
- A2dpNativeInterface a2dpNativeInterface, Looper looper) {
+ static A2dpStateMachine make(
+ BluetoothDevice device,
+ A2dpService a2dpService,
+ A2dpNativeInterface a2dpNativeInterface,
+ Looper looper) {
Log.i(TAG, "make for device " + device);
- A2dpStateMachine a2dpSm = new A2dpStateMachine(device, a2dpService, a2dpNativeInterface,
- looper);
+ A2dpStateMachine a2dpSm =
+ new A2dpStateMachine(device, a2dpService, a2dpNativeInterface, looper);
a2dpSm.start();
return a2dpSm;
}
@@ -142,8 +129,7 @@ final class A2dpStateMachine extends StateMachine {
// Stop if auido is still playing
log("doQuit: stopped playing " + mDevice);
mIsPlaying = false;
- broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING,
- BluetoothA2dp.STATE_PLAYING);
+ broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING, BluetoothA2dp.STATE_PLAYING);
}
quitNow();
}
@@ -157,8 +143,14 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void enter() {
Message currentMessage = getCurrentMessage();
- Log.i(TAG, "Enter Disconnected(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ Log.i(
+ TAG,
+ "Enter Disconnected("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
mConnectionState = BluetoothProfile.STATE_DISCONNECTED;
removeDeferredMessages(DISCONNECT);
@@ -169,8 +161,8 @@ final class A2dpStateMachine extends StateMachine {
if (mIsPlaying) {
Log.i(TAG, "Disconnected: stopped playing: " + mDevice);
mIsPlaying = false;
- broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING,
- BluetoothA2dp.STATE_PLAYING);
+ broadcastAudioState(
+ BluetoothA2dp.STATE_NOT_PLAYING, BluetoothA2dp.STATE_PLAYING);
}
}
@@ -180,15 +172,23 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void exit() {
Message currentMessage = getCurrentMessage();
- log("Exit Disconnected(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ log(
+ "Exit Disconnected("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
mLastConnectionState = BluetoothProfile.STATE_DISCONNECTED;
}
@Override
public boolean processMessage(Message message) {
- log("Disconnected process message(" + mDevice + "): "
- + messageWhatToString(message.what));
+ log(
+ "Disconnected process message("
+ + mDevice
+ + "): "
+ + messageWhatToString(message.what));
switch (message.what) {
case CONNECT:
@@ -294,8 +294,14 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void enter() {
Message currentMessage = getCurrentMessage();
- Log.i(TAG, "Enter Connecting(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ Log.i(
+ TAG,
+ "Enter Connecting("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
sendMessageDelayed(CONNECT_TIMEOUT, sConnectTimeoutMs);
mConnectionState = BluetoothProfile.STATE_CONNECTING;
broadcastConnectionState(mConnectionState, mLastConnectionState);
@@ -304,33 +310,43 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void exit() {
Message currentMessage = getCurrentMessage();
- log("Exit Connecting(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ log(
+ "Exit Connecting("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
mLastConnectionState = BluetoothProfile.STATE_CONNECTING;
removeMessages(CONNECT_TIMEOUT);
}
@Override
public boolean processMessage(Message message) {
- log("Connecting process message(" + mDevice + "): "
- + messageWhatToString(message.what));
+ log(
+ "Connecting process message("
+ + mDevice
+ + "): "
+ + messageWhatToString(message.what));
switch (message.what) {
case CONNECT:
deferMessage(message);
break;
- case CONNECT_TIMEOUT: {
- Log.w(TAG, "Connecting connection timeout: " + mDevice);
- mA2dpNativeInterface.disconnectA2dp(mDevice);
- A2dpStackEvent event =
- new A2dpStackEvent(A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);
- event.device = mDevice;
- event.valueInt = A2dpStackEvent.CONNECTION_STATE_DISCONNECTED;
- sendMessage(STACK_EVENT, event);
- MetricsLogger.getInstance().count(
- BluetoothProtoEnums.A2DP_CONNECTION_TIMEOUT, 1);
- break;
- }
+ case CONNECT_TIMEOUT:
+ {
+ Log.w(TAG, "Connecting connection timeout: " + mDevice);
+ mA2dpNativeInterface.disconnectA2dp(mDevice);
+ A2dpStackEvent event =
+ new A2dpStackEvent(
+ A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);
+ event.device = mDevice;
+ event.valueInt = A2dpStackEvent.CONNECTION_STATE_DISCONNECTED;
+ sendMessage(STACK_EVENT, event);
+ MetricsLogger.getInstance()
+ .count(BluetoothProtoEnums.A2DP_CONNECTION_TIMEOUT, 1);
+ break;
+ }
case DISCONNECT:
// Cancel connection
Log.i(TAG, "Connecting: connection canceled to " + mDevice);
@@ -392,8 +408,14 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void enter() {
Message currentMessage = getCurrentMessage();
- Log.i(TAG, "Enter Disconnecting(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ Log.i(
+ TAG,
+ "Enter Disconnecting("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
sendMessageDelayed(CONNECT_TIMEOUT, sConnectTimeoutMs);
mConnectionState = BluetoothProfile.STATE_DISCONNECTING;
broadcastConnectionState(mConnectionState, mLastConnectionState);
@@ -402,31 +424,41 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void exit() {
Message currentMessage = getCurrentMessage();
- log("Exit Disconnecting(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ log(
+ "Exit Disconnecting("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
mLastConnectionState = BluetoothProfile.STATE_DISCONNECTING;
removeMessages(CONNECT_TIMEOUT);
}
@Override
public boolean processMessage(Message message) {
- log("Disconnecting process message(" + mDevice + "): "
- + messageWhatToString(message.what));
+ log(
+ "Disconnecting process message("
+ + mDevice
+ + "): "
+ + messageWhatToString(message.what));
switch (message.what) {
case CONNECT:
deferMessage(message);
break;
- case CONNECT_TIMEOUT: {
- Log.w(TAG, "Disconnecting connection timeout: " + mDevice);
- mA2dpNativeInterface.disconnectA2dp(mDevice);
- A2dpStackEvent event =
- new A2dpStackEvent(A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);
- event.device = mDevice;
- event.valueInt = A2dpStackEvent.CONNECTION_STATE_DISCONNECTED;
- sendMessage(STACK_EVENT, event);
- break;
- }
+ case CONNECT_TIMEOUT:
+ {
+ Log.w(TAG, "Disconnecting connection timeout: " + mDevice);
+ mA2dpNativeInterface.disconnectA2dp(mDevice);
+ A2dpStackEvent event =
+ new A2dpStackEvent(
+ A2dpStackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED);
+ event.device = mDevice;
+ event.valueInt = A2dpStackEvent.CONNECTION_STATE_DISCONNECTED;
+ sendMessage(STACK_EVENT, event);
+ break;
+ }
case DISCONNECT:
deferMessage(message);
break;
@@ -497,8 +529,14 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void enter() {
Message currentMessage = getCurrentMessage();
- Log.i(TAG, "Enter Connected(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ Log.i(
+ TAG,
+ "Enter Connected("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
mConnectionState = BluetoothProfile.STATE_CONNECTED;
removeDeferredMessages(CONNECT);
@@ -518,8 +556,13 @@ final class A2dpStateMachine extends StateMachine {
@Override
public void exit() {
Message currentMessage = getCurrentMessage();
- log("Exit Connected(" + mDevice + "): " + (currentMessage == null ? "null"
- : messageWhatToString(currentMessage.what)));
+ log(
+ "Exit Connected("
+ + mDevice
+ + "): "
+ + (currentMessage == null
+ ? "null"
+ : messageWhatToString(currentMessage.what)));
mLastConnectionState = BluetoothProfile.STATE_CONNECTED;
}
@@ -531,17 +574,19 @@ final class A2dpStateMachine extends StateMachine {
case CONNECT:
Log.w(TAG, "Connected: CONNECT ignored: " + mDevice);
break;
- case DISCONNECT: {
- Log.i(TAG, "Disconnecting from " + mDevice);
- if (!mA2dpNativeInterface.disconnectA2dp(mDevice)) {
- // If error in the native stack, transition directly to Disconnected state.
- Log.e(TAG, "Connected: error disconnecting from " + mDevice);
- transitionTo(mDisconnected);
- break;
+ case DISCONNECT:
+ {
+ Log.i(TAG, "Disconnecting from " + mDevice);
+ if (!mA2dpNativeInterface.disconnectA2dp(mDevice)) {
+ // If error in the native stack, transition directly to Disconnected
+ // state.
+ Log.e(TAG, "Connected: error disconnecting from " + mDevice);
+ transitionTo(mDisconnected);
+ break;
+ }
+ transitionTo(mDisconnecting);
}
- transitionTo(mDisconnecting);
- }
- break;
+ break;
case STACK_EVENT:
A2dpStackEvent event = (A2dpStackEvent) message.obj;
log("Connected: stack event: " + event);
@@ -600,8 +645,8 @@ final class A2dpStateMachine extends StateMachine {
if (!mIsPlaying) {
Log.i(TAG, "Connected: started playing: " + mDevice);
mIsPlaying = true;
- broadcastAudioState(BluetoothA2dp.STATE_PLAYING,
- BluetoothA2dp.STATE_NOT_PLAYING);
+ broadcastAudioState(
+ BluetoothA2dp.STATE_PLAYING, BluetoothA2dp.STATE_NOT_PLAYING);
}
}
break;
@@ -611,8 +656,8 @@ final class A2dpStateMachine extends StateMachine {
if (mIsPlaying) {
Log.i(TAG, "Connected: stopped playing: " + mDevice);
mIsPlaying = false;
- broadcastAudioState(BluetoothA2dp.STATE_NOT_PLAYING,
- BluetoothA2dp.STATE_PLAYING);
+ broadcastAudioState(
+ BluetoothA2dp.STATE_NOT_PLAYING, BluetoothA2dp.STATE_PLAYING);
}
}
break;
@@ -679,10 +724,13 @@ final class A2dpStateMachine extends StateMachine {
// The following is a large enough debug operation such that we want to guard it was an
// isLoggable check
if (Log.isLoggable(TAG, Log.DEBUG)) {
- Log.d(TAG, "A2DP Codec Config: " + prevCodecConfig + "->"
- + newCodecStatus.getCodecConfig());
- for (BluetoothCodecConfig codecConfig :
- newCodecStatus.getCodecsLocalCapabilities()) {
+ Log.d(
+ TAG,
+ "A2DP Codec Config: "
+ + prevCodecConfig
+ + "->"
+ + newCodecStatus.getCodecConfig());
+ for (BluetoothCodecConfig codecConfig : newCodecStatus.getCodecsLocalCapabilities()) {
Log.d(TAG, "A2DP Codec Local Capability: " + codecConfig);
}
for (BluetoothCodecConfig codecConfig :
@@ -707,17 +755,17 @@ final class A2dpStateMachine extends StateMachine {
} else if (!newCodecConfig.sameAudioFeedingParameters(prevCodecConfig)) {
update = true;
} else if ((newCodecConfig.getCodecType()
- == BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)
+ == BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC)
&& (prevCodecConfig != null)
&& (prevCodecConfig.getCodecSpecific1()
- != newCodecConfig.getCodecSpecific1())) {
+ != newCodecConfig.getCodecSpecific1())) {
update = true;
} else if ((newCodecConfig.getCodecType()
- == BluetoothCodecConfig.SOURCE_CODEC_TYPE_OPUS)
+ == BluetoothCodecConfig.SOURCE_CODEC_TYPE_OPUS)
&& (prevCodecConfig != null)
// check framesize field
&& (prevCodecConfig.getCodecSpecific1()
- != newCodecConfig.getCodecSpecific1())) {
+ != newCodecConfig.getCodecSpecific1())) {
update = true;
}
if (update) {
@@ -733,14 +781,20 @@ final class A2dpStateMachine extends StateMachine {
// This method does not check for error condition (newState == prevState)
private void broadcastConnectionState(int newState, int prevState) {
- log("Connection state " + mDevice + ": " + profileStateToString(prevState)
- + "->" + profileStateToString(newState));
+ log(
+ "Connection state "
+ + mDevice
+ + ": "
+ + profileStateToString(prevState)
+ + "->"
+ + profileStateToString(newState));
Intent intent = new Intent(BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
intent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, prevState);
intent.putExtra(BluetoothProfile.EXTRA_STATE, newState);
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
- intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT
+ intent.addFlags(
+ Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT
| Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
mA2dpService.handleConnectionStateChanged(mDevice, prevState, newState);
mA2dpService.sendBroadcast(
@@ -748,8 +802,13 @@ final class A2dpStateMachine extends StateMachine {
}
private void broadcastAudioState(int newState, int prevState) {
- log("A2DP Playing state : device: " + mDevice + " State:" + audioStateToString(prevState)
- + "->" + audioStateToString(newState));
+ log(
+ "A2DP Playing state : device: "
+ + mDevice
+ + " State:"
+ + audioStateToString(prevState)
+ + "->"
+ + audioStateToString(newState));
Intent intent = new Intent(BluetoothA2dp.ACTION_PLAYING_STATE_CHANGED);
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
intent.putExtra(BluetoothProfile.EXTRA_PREVIOUS_STATE, prevState);
@@ -773,8 +832,8 @@ final class A2dpStateMachine extends StateMachine {
return builder.toString();
}
- private static boolean sameSelectableCodec(BluetoothCodecStatus prevCodecStatus,
- BluetoothCodecStatus newCodecStatus) {
+ private static boolean sameSelectableCodec(
+ BluetoothCodecStatus prevCodecStatus, BluetoothCodecStatus newCodecStatus) {
if (prevCodecStatus == null || newCodecStatus == null) {
return false;
}
@@ -838,16 +897,23 @@ final class A2dpStateMachine extends StateMachine {
public void dump(StringBuilder sb) {
boolean isActive = Objects.equals(mDevice, mA2dpService.getActiveDevice());
- ProfileService.println(sb,
- "=== A2dpStateMachine for " + mDevice + (isActive ? " (Active) ===" : " ==="));
- ProfileService.println(sb,
- " getConnectionPolicy: " + mA2dpService.getConnectionPolicy(mDevice));
- ProfileService.println(sb, " mConnectionState: " + profileStateToString(mConnectionState)
- + ", mLastConnectionState: " + profileStateToString(mLastConnectionState));
+ ProfileService.println(
+ sb, "=== A2dpStateMachine for " + mDevice + (isActive ? " (Active) ===" : " ==="));
+ ProfileService.println(
+ sb, " getConnectionPolicy: " + mA2dpService.getConnectionPolicy(mDevice));
+ ProfileService.println(
+ sb,
+ " mConnectionState: "
+ + profileStateToString(mConnectionState)
+ + ", mLastConnectionState: "
+ + profileStateToString(mLastConnectionState));
ProfileService.println(sb, " mIsPlaying: " + mIsPlaying);
- ProfileService.println(sb,
- " getSupportsOptionalCodecs: " + mA2dpService.getSupportsOptionalCodecs(mDevice)
- + ", getOptionalCodecsEnabled: " + mA2dpService.getOptionalCodecsEnabled(mDevice));
+ ProfileService.println(
+ sb,
+ " getSupportsOptionalCodecs: "
+ + mA2dpService.getSupportsOptionalCodecs(mDevice)
+ + ", getOptionalCodecsEnabled: "
+ + mA2dpService.getOptionalCodecsEnabled(mDevice));
synchronized (this) {
if (mCodecStatus != null) {
ProfileService.println(sb, " mCodecConfig: " + mCodecStatus.getCodecConfig());
@@ -861,7 +927,7 @@ final class A2dpStateMachine extends StateMachine {
// Dump the state machine logs
StringWriter stringWriter = new StringWriter();
PrintWriter printWriter = new PrintWriter(stringWriter);
- super.dump(new FileDescriptor(), printWriter, new String[]{});
+ super.dump(new FileDescriptor(), printWriter, new String[] {});
printWriter.flush();
stringWriter.flush();
ProfileService.println(sb, " StateMachineLog:");
diff --git a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkNativeInterface.java b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkNativeInterface.java
index 944291a2829b06e787d6a25188443b933ffc4e7c..1f599fa1c4463feca6d7e539095b759881dce643 100644
--- a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkNativeInterface.java
+++ b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkNativeInterface.java
@@ -27,9 +27,7 @@ import com.android.internal.annotations.VisibleForTesting;
import java.util.Objects;
-/**
- * A2DP Sink Native Interface to/from JNI.
- */
+/** A2DP Sink Native Interface to/from JNI. */
public class A2dpSinkNativeInterface {
private static final String TAG = A2dpSinkNativeInterface.class.getSimpleName();
private AdapterService mAdapterService;
@@ -40,13 +38,13 @@ public class A2dpSinkNativeInterface {
private static final Object INSTANCE_LOCK = new Object();
private A2dpSinkNativeInterface() {
- mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),
- "AdapterService cannot be null when A2dpSinkNativeInterface init");
+ mAdapterService =
+ Objects.requireNonNull(
+ AdapterService.getAdapterService(),
+ "AdapterService cannot be null when A2dpSinkNativeInterface init");
}
- /**
- * Get singleton instance.
- */
+ /** Get singleton instance. */
public static A2dpSinkNativeInterface getInstance() {
synchronized (INSTANCE_LOCK) {
if (sInstance == null) {
@@ -73,9 +71,7 @@ public class A2dpSinkNativeInterface {
initNative(maxConnectedAudioDevices);
}
- /**
- * Cleanup the native interface.
- */
+ /** Cleanup the native interface. */
public void cleanup() {
cleanupNative();
}
@@ -115,10 +111,10 @@ public class A2dpSinkNativeInterface {
/**
* Set a BluetoothDevice as the active device
*
- * The active device is the only one that will receive passthrough commands and the only one
+ * The active device is the only one that will receive passthrough commands and the only one
* that will have its audio decoded.
*
- * Sending null for the active device will make no device active.
+ * Sending null for the active device will make no device active.
*
* @param device
* @return True if the active device request has been scheduled
@@ -152,9 +148,7 @@ public class A2dpSinkNativeInterface {
informAudioTrackGainNative(gain);
}
- /**
- * Send a stack event up to the A2DP Sink Service
- */
+ /** Send a stack event up to the A2DP Sink Service */
private void sendMessageToService(StackEvent event) {
A2dpSinkService service = A2dpSinkService.getA2dpSinkService();
if (service != null) {
@@ -164,41 +158,40 @@ public class A2dpSinkNativeInterface {
}
}
- /**
- * For the JNI to send messages about connection state changes
- */
+ /** For the JNI to send messages about connection state changes */
public void onConnectionStateChanged(byte[] address, int state) {
- StackEvent event =
- StackEvent.connectionStateChanged(getDevice(address), state);
+ StackEvent event = StackEvent.connectionStateChanged(getDevice(address), state);
Log.d(TAG, "onConnectionStateChanged: " + event);
sendMessageToService(event);
}
- /**
- * For the JNI to send messages about audio stream state changes
- */
+ /** For the JNI to send messages about audio stream state changes */
public void onAudioStateChanged(byte[] address, int state) {
StackEvent event = StackEvent.audioStateChanged(getDevice(address), state);
Log.d(TAG, "onAudioStateChanged: " + event);
sendMessageToService(event);
}
- /**
- * For the JNI to send messages about audio configuration changes
- */
+ /** For the JNI to send messages about audio configuration changes */
public void onAudioConfigChanged(byte[] address, int sampleRate, int channelCount) {
- StackEvent event = StackEvent.audioConfigChanged(
- getDevice(address), sampleRate, channelCount);
+ StackEvent event =
+ StackEvent.audioConfigChanged(getDevice(address), sampleRate, channelCount);
Log.d(TAG, "onAudioConfigChanged: " + event);
sendMessageToService(event);
}
// Native methods that call into the JNI interface
private native void initNative(int maxConnectedAudioDevices);
+
private native void cleanupNative();
+
private native boolean connectA2dpNative(byte[] address);
+
private native boolean disconnectA2dpNative(byte[] address);
+
private native boolean setActiveDeviceNative(byte[] address);
+
private native void informAudioFocusStateNative(int focusGranted);
+
private native void informAudioTrackGainNative(float gain);
}
diff --git a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
index 1bb970577bbf88e375c70a86f3c91da5ce06c243..0965e07c6533b7c1befdfdd171dda7619d9fa252 100644
--- a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
+++ b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkService.java
@@ -44,9 +44,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-/**
- * Provides Bluetooth A2DP Sink profile, as a service in the Bluetooth application.
- */
+/** Provides Bluetooth A2DP Sink profile, as a service in the Bluetooth application. */
public class A2dpSinkService extends ProfileService {
private static final String TAG = A2dpSinkService.class.getSimpleName();
@@ -131,17 +129,13 @@ public class A2dpSinkService extends ProfileService {
return sService;
}
- /**
- * Testing API to inject a mockA2dpSinkService.
- */
+ /** Testing API to inject a mockA2dpSinkService. */
@VisibleForTesting
public static synchronized void setA2dpSinkService(A2dpSinkService service) {
sService = service;
}
- /**
- * Set the device that should be allowed to actively stream
- */
+ /** Set the device that should be allowed to actively stream */
public boolean setActiveDevice(BluetoothDevice device) {
Log.i(TAG, "setActiveDevice(device=" + device + ")");
synchronized (mActiveDeviceLock) {
@@ -153,18 +147,14 @@ public class A2dpSinkService extends ProfileService {
}
}
- /**
- * Get the device that is allowed to be actively streaming
- */
+ /** Get the device that is allowed to be actively streaming */
public BluetoothDevice getActiveDevice() {
synchronized (mActiveDeviceLock) {
return mActiveDevice;
}
}
- /**
- * Request audio focus such that the designated device can stream audio
- */
+ /** Request audio focus such that the designated device can stream audio */
public void requestAudioFocus(BluetoothDevice device, boolean request) {
synchronized (mStreamHandlerLock) {
if (mA2dpSinkStreamHandler == null) return;
@@ -199,7 +189,7 @@ public class A2dpSinkService extends ProfileService {
return new A2dpSinkServiceBinder(this);
}
- //Binder object: Must be static class or memory leak may occur
+ // Binder object: Must be static class or memory leak may occur
@VisibleForTesting
static class A2dpSinkServiceBinder extends IBluetoothA2dpSink.Stub
implements IProfileServiceBinder {
@@ -322,14 +312,13 @@ public class A2dpSinkService extends ProfileService {
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean connect(BluetoothDevice device) {
Log.d(TAG, "connect device=" + device);
- enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
- "Need BLUETOOTH_PRIVILEGED permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
if (device == null) {
throw new IllegalArgumentException("Null device");
}
if (getConnectionPolicy(device) == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN) {
- Log.w(TAG, "Connection not allowed: <" + device
- + "> is CONNECTION_POLICY_FORBIDDEN");
+ Log.w(TAG, "Connection not allowed: <" + device + "> is CONNECTION_POLICY_FORBIDDEN");
return false;
}
@@ -339,8 +328,11 @@ public class A2dpSinkService extends ProfileService {
return true;
} else {
// a state machine instance doesn't exist yet, and the max has been reached.
- Log.e(TAG, "Maxed out on the number of allowed A2DP Sink connections. "
- + "Connect request rejected on " + device);
+ Log.e(
+ TAG,
+ "Maxed out on the number of allowed A2DP Sink connections. "
+ + "Connect request rejected on "
+ + device);
return false;
}
}
@@ -388,7 +380,7 @@ public class A2dpSinkService extends ProfileService {
}
public List The device should already be paired.
- * Connection policy can be one of:
- * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
- * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN},
- * {@link BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
+ * The device should already be paired. Connection policy can be one of: {@link
+ * BluetoothProfile#CONNECTION_POLICY_ALLOWED}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
*
* @param device Paired bluetooth device
* @param connectionPolicy is the connection policy to set to for this profile
@@ -467,8 +463,8 @@ public class A2dpSinkService extends ProfileService {
BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- if (!mDatabaseManager.setProfileConnectionPolicy(device, BluetoothProfile.A2DP_SINK,
- connectionPolicy)) {
+ if (!mDatabaseManager.setProfileConnectionPolicy(
+ device, BluetoothProfile.A2DP_SINK, connectionPolicy)) {
return false;
}
if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
@@ -489,11 +485,9 @@ public class A2dpSinkService extends ProfileService {
public int getConnectionPolicy(BluetoothDevice device) {
enforceCallingOrSelfPermission(
BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
- return mDatabaseManager
- .getProfileConnectionPolicy(device, BluetoothProfile.A2DP_SINK);
+ return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.A2DP_SINK);
}
-
@Override
public void dump(StringBuilder sb) {
super.dump(sb);
@@ -501,8 +495,8 @@ public class A2dpSinkService extends ProfileService {
ProfileService.println(sb, "Max Connected Devices = " + mMaxConnectedAudioDevices);
ProfileService.println(sb, "Devices Tracked = " + mDeviceStateMap.size());
for (A2dpSinkStateMachine stateMachine : mDeviceStateMap.values()) {
- ProfileService.println(sb,
- "==== StateMachine for " + stateMachine.getDevice() + " ====");
+ ProfileService.println(
+ sb, "==== StateMachine for " + stateMachine.getDevice() + " ====");
stateMachine.dump(sb);
}
}
@@ -517,9 +511,7 @@ public class A2dpSinkService extends ProfileService {
return stateMachine.getAudioConfig();
}
- /**
- * Receive and route a stack event from the JNI
- */
+ /** Receive and route a stack event from the JNI */
protected void messageFromNative(StackEvent event) {
switch (event.mType) {
case StackEvent.EVENT_TYPE_CONNECTION_STATE_CHANGED:
@@ -553,12 +545,14 @@ public class A2dpSinkService extends ProfileService {
Log.e(TAG, "Received audio state change before we've been started");
return;
} else if (state == StackEvent.AUDIO_STATE_STARTED) {
- mA2dpSinkStreamHandler.obtainMessage(
- A2dpSinkStreamHandler.SRC_STR_START).sendToTarget();
+ mA2dpSinkStreamHandler
+ .obtainMessage(A2dpSinkStreamHandler.SRC_STR_START)
+ .sendToTarget();
} else if (state == StackEvent.AUDIO_STATE_STOPPED
|| state == StackEvent.AUDIO_STATE_REMOTE_SUSPEND) {
- mA2dpSinkStreamHandler.obtainMessage(
- A2dpSinkStreamHandler.SRC_STR_STOP).sendToTarget();
+ mA2dpSinkStreamHandler
+ .obtainMessage(A2dpSinkStreamHandler.SRC_STR_STOP)
+ .sendToTarget();
} else {
Log.w(TAG, "Unhandled audio state change, state=" + state);
}
diff --git a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java
index f08c13a9511598d67ad7155cda5775d9670a0c52..927dcefefb967c5cd19a500a5b6c10fb465f99a6 100644
--- a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java
+++ b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java
@@ -98,9 +98,7 @@ class A2dpSinkStateMachine extends StateMachine {
return mMostRecentState;
}
- /**
- * get current audio config
- */
+ /** get current audio config */
BluetoothAudioConfig getAudioConfig() {
return mAudioConfig;
}
@@ -131,17 +129,24 @@ class A2dpSinkStateMachine extends StateMachine {
/**
* Dump the current State Machine to the string builder.
+ *
* @param sb output string
*/
public void dump(StringBuilder sb) {
- ProfileService.println(sb, "mDevice: " + mDevice + "("
- + Utils.getName(mDevice) + ") " + this.toString());
+ ProfileService.println(
+ sb, "mDevice: " + mDevice + "(" + Utils.getName(mDevice) + ") " + this.toString());
}
@Override
protected void unhandledMessage(Message msg) {
- Log.w(TAG, "[" + mDevice + "] unhandledMessage state=" + getCurrentState() + ", msg.what="
- + msg.what);
+ Log.w(
+ TAG,
+ "["
+ + mDevice
+ + "] unhandledMessage state="
+ + getCurrentState()
+ + ", msg.what="
+ + msg.what);
}
class Disconnected extends State {
@@ -179,8 +184,12 @@ class A2dpSinkStateMachine extends StateMachine {
case StackEvent.CONNECTION_STATE_CONNECTING:
if (mService.getConnectionPolicy(mDevice)
== BluetoothProfile.CONNECTION_POLICY_FORBIDDEN) {
- Log.w(TAG, "[" + mDevice + "] Ignore incoming connection, profile"
- + " is turned off");
+ Log.w(
+ TAG,
+ "["
+ + mDevice
+ + "] Ignore incoming connection, profile"
+ + " is turned off");
mNativeInterface.disconnectA2dpSink(mDevice);
} else {
mConnecting.mIncomingConnection = true;
@@ -224,8 +233,12 @@ class A2dpSinkStateMachine extends StateMachine {
transitionTo(mDisconnected);
return true;
case DISCONNECT:
- Log.d(TAG, "[" + mDevice + "] Received disconnect message while connecting."
- + "deferred");
+ Log.d(
+ TAG,
+ "["
+ + mDevice
+ + "] Received disconnect message while connecting."
+ + "deferred");
deferMessage(message);
return true;
}
@@ -245,12 +258,12 @@ class A2dpSinkStateMachine extends StateMachine {
}
}
}
+
@Override
public void exit() {
removeMessages(CONNECT_TIMEOUT);
mIncomingConnection = false;
}
-
}
class Connected extends State {
@@ -287,8 +300,11 @@ class A2dpSinkStateMachine extends StateMachine {
}
break;
case StackEvent.EVENT_TYPE_AUDIO_CONFIG_CHANGED:
- mAudioConfig = new BluetoothAudioConfig(event.mSampleRate, event.mChannelCount,
- AudioFormat.ENCODING_PCM_16BIT);
+ mAudioConfig =
+ new BluetoothAudioConfig(
+ event.mSampleRate,
+ event.mChannelCount,
+ AudioFormat.ENCODING_PCM_16BIT);
break;
}
}
diff --git a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java
index 754ec28817600d5d07322a51abfa1638cff218bf..6cf7d99643ae8c01509cbe787b6c531c0980e63d 100644
--- a/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java
+++ b/android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStreamHandler.java
@@ -32,20 +32,20 @@ import com.android.bluetooth.avrcpcontroller.AvrcpControllerService;
/**
* Bluetooth A2DP SINK Streaming Handler.
*
- * This handler defines how the stack behaves once the A2DP connection is established and both
+ * This handler defines how the stack behaves once the A2DP connection is established and both
* devices are ready for streaming. For simplification we assume that the connection can either
* stream music immediately (i.e. data packets coming in or have potential to come in) or it cannot
* stream (i.e. Idle and Open states are treated alike). See Fig 4-1 of GAVDP Spec 1.0.
*
- * Note: There are several different audio tracks that a connected phone may like to transmit over
- * the A2DP stream including Music, Navigation, Assistant, and Notifications. Music is the only
+ * Note: There are several different audio tracks that a connected phone may like to transmit
+ * over the A2DP stream including Music, Navigation, Assistant, and Notifications. Music is the only
* track that is almost always accompanied with an AVRCP play/pause command.
*
- * Streaming is initiated by either an explicit play command from user interaction or audio coming
- * from the phone. Streaming is terminated when either the user pauses the audio, the audio stream
- * from the phone ends, the phone disconnects, or audio focus is lost. During playback if there is
- * a change to audio focus playback may be temporarily paused and then resumed when focus is
- * restored.
+ * Streaming is initiated by either an explicit play command from user interaction or audio
+ * coming from the phone. Streaming is terminated when either the user pauses the audio, the audio
+ * stream from the phone ends, the phone disconnects, or audio focus is lost. During playback if
+ * there is a change to audio focus playback may be temporarily paused and then resumed when focus
+ * is restored.
*/
public class A2dpSinkStreamHandler extends Handler {
private static final String TAG = A2dpSinkStreamHandler.class.getSimpleName();
@@ -89,25 +89,25 @@ public class A2dpSinkStreamHandler extends Handler {
private MediaPlayer mMediaPlayer = null;
// Focus changes when we are currently holding focus.
- private OnAudioFocusChangeListener mAudioFocusListener = new OnAudioFocusChangeListener() {
- @Override
- public void onAudioFocusChange(int focusChange) {
- Log.d(TAG, "onAudioFocusChangeListener(focusChange= " + focusChange + ")");
- A2dpSinkStreamHandler.this.obtainMessage(AUDIO_FOCUS_CHANGE, focusChange)
- .sendToTarget();
- }
- };
+ private OnAudioFocusChangeListener mAudioFocusListener =
+ new OnAudioFocusChangeListener() {
+ @Override
+ public void onAudioFocusChange(int focusChange) {
+ Log.d(TAG, "onAudioFocusChangeListener(focusChange= " + focusChange + ")");
+ A2dpSinkStreamHandler.this
+ .obtainMessage(AUDIO_FOCUS_CHANGE, focusChange)
+ .sendToTarget();
+ }
+ };
- public A2dpSinkStreamHandler(A2dpSinkService a2dpSinkService,
- A2dpSinkNativeInterface nativeInterface) {
+ public A2dpSinkStreamHandler(
+ A2dpSinkService a2dpSinkService, A2dpSinkNativeInterface nativeInterface) {
mA2dpSinkService = a2dpSinkService;
mNativeInterface = nativeInterface;
mAudioManager = mA2dpSinkService.getSystemService(AudioManager.class);
}
- /**
- * Safely clean up this stream handler object
- */
+ /** Safely clean up this stream handler object */
public void cleanup() {
abandonAudioFocus();
removeCallbacksAndMessages(null);
@@ -124,7 +124,7 @@ public class A2dpSinkStreamHandler extends Handler {
boolean isPlaying() {
return (mStreamAvailable
&& (mAudioFocus == AudioManager.AUDIOFOCUS_GAIN
- || mAudioFocus == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK));
+ || mAudioFocus == AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK));
}
@Override
@@ -177,8 +177,12 @@ public class A2dpSinkStreamHandler extends Handler {
case AUDIO_FOCUS_CHANGE:
final int focusChangeCode = (int) message.obj;
- Log.d(TAG, "New audioFocus = " + focusChangeCode
- + " Previous audio focus = " + mAudioFocus);
+ Log.d(
+ TAG,
+ "New audioFocus = "
+ + focusChangeCode
+ + " Previous audio focus = "
+ + mAudioFocus);
mAudioFocus = focusChangeCode;
// message.obj is the newly granted audio focus.
switch (mAudioFocus) {
@@ -189,8 +193,10 @@ public class A2dpSinkStreamHandler extends Handler {
case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
// Make the volume duck.
- int duckPercent = mA2dpSinkService.getResources()
- .getInteger(R.integer.a2dp_sink_duck_percent);
+ int duckPercent =
+ mA2dpSinkService
+ .getResources()
+ .getInteger(R.integer.a2dp_sink_duck_percent);
if (duckPercent < 0 || duckPercent > 100) {
Log.e(TAG, "Invalid duck percent using default.");
duckPercent = DEFAULT_DUCK_PERCENT;
@@ -226,9 +232,7 @@ public class A2dpSinkStreamHandler extends Handler {
}
}
- /**
- * Utility functions.
- */
+ /** Utility functions. */
private void requestAudioFocusIfNone() {
Log.d(TAG, "requestAudioFocusIfNone()");
if (mAudioFocus != AudioManager.AUDIOFOCUS_GAIN) {
@@ -241,21 +245,22 @@ public class A2dpSinkStreamHandler extends Handler {
// Bluetooth A2DP may carry Music, Audio Books, Navigation, or other sounds so mark content
// type unknown.
AudioAttributes streamAttributes =
- new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA)
+ new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_MEDIA)
.setContentType(AudioAttributes.CONTENT_TYPE_UNKNOWN)
.build();
// Bluetooth ducking is handled at the native layer at the request of AudioManager.
AudioFocusRequest focusRequest =
- new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN).setAudioAttributes(
- streamAttributes)
+ new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+ .setAudioAttributes(streamAttributes)
.setOnAudioFocusChangeListener(mAudioFocusListener, this)
.build();
int focusRequestStatus = mAudioManager.requestAudioFocus(focusRequest);
// If the request is granted begin streaming immediately and schedule an upgrade.
if (focusRequestStatus == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
mAudioFocus = AudioManager.AUDIOFOCUS_GAIN;
- final Message a2dpSinkStreamHandlerMessage = A2dpSinkStreamHandler.this
- .obtainMessage(AUDIO_FOCUS_CHANGE, mAudioFocus);
+ final Message a2dpSinkStreamHandlerMessage =
+ A2dpSinkStreamHandler.this.obtainMessage(AUDIO_FOCUS_CHANGE, mAudioFocus);
A2dpSinkStreamHandler.this.sendMessageAtFrontOfQueue(a2dpSinkStreamHandlerMessage);
} else {
Log.e(TAG, "Audio focus was not granted:" + focusRequestStatus);
@@ -267,32 +272,36 @@ public class A2dpSinkStreamHandler extends Handler {
* Plays a silent audio sample so that MediaSessionService will be aware of the fact that
* Bluetooth is playing audio.
*
- * Creates a new MediaPlayer if one does not already exist. Repeat calls to this function are
+ * Creates a new MediaPlayer if one does not already exist. Repeat calls to this function are
* safe and will result in the silent audio sample again.
*
- * This allows the MediaSession in AVRCP Controller to be routed media key events, if we've
+ * This allows the MediaSession in AVRCP Controller to be routed media key events, if we've
* chosen to use it.
*/
private synchronized void requestMediaKeyFocus() {
Log.d(TAG, "requestMediaKeyFocus()");
if (mMediaPlayer == null) {
- AudioAttributes attrs = new AudioAttributes.Builder()
- .setUsage(AudioAttributes.USAGE_MEDIA)
- .build();
-
- mMediaPlayer = MediaPlayer.create(mA2dpSinkService, R.raw.silent, attrs,
- mAudioManager.generateAudioSessionId());
+ AudioAttributes attrs =
+ new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build();
+
+ mMediaPlayer =
+ MediaPlayer.create(
+ mA2dpSinkService,
+ R.raw.silent,
+ attrs,
+ mAudioManager.generateAudioSessionId());
if (mMediaPlayer == null) {
Log.e(TAG, "Failed to initialize media player. You may not get media key events");
return;
}
mMediaPlayer.setLooping(false);
- mMediaPlayer.setOnErrorListener((mp, what, extra) -> {
- Log.e(TAG, "Silent media player error: " + what + ", " + extra);
- releaseMediaKeyFocus();
- return false;
- });
+ mMediaPlayer.setOnErrorListener(
+ (mp, what, extra) -> {
+ Log.e(TAG, "Silent media player error: " + what + ", " + extra);
+ releaseMediaKeyFocus();
+ return false;
+ });
}
mMediaPlayer.start();
@@ -306,8 +315,8 @@ public class A2dpSinkStreamHandler extends Handler {
}
/**
- * Destroys the silent audio sample MediaPlayer, notifying MediaSessionService of the fact
- * we're no longer playing audio.
+ * Destroys the silent audio sample MediaPlayer, notifying MediaSessionService of the fact we're
+ * no longer playing audio.
*/
private synchronized void releaseMediaKeyFocus() {
Log.d(TAG, "releaseMediaKeyFocus()");
@@ -335,17 +344,20 @@ public class A2dpSinkStreamHandler extends Handler {
}
private boolean isIotDevice() {
- return mA2dpSinkService.getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_EMBEDDED);
+ return mA2dpSinkService
+ .getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_EMBEDDED);
}
private boolean isTvDevice() {
- return mA2dpSinkService.getPackageManager().hasSystemFeature(
- PackageManager.FEATURE_LEANBACK);
+ return mA2dpSinkService
+ .getPackageManager()
+ .hasSystemFeature(PackageManager.FEATURE_LEANBACK);
}
private boolean shouldRequestFocus() {
- return mA2dpSinkService.getResources()
+ return mA2dpSinkService
+ .getResources()
.getBoolean(R.bool.a2dp_sink_automatically_request_audio_focus);
}
}
diff --git a/android/app/src/com/android/bluetooth/a2dpsink/StackEvent.java b/android/app/src/com/android/bluetooth/a2dpsink/StackEvent.java
index 5d0947f03e1dcb531d0380bb1bac11cc6f0e572f..93ade754394f1b2ecb59b9bc4e7cb29817df8f8f 100644
--- a/android/app/src/com/android/bluetooth/a2dpsink/StackEvent.java
+++ b/android/app/src/com/android/bluetooth/a2dpsink/StackEvent.java
@@ -56,8 +56,11 @@ final class StackEvent {
s += "EVENT_TYPE_AUDIO_STATE_CHANGED, state=" + mState;
break;
case EVENT_TYPE_AUDIO_CONFIG_CHANGED:
- s += "EVENT_TYPE_AUDIO_CONFIG_CHANGED, sampleRate=" + mSampleRate
- + ", channelCount=" + mChannelCount;
+ s +=
+ "EVENT_TYPE_AUDIO_CONFIG_CHANGED, sampleRate="
+ + mSampleRate
+ + ", channelCount="
+ + mChannelCount;
break;
default:
s += "Unknown";
@@ -81,8 +84,7 @@ final class StackEvent {
return event;
}
- static StackEvent audioConfigChanged(BluetoothDevice device, int sampleRate,
- int channelCount) {
+ static StackEvent audioConfigChanged(BluetoothDevice device, int sampleRate, int channelCount) {
StackEvent event = new StackEvent(StackEvent.EVENT_TYPE_AUDIO_CONFIG_CHANGED);
event.mDevice = device;
event.mSampleRate = sampleRate;
diff --git a/android/app/src/com/android/bluetooth/audio_util/BrowsablePlayerConnector.java b/android/app/src/com/android/bluetooth/audio_util/BrowsablePlayerConnector.java
index 4e113433b75ae8e2555c4abda124feac366850c4..6386a0ce89f670773fdfa063df62d0660dc86b99 100644
--- a/android/app/src/com/android/bluetooth/audio_util/BrowsablePlayerConnector.java
+++ b/android/app/src/com/android/bluetooth/audio_util/BrowsablePlayerConnector.java
@@ -32,14 +32,13 @@ import java.util.List;
import java.util.Set;
/**
- * This class provides a way to connect to multiple browsable players at a time.
- * It will attempt to simultaneously connect to a list of services that support
- * the MediaBrowserService. After a timeout, the list of connected players will
- * be returned via callback.
+ * This class provides a way to connect to multiple browsable players at a time. It will attempt to
+ * simultaneously connect to a list of services that support the MediaBrowserService. After a
+ * timeout, the list of connected players will be returned via callback.
*
- * The main use of this class is to check whether a player can be browsed despite
- * using the MediaBrowserService. This way we do not have to do the same checks
- * when constructing BrowsedPlayerWrappers by hand.
+ * The main use of this class is to check whether a player can be browsed despite using the
+ * MediaBrowserService. This way we do not have to do the same checks when constructing
+ * BrowsedPlayerWrappers by hand.
*/
public class BrowsablePlayerConnector extends Handler {
private static final String TAG = "AvrcpBrowsablePlayerConnector";
@@ -66,10 +65,7 @@ public class BrowsablePlayerConnector extends Handler {
}
static BrowsablePlayerConnector connectToPlayers(
- Context context,
- Looper looper,
- List Connections are asynchronous in nature. The given callback will be invoked once the
* connection is established. The connection will be torn down once your callback is executed
* when using this function. If you wish to control the lifecycle of the connection on your own
* then use {@link #setCallbackAndConnect(ConnectionCallback)} instead.
@@ -135,19 +136,19 @@ class BrowsedPlayerWrapper {
*/
boolean connect(ConnectionCallback cb) {
if (cb == null) {
- Log.wtf(TAG, "connect: Trying to connect to " + mPackageName
- + "with null callback");
+ Log.wtf(TAG, "connect: Trying to connect to " + mPackageName + "with null callback");
}
- return setCallbackAndConnect((int status, BrowsedPlayerWrapper wrapper) -> {
- cb.run(status, wrapper);
- disconnect();
- });
+ return setCallbackAndConnect(
+ (int status, BrowsedPlayerWrapper wrapper) -> {
+ cb.run(status, wrapper);
+ disconnect();
+ });
}
/**
* Disconnect from the media application's MediaBrowserService
*
- * This clears any pending requests. This function is safe to call even if a connection isn't
+ * This clears any pending requests. This function is safe to call even if a connection isn't
* currently open.
*/
void disconnect() {
@@ -205,26 +206,32 @@ class BrowsedPlayerWrapper {
*/
public boolean playItem(String mediaId) {
Log.d(TAG, "playItem: Play item from media ID: " + mediaId);
- return setCallbackAndConnect((int status, BrowsedPlayerWrapper wrapper) -> {
- Log.d(TAG, "playItem: Connected to browsable player " + mPackageName);
- MediaController controller = MediaControllerFactory.make(mContext,
- wrapper.mWrappedBrowser.getSessionToken());
- MediaController.TransportControls ctrl = controller.getTransportControls();
- Log.i(TAG, "playItem: Playing " + mediaId);
- ctrl.playFromMediaId(mediaId, null);
-
- MediaPlaybackListener mpl = new MediaPlaybackListener(mLooper, controller);
- mpl.waitForPlayback((int playbackStatus) -> {
- Log.i(TAG, "playItem: Media item playback returned, status: " + playbackStatus);
- disconnect();
- });
- });
+ return setCallbackAndConnect(
+ (int status, BrowsedPlayerWrapper wrapper) -> {
+ Log.d(TAG, "playItem: Connected to browsable player " + mPackageName);
+ MediaController controller =
+ MediaControllerFactory.make(
+ mContext, wrapper.mWrappedBrowser.getSessionToken());
+ MediaController.TransportControls ctrl = controller.getTransportControls();
+ Log.i(TAG, "playItem: Playing " + mediaId);
+ ctrl.playFromMediaId(mediaId, null);
+
+ MediaPlaybackListener mpl = new MediaPlaybackListener(mLooper, controller);
+ mpl.waitForPlayback(
+ (int playbackStatus) -> {
+ Log.i(
+ TAG,
+ "playItem: Media item playback returned, status: "
+ + playbackStatus);
+ disconnect();
+ });
+ });
}
/**
* Request the contents of a folder item identified by the given media ID
*
- * Contents must be loaded from a service and are returned asynchronously.
+ * Contents must be loaded from a service and are returned asynchronously.
*
* @param mediaId A string indicating the piece of media you would like to play
* @param cb A Callback that returns the loaded contents of the requested media ID
@@ -244,18 +251,22 @@ class BrowsedPlayerWrapper {
}
if (cb == null) {
- Log.wtf(TAG, "getFolderItems: Trying to connect to " + mPackageName
- + "with null browse callback");
+ Log.wtf(
+ TAG,
+ "getFolderItems: Trying to connect to "
+ + mPackageName
+ + "with null browse callback");
}
Log.d(TAG, "getFolderItems: Connecting to browsable player: " + mPackageName);
- return setCallbackAndConnect((int status, BrowsedPlayerWrapper wrapper) -> {
- Log.i(TAG, "getFolderItems: Connected to browsable player: " + mPackageName);
- if (status != STATUS_SUCCESS) {
- cb.run(status, "", new ArrayList Changing the directory to a browsable player will allow you to traverse that player as normal.
* By only having one root player, we never have to send Addressed Player Changed notifications,
* UIDs Changed notifications, or Available Players Changed notifications.
*
- * TODO (apanicke): Add non-browsable players as song items to the root folder. Selecting that
+ * TODO (apanicke): Add non-browsable players as song items to the root folder. Selecting that
* player would effectively cause player switch by sending a play command to that player.
*/
public class MediaPlayerList {
@@ -116,6 +116,7 @@ public class MediaPlayerList {
public interface MediaUpdateCallback {
void run(MediaData data);
+
void run(boolean availablePlayers, boolean addressedPlayers, boolean uids);
}
@@ -127,13 +128,9 @@ public class MediaPlayerList {
void run(String parentId, List See {@link #onMediaKeyEventSessionChanged}.
*/
@VisibleForTesting
- final MediaSessionManager.OnActiveSessionsChangedListener
- mActiveSessionsChangedListener =
+ final MediaSessionManager.OnActiveSessionsChangedListener mActiveSessionsChangedListener =
new MediaSessionManager.OnActiveSessionsChangedListener() {
- @Override
- public void onActiveSessionsChanged(
- List See {@link #removeMediaPlayer} and {@link
* #addMediaPlayer(android.media.session.MediaController)}
*/
- private final BroadcastReceiver mPackageChangedBroadcastReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- String action = intent.getAction();
- Log.v(TAG, "mPackageChangedBroadcastReceiver: action: " + action);
-
- if (action.equals(Intent.ACTION_PACKAGE_REMOVED)
- || action.equals(Intent.ACTION_PACKAGE_DATA_CLEARED)) {
- if (intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) return;
-
- String packageName = intent.getData().getSchemeSpecificPart();
- if (haveMediaPlayer(packageName)) {
- removeMediaPlayer(mMediaPlayerIds.get(packageName));
- }
- } else if (action.equals(Intent.ACTION_PACKAGE_ADDED)
- || action.equals(Intent.ACTION_PACKAGE_CHANGED)) {
- String packageName = intent.getData().getSchemeSpecificPart();
- if (packageName != null) {
- Log.d(TAG, "Name of package changed: " + packageName);
- // TODO (apanicke): Handle either updating or adding the new package.
- // Check if its browsable and send the UIDS changed to update the
- // root folder
+ private final BroadcastReceiver mPackageChangedBroadcastReceiver =
+ new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String action = intent.getAction();
+ Log.v(TAG, "mPackageChangedBroadcastReceiver: action: " + action);
+
+ if (action.equals(Intent.ACTION_PACKAGE_REMOVED)
+ || action.equals(Intent.ACTION_PACKAGE_DATA_CLEARED)) {
+ if (intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) return;
+
+ String packageName = intent.getData().getSchemeSpecificPart();
+ if (haveMediaPlayer(packageName)) {
+ removeMediaPlayer(mMediaPlayerIds.get(packageName));
+ }
+ } else if (action.equals(Intent.ACTION_PACKAGE_ADDED)
+ || action.equals(Intent.ACTION_PACKAGE_CHANGED)) {
+ String packageName = intent.getData().getSchemeSpecificPart();
+ if (packageName != null) {
+ Log.d(TAG, "Name of package changed: " + packageName);
+ // TODO (apanicke): Handle either updating or adding the new package.
+ // Check if its browsable and send the UIDS changed to update the
+ // root folder
+ }
+ }
}
- }
- }
- };
+ };
/**
* Retrieves and sends the current {@link MediaData} of the active player (if present) to the
@@ -948,35 +977,32 @@ public class MediaPlayerList {
PlaybackState currState = null;
if (getActivePlayer() == null) {
Log.d(TAG, "updateMediaForAudioPlayback: no active player");
- PlaybackState.Builder builder = new PlaybackState.Builder()
- .setState(PlaybackState.STATE_STOPPED, 0L, 0f);
+ PlaybackState.Builder builder =
+ new PlaybackState.Builder().setState(PlaybackState.STATE_STOPPED, 0L, 0f);
List The maximum allowed deviation is defined by PLAYSTATE_BOUNCE_IGNORE_PERIOD and is measured
* in milliseconds.
*/
private static final long PLAYSTATE_BOUNCE_IGNORE_PERIOD = 500;
+
public static boolean playstateEquals(PlaybackState a, PlaybackState b) {
if (a == b) return true;
- if (a != null && b != null
+ if (a != null
+ && b != null
&& a.getState() == b.getState()
&& a.getActiveQueueItemId() == b.getActiveQueueItemId()
&& Math.abs(a.getPosition() - b.getPosition()) < PLAYSTATE_BOUNCE_IGNORE_PERIOD) {
diff --git a/android/app/src/com/android/bluetooth/audio_util/PlayerSettingsManager.java b/android/app/src/com/android/bluetooth/audio_util/PlayerSettingsManager.java
index 1da13649bc84a825c6a289887a688a7a12cd6ed0..43733ec15ed8b358edcd99033ada7275fa56e432 100644
--- a/android/app/src/com/android/bluetooth/audio_util/PlayerSettingsManager.java
+++ b/android/app/src/com/android/bluetooth/audio_util/PlayerSettingsManager.java
@@ -23,9 +23,7 @@ import android.util.Log;
import com.android.bluetooth.avrcp.AvrcpTargetService;
-/**
- * Manager class for player apps.
- */
+/** Manager class for player apps. */
public class PlayerSettingsManager {
private static final String TAG = PlayerSettingsManager.class.getSimpleName();
@@ -49,8 +47,10 @@ public class PlayerSettingsManager {
MediaPlayerWrapper wrapper = mMediaPlayerList.getActivePlayer();
if (wrapper != null) {
- mActivePlayerController = new MediaControllerCompat(mService,
- MediaSessionCompat.Token.fromToken(wrapper.getSessionToken()));
+ mActivePlayerController =
+ new MediaControllerCompat(
+ mService,
+ MediaSessionCompat.Token.fromToken(wrapper.getSessionToken()));
if (!registerMediaControllerCallback(mActivePlayerController, mControllerCallback)) {
mActivePlayerController = null;
}
@@ -59,9 +59,7 @@ public class PlayerSettingsManager {
}
}
- /**
- * Unregister callbacks
- */
+ /** Unregister callbacks */
public void cleanup() {
updateRemoteDevice();
if (mActivePlayerController != null) {
@@ -69,16 +67,17 @@ public class PlayerSettingsManager {
}
}
- /**
- * Updates the active player controller.
- */
+ /** Updates the active player controller. */
private void activePlayerChanged(MediaPlayerWrapper mediaPlayerWrapper) {
if (mActivePlayerController != null) {
unregisterMediaControllerCallback(mActivePlayerController, mControllerCallback);
}
if (mediaPlayerWrapper != null) {
- mActivePlayerController = new MediaControllerCompat(mService,
- MediaSessionCompat.Token.fromToken(mediaPlayerWrapper.getSessionToken()));
+ mActivePlayerController =
+ new MediaControllerCompat(
+ mService,
+ MediaSessionCompat.Token.fromToken(
+ mediaPlayerWrapper.getSessionToken()));
if (!registerMediaControllerCallback(mActivePlayerController, mControllerCallback)) {
mActivePlayerController = null;
updateRemoteDevice();
@@ -92,12 +91,9 @@ public class PlayerSettingsManager {
/**
* Sends the MediaController values of the active player to the remote device.
*
- * This is called when:
- * - The class is created and the session is ready
- * - The class is destroyed
- * - The active player changed and the session is ready
- * - The last active player has been removed
- * - The repeat / shuffle player state changed
+ * This is called when: - The class is created and the session is ready - The class is
+ * destroyed - The active player changed and the session is ready - The last active player has
+ * been removed - The repeat / shuffle player state changed
*/
private void updateRemoteDevice() {
int repeatMode = getPlayerRepeatMode();
@@ -111,9 +107,7 @@ public class PlayerSettingsManager {
mService.sendPlayerSettings(repeatMode, shuffleMode);
}
- /**
- * Called from remote device to set the active player repeat mode.
- */
+ /** Called from remote device to set the active player repeat mode. */
public boolean setPlayerRepeatMode(int repeatMode) {
if (mActivePlayerController == null) {
return false;
@@ -144,9 +138,7 @@ public class PlayerSettingsManager {
}
}
- /**
- * Called from remote device to set the active player shuffle mode.
- */
+ /** Called from remote device to set the active player shuffle mode. */
public boolean setPlayerShuffleMode(int shuffleMode) {
if (mActivePlayerController == null) {
Log.i(TAG, "setPlayerShuffleMode: no active player");
@@ -283,58 +275,36 @@ public class PlayerSettingsManager {
}
}
- /**
- * Class containing all the Shuffle/Repeat values as defined in the BT spec.
- */
+ /** Class containing all the Shuffle/Repeat values as defined in the BT spec. */
public static final class PlayerSettingsValues {
- /**
- * Repeat setting, as defined by Bluetooth specification.
- */
+ /** Repeat setting, as defined by Bluetooth specification. */
public static final int SETTING_REPEAT = 2;
- /**
- * Shuffle setting, as defined by Bluetooth specification.
- */
+ /** Shuffle setting, as defined by Bluetooth specification. */
public static final int SETTING_SHUFFLE = 3;
- /**
- * Repeat OFF state, as defined by Bluetooth specification.
- */
+ /** Repeat OFF state, as defined by Bluetooth specification. */
public static final int STATE_REPEAT_OFF = 1;
- /**
- * Single track repeat, as defined by Bluetooth specification.
- */
+ /** Single track repeat, as defined by Bluetooth specification. */
public static final int STATE_REPEAT_SINGLE_TRACK = 2;
- /**
- * All track repeat, as defined by Bluetooth specification.
- */
+ /** All track repeat, as defined by Bluetooth specification. */
public static final int STATE_REPEAT_ALL_TRACK = 3;
- /**
- * Group repeat, as defined by Bluetooth specification.
- */
+ /** Group repeat, as defined by Bluetooth specification. */
public static final int STATE_REPEAT_GROUP = 4;
- /**
- * Shuffle OFF state, as defined by Bluetooth specification.
- */
+ /** Shuffle OFF state, as defined by Bluetooth specification. */
public static final int STATE_SHUFFLE_OFF = 1;
- /**
- * All track shuffle, as defined by Bluetooth specification.
- */
+ /** All track shuffle, as defined by Bluetooth specification. */
public static final int STATE_SHUFFLE_ALL_TRACK = 2;
- /**
- * Group shuffle, as defined by Bluetooth specification.
- */
+ /** Group shuffle, as defined by Bluetooth specification. */
public static final int STATE_SHUFFLE_GROUP = 3;
- /**
- * Default state off.
- */
+ /** Default state off. */
public static final int STATE_DEFAULT_OFF = 1;
}
diff --git a/android/app/src/com/android/bluetooth/audio_util/helpers/Image.java b/android/app/src/com/android/bluetooth/audio_util/helpers/Image.java
index 1b53eec236774261b3d51cf7829ad6867cf98521..fc106e9a956a186b59832e4de88c24e61c357fc4 100644
--- a/android/app/src/com/android/bluetooth/audio_util/helpers/Image.java
+++ b/android/app/src/com/android/bluetooth/audio_util/helpers/Image.java
@@ -30,7 +30,7 @@ import java.io.InputStream;
/**
* An object to represent an image from the Media Framework
*
- * This object abstracts away the method used to get the bitmap and provides a way for us to
+ * This object abstracts away the method used to get the bitmap and provides a way for us to
* determine image equality in an application/folder/item agnostic way.
*/
public class Image {
@@ -49,9 +49,7 @@ public class Image {
// solution has picked for this image and pass this object on directly.
private String mImageHandle = null;
- /**
- * Create an Image object from a MediaMetadata object
- */
+ /** Create an Image object from a MediaMetadata object */
public Image(Context context, MediaMetadata metadata) {
mContext = context;
@@ -83,9 +81,7 @@ public class Image {
}
}
- /**
- * Create an image out of a bundle of MediaMetadata keyed values
- */
+ /** Create an image out of a bundle of MediaMetadata keyed values */
public Image(Context context, Bundle bundle) {
mContext = context;
@@ -117,9 +113,7 @@ public class Image {
}
}
- /**
- * Create an Image object from a MediaDescription object
- */
+ /** Create an Image object from a MediaDescription object */
public Image(Context context, MediaDescription desc) {
mContext = context;
Uri uri = desc.getIconUri();
@@ -131,34 +125,26 @@ public class Image {
}
}
- /**
- * Create an Image object from a raw image uri
- */
+ /** Create an Image object from a raw image uri */
public Image(Context context, Uri uri) {
mContext = context;
setImage(uri);
}
- /**
- * Create an Image object from a raw image
- */
+ /** Create an Image object from a raw image */
public Image(Context context, Bitmap image) {
mContext = context;
setImage(image);
}
- /**
- * Set the image by resolving a URI to a bitmap
- */
+ /** Set the image by resolving a URI to a bitmap */
private void setImage(String uriString) {
if (uriString == null) return;
Uri uri = Uri.parse(uriString);
setImage(uri);
}
- /**
- * Set the image by resolving a URI to a bitmap
- */
+ /** Set the image by resolving a URI to a bitmap */
private void setImage(Uri uri) {
if (uri == null) return;
Bitmap image = getImageFromUri(uri);
@@ -167,18 +153,14 @@ public class Image {
setSource(SOURCE_URI);
}
- /**
- * Set the image directly from a bitmap
- */
+ /** Set the image directly from a bitmap */
private void setImage(Bitmap image) {
if (image == null) return;
mImage = image;
setSource(SOURCE_BITMAP);
}
- /**
- * Get the bitmap associated with this Image
- */
+ /** Get the bitmap associated with this Image */
public Bitmap getImage() {
return mImage;
}
@@ -186,7 +168,7 @@ public class Image {
/**
* Get an image Bitmap from a Uri
*
- * Used to convert Uris into the images they represent
+ * Used to convert Uris into the images they represent
*
* @param uri A Uri pointing to an image
* @return A Bitmap object representing the image at the given Uri
@@ -216,7 +198,7 @@ public class Image {
/**
* Get the source of the image, if known
*
- * Images currently come from either raw bitmaps or a URI that points to a ContentProvider.
+ * Images currently come from either raw bitmaps or a URI that points to a ContentProvider.
* This allows us to set where it came from, largely used for debug purposes.
*/
public int getSource() {
@@ -226,30 +208,24 @@ public class Image {
/**
* Set the source of the image.
*
- * Images currently come from either raw bitmaps or a URI that points to a ContentProvider.
+ * Images currently come from either raw bitmaps or a URI that points to a ContentProvider.
* This allows us to set where it came from, largely used for debug purposes.
*/
private void setSource(int source) {
mSource = source;
}
- /**
- * Assign a handle value from your storage solution to this image
- */
+ /** Assign a handle value from your storage solution to this image */
public void setImageHandle(String handle) {
mImageHandle = handle;
}
- /**
- * Get the handle value associated with this image from your storage situation
- */
+ /** Get the handle value associated with this image from your storage situation */
public String getImageHandle() {
return mImageHandle;
}
- /**
- * Determine if two image objects are the same.
- */
+ /** Determine if two image objects are the same. */
public static boolean sameAs(Image l, Image r) {
if (l == null && r == null) return true;
if (l == null || r == null) return false;
@@ -258,9 +234,7 @@ public class Image {
return bmp.sameAs(r.getImage());
}
- /**
- * Get a string representation of the image and its metadata
- */
+ /** Get a string representation of the image and its metadata */
@Override
public String toString() {
return " Note that creating URI images will dramatically increase memory usage.
*/
public static boolean areUriImagesSupported(Context context) {
if (context == null) return false;
return context.getResources().getBoolean(R.bool.avrcp_target_cover_art_uri_images);
}
- /**
- * Translate a MediaItem to audio_util's Metadata
- */
+ /** Translate a MediaItem to audio_util's Metadata */
public static Metadata toMetadata(Context context, MediaItem item) {
Metadata.Builder builder = new Metadata.Builder();
try {
@@ -75,9 +69,7 @@ class Util {
}
}
- /**
- * Translate a MediaSession.QueueItem to audio_util's Metadata
- */
+ /** Translate a MediaSession.QueueItem to audio_util's Metadata */
public static Metadata toMetadata(Context context, MediaSession.QueueItem item) {
Metadata.Builder builder = new Metadata.Builder();
@@ -95,28 +87,27 @@ class Util {
return builder.build();
}
- /**
- * Translate a MediaMetadata to audio_util's Metadata
- */
+ /** Translate a MediaMetadata to audio_util's Metadata */
public static Metadata toMetadata(Context context, MediaMetadata data) {
Metadata.Builder builder = new Metadata.Builder();
// This will always be currsong. The AVRCP service will overwrite the mediaId if it needs to
// TODO (apanicke): Remove when the service is ready, right now it makes debugging much more
// convenient
try {
- return builder.useContext(context).useDefaults().fromMediaMetadata(data)
- .setMediaId("currsong").build();
+ return builder.useContext(context)
+ .useDefaults()
+ .fromMediaMetadata(data)
+ .setMediaId("currsong")
+ .build();
} catch (Exception e) {
Log.e(TAG, "Failed to build Metadata from MediaMetadata, returning empty data", e);
return empty_data();
}
}
- /**
- * Translate a list of MediaSession.QueueItem to a list of audio_util's Metadata
- */
- public static List An image handle a 9 character string of numbers 0-9 only. Anything else is invalid. This
+ * is defined in section 4.4.4 (Image Handles) of the BIP specification, which is inherited by
+ * the AVRCP specification.
*
* @return True if the image handle is valid, false otherwise.
*/
@@ -195,7 +187,7 @@ public class AvrcpBipObexServer extends ServerRequestHandler {
return true;
}
- private int handleGetImageThumbnail(Operation op)throws IOException {
+ private int handleGetImageThumbnail(Operation op) throws IOException {
HeaderSet request = op.getReceivedHeader();
String imageHandle = (String) request.getHeader(HEADER_ID_IMG_HANDLE);
@@ -312,9 +304,7 @@ public class AvrcpBipObexServer extends ServerRequestHandler {
return sendResponse(op, replyHeaders, imageBytes);
}
- /**
- * Send a response to the given operation using the given headers and bytes.
- */
+ /** Send a response to the given operation using the given headers and bytes. */
private int sendResponse(Operation op, HeaderSet replyHeaders, byte[] bytes) {
if (op != null && bytes != null && replyHeaders != null) {
OutputStream outStream = null;
@@ -337,7 +327,8 @@ public class AvrcpBipObexServer extends ServerRequestHandler {
if (outStream != null) {
try {
outStream.close();
- } catch (IOException e) { }
+ } catch (IOException e) {
+ }
}
}
// If we didn't write everything then send the error code
diff --git a/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtService.java b/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtService.java
index 867706d309b89cfcfa0057ea60b626f27b10ee53..c2db89ba19da0602a8db77fd36ba598c4589e269 100644
--- a/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtService.java
+++ b/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtService.java
@@ -33,8 +33,8 @@ import java.util.HashMap;
/**
* The AVRCP Cover Art Service
*
- * This service handles allocation of image handles and storage of images. It also owns the
- * BIP OBEX server that handles requests to get AVRCP cover artwork.
+ * This service handles allocation of image handles and storage of images. It also owns the BIP
+ * OBEX server that handles requests to get AVRCP cover artwork.
*/
public class AvrcpCoverArtService {
private static final String TAG = AvrcpCoverArtService.class.getSimpleName();
@@ -42,8 +42,8 @@ public class AvrcpCoverArtService {
private static final int COVER_ART_STORAGE_MAX_ITEMS = 32;
/**
- * Limiting transmit packet size because some carkits are disconnected if
- * AVRCP Cover Art OBEX packet size exceed 1024 bytes.
+ * Limiting transmit packet size because some carkits are disconnected if AVRCP Cover Art OBEX
+ * packet size exceed 1024 bytes.
*/
private static final int MAX_TRANSMIT_PACKET_SIZE = 1024;
@@ -71,7 +71,7 @@ public class AvrcpCoverArtService {
/**
* Start the AVRCP Cover Art Service.
*
- * This will start up a BIP OBEX server and record the l2cap psm in the SDP record, and begin
+ * This will start up a BIP OBEX server and record the l2cap psm in the SDP record, and begin
* accepting connections.
*/
public boolean start() {
@@ -87,7 +87,7 @@ public class AvrcpCoverArtService {
/**
* Stop the AVRCP Cover Art Service.
*
- * Tear down existing connections, remove ourselved from the SDP record.
+ * Tear down existing connections, remove ourselved from the SDP record.
*/
public boolean stop() {
debug("Stopping service");
@@ -142,35 +142,27 @@ public class AvrcpCoverArtService {
}
}
- /**
- * Store an image with the service and gets the image handle it's associated with.
- */
+ /** Store an image with the service and gets the image handle it's associated with. */
public String storeImage(Image image) {
debug("storeImage(image='" + image + "')");
if (image == null || image.getImage() == null) return null;
return mStorage.storeImage(new CoverArt(image));
}
- /**
- * Get the image stored at the given image handle, if it exists
- */
+ /** Get the image stored at the given image handle, if it exists */
public CoverArt getImage(String imageHandle) {
debug("getImage(" + imageHandle + ")");
return mStorage.getImage(imageHandle);
}
- /**
- * Add a BIP L2CAP PSM to the AVRCP Target SDP Record
- */
+ /** Add a BIP L2CAP PSM to the AVRCP Target SDP Record */
private void registerBipServer(int psm) {
debug("Add our PSM (" + psm + ") to the AVRCP Target SDP record");
mNativeInterface.registerBipServer(psm);
return;
}
- /**
- * Remove any BIP L2CAP PSM from the AVRCP Target SDP Record
- */
+ /** Remove any BIP L2CAP PSM from the AVRCP Target SDP Record */
private void unregisterBipServer() {
debug("Remove the PSM remove the AVRCP Target SDP record");
mNativeInterface.unregisterBipServer();
@@ -180,8 +172,8 @@ public class AvrcpCoverArtService {
/**
* Connect a device with the server
*
- * Since the server cannot explicitly make clients connect, this function is internal only and
- * provides a place for us to do required book keeping when we've decided to accept a client
+ * Since the server cannot explicitly make clients connect, this function is internal only
+ * and provides a place for us to do required book keeping when we've decided to accept a client
*/
private boolean connect(BluetoothDevice device, BluetoothSocket socket) {
debug("Connect '" + device + "'");
@@ -210,9 +202,11 @@ public class AvrcpCoverArtService {
disconnect(device);
}
});
- BluetoothObexTransport transport = new BluetoothObexTransport(socket,
- MAX_TRANSMIT_PACKET_SIZE,
- BluetoothObexTransport.PACKET_SIZE_UNSPECIFIED);
+ BluetoothObexTransport transport =
+ new BluetoothObexTransport(
+ socket,
+ MAX_TRANSMIT_PACKET_SIZE,
+ BluetoothObexTransport.PACKET_SIZE_UNSPECIFIED);
transport.setConnectionForCoverArt(true);
try {
ServerSession session = new ServerSession(transport, s, null);
@@ -225,9 +219,7 @@ public class AvrcpCoverArtService {
}
}
- /**
- * Explicitly disconnect a device from our BIP server if its connected.
- */
+ /** Explicitly disconnect a device from our BIP server if its connected. */
public void disconnect(BluetoothDevice device) {
debug("disconnect '" + device + "'");
// Closing the server session closes the underlying transport, which closes the underlying
@@ -245,7 +237,7 @@ public class AvrcpCoverArtService {
/**
* A Socket Acceptor to handle incoming connections to our BIP Server.
*
- * If we are accepting connections and the device is permitted, then this class will create a
+ * If we are accepting connections and the device is permitted, then this class will create a
* session with our AvrcpBipObexServer.
*/
private class SocketAcceptor implements IObexConnectionHandler {
@@ -269,9 +261,7 @@ public class AvrcpCoverArtService {
}
}
- /**
- * Dump useful debug information about this service to a string
- */
+ /** Dump useful debug information about this service to a string */
public void dump(StringBuilder sb) {
int psm = getL2capPsm();
sb.append("AvrcpCoverArtService:");
@@ -283,16 +273,12 @@ public class AvrcpCoverArtService {
sb.append("\n");
}
- /**
- * Print a message to DEBUG if debug output is enabled
- */
+ /** Print a message to DEBUG if debug output is enabled */
private void debug(String msg) {
Log.d(TAG, msg);
}
- /**
- * Print a message to ERROR
- */
+ /** Print a message to ERROR */
private void error(String msg) {
Log.e(TAG, msg);
}
diff --git a/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtStorage.java b/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtStorage.java
index 3348da981fe5f000168fdd515001ca4550870c96..9c53bc50ffe164c903a2118fee3c933ce683c86b 100644
--- a/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtStorage.java
+++ b/android/app/src/com/android/bluetooth/avrcp/AvrcpCoverArtStorage.java
@@ -22,9 +22,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-/**
- * A class abstracting the storage method of cover art images
- */
+/** A class abstracting the storage method of cover art images */
final class AvrcpCoverArtStorage {
private static final String TAG = AvrcpCoverArtStorage.class.getSimpleName();
@@ -36,16 +34,12 @@ final class AvrcpCoverArtStorage {
private final Map Values are integers in the domain [0, 9999999], represented as zero-padded strings.
+ * Getting an image handle assumes you will use it.
*/
private String getNextImageHandle() {
synchronized (mHandlesLock) {
@@ -193,16 +181,12 @@ final class AvrcpCoverArtStorage {
sb.append("\n\tImage bytes: " + bytes);
}
- /**
- * Print a message to DEBUG if debug output is enabled
- */
+ /** Print a message to DEBUG if debug output is enabled */
private void debug(String msg) {
Log.d(TAG, msg);
}
- /**
- * Print a message to ERROR
- */
+ /** Print a message to ERROR */
private void error(String msg) {
Log.e(TAG, msg);
}
diff --git a/android/app/src/com/android/bluetooth/avrcp/AvrcpNativeInterface.java b/android/app/src/com/android/bluetooth/avrcp/AvrcpNativeInterface.java
index 0afdeacf808d8d4e1e2e17ebb8aec7392a48f144..448bb6001094a699cb0c3577712e78e9eb3d993c 100644
--- a/android/app/src/com/android/bluetooth/avrcp/AvrcpNativeInterface.java
+++ b/android/app/src/com/android/bluetooth/avrcp/AvrcpNativeInterface.java
@@ -34,8 +34,7 @@ import java.util.List;
import java.util.Objects;
/**
- * Native Interface to communicate with the JNI layer. This class should never be passed null
- * data.
+ * Native Interface to communicate with the JNI layer. This class should never be passed null data.
*/
public class AvrcpNativeInterface {
private static final String TAG = AvrcpNativeInterface.class.getSimpleName();
@@ -49,8 +48,10 @@ public class AvrcpNativeInterface {
private AdapterService mAdapterService;
private AvrcpNativeInterface() {
- mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),
- "AdapterService cannot be null when AvrcpNativeInterface init");
+ mAdapterService =
+ Objects.requireNonNull(
+ AdapterService.getAdapterService(),
+ "AdapterService cannot be null when AvrcpNativeInterface init");
}
static AvrcpNativeInterface getInstance() {
@@ -175,15 +176,19 @@ public class AvrcpNativeInterface {
// anything internally. It just returns the number of items in the root folder.
void setBrowsedPlayer(int playerId) {
d("setBrowsedPlayer: playerId=" + playerId);
- mAvrcpService.getPlayerRoot(playerId, (a, b, c, d) ->
- setBrowsedPlayerResponse(a, b, c, d));
+ mAvrcpService.getPlayerRoot(playerId, (a, b, c, d) -> setBrowsedPlayerResponse(a, b, c, d));
}
void setBrowsedPlayerResponse(int playerId, boolean success, String rootId, int numItems) {
- d("setBrowsedPlayerResponse: playerId=" + playerId
- + " success=" + success
- + " rootId=" + rootId
- + " numItems=" + numItems);
+ d(
+ "setBrowsedPlayerResponse: playerId="
+ + playerId
+ + " success="
+ + success
+ + " rootId="
+ + rootId
+ + " numItems="
+ + numItems);
setBrowsedPlayerResponseNative(playerId, success, rootId, numItems);
}
@@ -198,16 +203,24 @@ public class AvrcpNativeInterface {
}
void sendMediaUpdate(boolean metadata, boolean playStatus, boolean queue) {
- d("sendMediaUpdate: metadata=" + metadata
- + " playStatus=" + playStatus
- + " queue=" + queue);
+ d(
+ "sendMediaUpdate: metadata="
+ + metadata
+ + " playStatus="
+ + playStatus
+ + " queue="
+ + queue);
sendMediaUpdateNative(metadata, playStatus, queue);
}
void sendFolderUpdate(boolean availablePlayers, boolean addressedPlayers, boolean uids) {
- d("sendFolderUpdate: availablePlayers=" + availablePlayers
- + " addressedPlayers=" + addressedPlayers
- + " uids=" + uids);
+ d(
+ "sendFolderUpdate: availablePlayers="
+ + availablePlayers
+ + " addressedPlayers="
+ + addressedPlayers
+ + " uids="
+ + uids);
sendFolderUpdateNative(availablePlayers, addressedPlayers, uids);
}
@@ -231,13 +244,15 @@ public class AvrcpNativeInterface {
}
void setActiveDevice(String bdaddr) {
- BluetoothDevice device = mAdapterService.getDeviceFromByte(Utils.getBytesFromAddress(bdaddr));
+ BluetoothDevice device =
+ mAdapterService.getDeviceFromByte(Utils.getBytesFromAddress(bdaddr));
d("setActiveDevice: device=" + device);
mAvrcpService.setActiveDevice(device);
}
void deviceConnected(String bdaddr, boolean absoluteVolume) {
- BluetoothDevice device = mAdapterService.getDeviceFromByte(Utils.getBytesFromAddress(bdaddr));
+ BluetoothDevice device =
+ mAdapterService.getDeviceFromByte(Utils.getBytesFromAddress(bdaddr));
d("deviceConnected: device=" + device + " absoluteVolume=" + absoluteVolume);
if (mAvrcpService == null) {
Log.w(TAG, "deviceConnected: AvrcpTargetService is null");
@@ -248,7 +263,8 @@ public class AvrcpNativeInterface {
}
void deviceDisconnected(String bdaddr) {
- BluetoothDevice device = mAdapterService.getDeviceFromByte(Utils.getBytesFromAddress(bdaddr));
+ BluetoothDevice device =
+ mAdapterService.getDeviceFromByte(Utils.getBytesFromAddress(bdaddr));
d("deviceDisconnected: device=" + device);
if (mAvrcpService == null) {
Log.w(TAG, "deviceDisconnected: AvrcpTargetService is null");
@@ -307,8 +323,7 @@ public class AvrcpNativeInterface {
valuesArray = new byte[1];
valuesArray[0] = PlayerSettingsValues.STATE_DEFAULT_OFF;
}
- listPlayerSettingValuesResponseNative(
- settingRequest, valuesArray);
+ listPlayerSettingValuesResponseNative(settingRequest, valuesArray);
}
/** Request from remote current values for player settings. */
diff --git a/android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java b/android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java
index 2c3096390ebe80e4199d7ce5ea6dfd1d187ed3a9..cbe855fbf0fbfcd52f1eb6071d540413444f5d36 100644
--- a/android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java
+++ b/android/app/src/com/android/bluetooth/avrcp/AvrcpTargetService.java
@@ -117,16 +117,21 @@ public class AvrcpTargetService extends ProfileService {
boolean state = !MediaPlayerWrapper.playstateEquals(mCurrentData.state, data.state);
boolean queue = !Objects.equals(mCurrentData.queue, data.queue);
- Log.d(TAG, "onMediaUpdated: track_changed=" + metadata
- + " state=" + state + " queue=" + queue);
+ Log.d(
+ TAG,
+ "onMediaUpdated: track_changed="
+ + metadata
+ + " state="
+ + state
+ + " queue="
+ + queue);
mCurrentData = data;
mNativeInterface.sendMediaUpdate(metadata, state, queue);
}
@Override
- public void run(boolean availablePlayers, boolean addressedPlayers,
- boolean uids) {
+ public void run(boolean availablePlayers, boolean addressedPlayers, boolean uids) {
if (mNativeInterface == null) return;
mNativeInterface.sendFolderUpdate(availablePlayers, addressedPlayers, uids);
@@ -403,7 +408,8 @@ public class AvrcpTargetService extends ProfileService {
/** Returns the current play status of the active player from {@link MediaPlayerList}. */
PlayStatus getPlayState() {
- return PlayStatus.fromPlaybackState(mMediaPlayerList.getCurrentPlayStatus(),
+ return PlayStatus.fromPlaybackState(
+ mMediaPlayerList.getCurrentPlayStatus(),
Long.parseLong(getCurrentSongInfo().duration));
}
diff --git a/android/app/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java b/android/app/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
index 9a7786d671696931c4dd7bd04758f756394b7d4a..f96f68c29ed4194e94375b4ea5fff1603767c58d 100644
--- a/android/app/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
+++ b/android/app/src/com/android/bluetooth/avrcp/AvrcpVolumeManager.java
@@ -59,8 +59,7 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
private static final String VOLUME_MAP = "bluetooth_volume_map";
private static final String VOLUME_CHANGE_LOG_TITLE = "BTAudio Volume Events";
- @VisibleForTesting
- static final int AVRCP_MAX_VOL = 127;
+ @VisibleForTesting static final int AVRCP_MAX_VOL = 127;
private static final int STREAM_MUSIC = AudioManager.STREAM_MUSIC;
private static final int VOLUME_CHANGE_LOGGER_SIZE = 30;
private static int sDeviceMaxVolume = 0;
@@ -156,8 +155,8 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
// If absolute volume for the device is supported, set the volume for the device
if (mDeviceMap.get(device)) {
int avrcpVolume = systemToAvrcpVolume(savedVolume);
- mVolumeEventLogger.logd(TAG,
- "switchVolumeDevice: Updating device volume: avrcpVolume=" + avrcpVolume);
+ mVolumeEventLogger.logd(
+ TAG, "switchVolumeDevice: Updating device volume: avrcpVolume=" + avrcpVolume);
mNativeInterface.sendVolumeChanged(device, avrcpVolume);
}
}
@@ -168,8 +167,8 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
* Fills {@code mVolumeMap} with content from {@link #getVolumeMap}, removing unbonded
* devices if necessary.
*/
- AvrcpVolumeManager(Context context, AudioManager audioManager,
- AvrcpNativeInterface nativeInterface) {
+ AvrcpVolumeManager(
+ Context context, AudioManager audioManager, AvrcpNativeInterface nativeInterface) {
mContext = context;
mAudioManager = audioManager;
mNativeInterface = nativeInterface;
@@ -207,8 +206,12 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
return;
}
SharedPreferences.Editor pref = getVolumeMap().edit();
- mVolumeEventLogger.logd(TAG, "storeVolume: Storing stream volume level for device "
- + device + " : " + storeVolume);
+ mVolumeEventLogger.logd(
+ TAG,
+ "storeVolume: Storing stream volume level for device "
+ + device
+ + " : "
+ + storeVolume);
mVolumeMap.put(device, storeVolume);
pref.putInt(device.getAddress(), storeVolume);
// Always use apply() since it is asynchronous, otherwise the call can hang waiting for
@@ -221,7 +224,7 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
* #storeVolumeForDevice(BluetoothDevice, int)} with {@code device}.
*/
synchronized void storeVolumeForDevice(@NonNull BluetoothDevice device) {
- int storeVolume = mAudioManager.getLastAudibleStreamVolume(STREAM_MUSIC);
+ int storeVolume = mAudioManager.getLastAudibleStreamVolume(STREAM_MUSIC);
storeVolumeForDevice(device, storeVolume);
}
@@ -234,8 +237,8 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
return;
}
SharedPreferences.Editor pref = getVolumeMap().edit();
- mVolumeEventLogger.logd(TAG,
- "RemoveStoredVolume: Remove stored stream volume level for device " + device);
+ mVolumeEventLogger.logd(
+ TAG, "RemoveStoredVolume: Remove stored stream volume level for device " + device);
mVolumeMap.remove(device);
pref.remove(device.getAddress());
// Always use apply() since it is asynchronous, otherwise the call can hang waiting for
@@ -273,14 +276,22 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
*/
void setVolume(@NonNull BluetoothDevice device, int avrcpVolume) {
int deviceVolume = avrcpToSystemVolume(avrcpVolume);
- mVolumeEventLogger.logd(TAG, "setVolume:"
- + " device=" + device
- + " avrcpVolume=" + avrcpVolume
- + " deviceVolume=" + deviceVolume
- + " sDeviceMaxVolume=" + sDeviceMaxVolume);
- mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, deviceVolume,
+ mVolumeEventLogger.logd(
+ TAG,
+ "setVolume:"
+ + " device="
+ + device
+ + " avrcpVolume="
+ + avrcpVolume
+ + " deviceVolume="
+ + deviceVolume
+ + " sDeviceMaxVolume="
+ + sDeviceMaxVolume);
+ mAudioManager.setStreamVolume(
+ AudioManager.STREAM_MUSIC,
+ deviceVolume,
(deviceVolume != getVolume(device, -1) ? AudioManager.FLAG_SHOW_UI : 0)
- | AudioManager.FLAG_BLUETOOTH_ABS_VOLUME);
+ | AudioManager.FLAG_BLUETOOTH_ABS_VOLUME);
storeVolumeForDevice(device);
}
@@ -297,11 +308,17 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
return;
}
int avrcpVolume = systemToAvrcpVolume(deviceVolume);
- mVolumeEventLogger.logd(TAG, "sendVolumeChanged:"
- + " device=" + device
- + " avrcpVolume=" + avrcpVolume
- + " deviceVolume=" + deviceVolume
- + " sDeviceMaxVolume=" + sDeviceMaxVolume);
+ mVolumeEventLogger.logd(
+ TAG,
+ "sendVolumeChanged:"
+ + " device="
+ + device
+ + " avrcpVolume="
+ + avrcpVolume
+ + " deviceVolume="
+ + deviceVolume
+ + " sDeviceMaxVolume="
+ + sDeviceMaxVolume);
mNativeInterface.sendVolumeChanged(device, avrcpVolume);
storeVolumeForDevice(device);
}
@@ -403,13 +420,15 @@ class AvrcpVolumeManager extends AudioDeviceCallback {
sb.append(" mCurrentDevice: " + mCurrentDevice + "\n");
sb.append(" Current System Volume: " + mAudioManager.getStreamVolume(STREAM_MUSIC) + "\n");
sb.append(" Device Volume Memory Map:\n");
- sb.append(String.format(" %-17s : %-14s : %3s : %s\n",
- "Device Address", "Device Name", "Vol", "AbsVol"));
+ sb.append(
+ String.format(
+ " %-17s : %-14s : %3s : %s\n",
+ "Device Address", "Device Name", "Vol", "AbsVol"));
Map This object abstracts away the actual storage method and provides a means for others to
* understand available formats and get the underlying image in a particular format.
*
- * All return values are ready to use by a BIP server.
+ * All return values are ready to use by a BIP server.
*/
public class CoverArt {
private static final String TAG = CoverArt.class.getSimpleName();
@@ -45,9 +45,7 @@ public class CoverArt {
private String mImageHandle = null;
private Bitmap mImage = null;
- /**
- * Create a CoverArt object from an audio_util Image abstraction
- */
+ /** Create a CoverArt object from an audio_util Image abstraction */
CoverArt(Image image) {
// Create a scaled version of the image for now, as consumers don't need
// anything larger than this at the moment. Also makes each image gathered
@@ -58,7 +56,7 @@ public class CoverArt {
/**
* Get the image handle that has been associated with this image.
*
- * If this returns null then you will fail to generate image properties
+ * If this returns null then you will fail to generate image properties
*/
public String getImageHandle() {
return mImageHandle;
@@ -67,26 +65,22 @@ public class CoverArt {
/**
* Set the image handle that has been associated with this image.
*
- * This is required to generate image properties
+ * This is required to generate image properties
*/
public void setImageHandle(String handle) {
mImageHandle = handle;
}
- /**
- * Covert a Bitmap to a byte array with an image format without lossy compression
- */
+ /** Covert a Bitmap to a byte array with an image format without lossy compression */
private byte[] toByteArray(Bitmap bitmap) {
if (bitmap == null) return null;
- ByteArrayOutputStream buffer = new ByteArrayOutputStream(
- bitmap.getWidth() * bitmap.getHeight());
+ ByteArrayOutputStream buffer =
+ new ByteArrayOutputStream(bitmap.getWidth() * bitmap.getHeight());
bitmap.compress(Bitmap.CompressFormat.PNG, 100, buffer);
return buffer.toByteArray();
}
- /**
- * Get a hash code of this CoverArt image
- */
+ /** Get a hash code of this CoverArt image */
public String getImageHash() {
byte[] image = toByteArray(mImage);
if (image == null) return null;
@@ -107,9 +101,7 @@ public class CoverArt {
return hash;
}
- /**
- * Get the cover artwork image bytes in the native format
- */
+ /** Get the cover artwork image bytes in the native format */
public byte[] getImage() {
debug("GetImage(native)");
if (mImage == null) return null;
@@ -118,9 +110,7 @@ public class CoverArt {
return outputStream.toByteArray();
}
- /**
- * Get the cover artwork image bytes in the given encoding and pixel size
- */
+ /** Get the cover artwork image bytes in the given encoding and pixel size */
public byte[] getImage(BipImageDescriptor descriptor) {
debug("GetImage(descriptor=" + descriptor);
if (mImage == null) return null;
@@ -135,9 +125,7 @@ public class CoverArt {
return outputStream.toByteArray();
}
- /**
- * Determine if a given image descriptor is valid
- */
+ /** Determine if a given image descriptor is valid */
private boolean isDescriptorValid(BipImageDescriptor descriptor) {
debug("isDescriptorValid(descriptor=" + descriptor + ")");
if (descriptor == null) return false;
@@ -151,9 +139,7 @@ public class CoverArt {
return false;
}
- /**
- * Get the cover artwork image bytes as a 200 x 200 JPEG thumbnail
- */
+ /** Get the cover artwork image bytes as a 200 x 200 JPEG thumbnail */
public byte[] getThumbnail() {
debug("GetImageThumbnail()");
if (mImage == null) return null;
@@ -162,9 +148,7 @@ public class CoverArt {
return outputStream.toByteArray();
}
- /**
- * Get the set of image properties that the cover artwork can be turned into
- */
+ /** Get the set of image properties that the cover artwork can be turned into */
public BipImageProperties getImageProperties() {
debug("GetImageProperties()");
if (mImage == null) {
@@ -187,9 +171,7 @@ public class CoverArt {
return properties;
}
- /**
- * Get the storage size of this image in bytes
- */
+ /** Get the storage size of this image in bytes */
public int size() {
return mImage != null ? mImage.getAllocationByteCount() : 0;
}
@@ -199,16 +181,12 @@ public class CoverArt {
return "{handle=" + mImageHandle + ", size=" + size() + " }";
}
- /**
- * Print a message to DEBUG if debug output is enabled
- */
+ /** Print a message to DEBUG if debug output is enabled */
private void debug(String msg) {
Log.d(TAG, msg);
}
- /**
- * Print a message to ERROR
- */
+ /** Print a message to ERROR */
private void error(String msg) {
Log.e(TAG, msg);
}
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClient.java b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClient.java
index 3b54b09a3d8921cecb48a55e6f8b1f8ac6e9df6e..dede3928babf3efa8c6e9978caa70af6f3bde2b1 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClient.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpBipClient.java
@@ -38,34 +38,35 @@ import java.lang.ref.WeakReference;
* A client to a remote device's BIP Image Pull Server, as defined by a PSM passed in at
* construction time.
*
- * Once the client connection is established you can use this client to get image properties and
+ * Once the client connection is established you can use this client to get image properties and
* download images. The connection to the server is held open to service multiple requests.
*
- * Client is good for one connection lifecycle. Please call shutdown() to clean up safely. Once a
+ * Client is good for one connection lifecycle. Please call shutdown() to clean up safely. Once a
* disconnection has occurred, please create a new client.
*/
public class AvrcpBipClient {
private static final String TAG = AvrcpBipClient.class.getSimpleName();
// AVRCP Controller BIP Image Initiator/Cover Art UUID - AVRCP 1.6 Section 5.14.2.1
- private static final byte[] BLUETOOTH_UUID_AVRCP_COVER_ART = new byte[] {
- (byte) 0x71,
- (byte) 0x63,
- (byte) 0xDD,
- (byte) 0x54,
- (byte) 0x4A,
- (byte) 0x7E,
- (byte) 0x11,
- (byte) 0xE2,
- (byte) 0xB4,
- (byte) 0x7C,
- (byte) 0x00,
- (byte) 0x50,
- (byte) 0xC2,
- (byte) 0x49,
- (byte) 0x00,
- (byte) 0x48
- };
+ private static final byte[] BLUETOOTH_UUID_AVRCP_COVER_ART =
+ new byte[] {
+ (byte) 0x71,
+ (byte) 0x63,
+ (byte) 0xDD,
+ (byte) 0x54,
+ (byte) 0x4A,
+ (byte) 0x7E,
+ (byte) 0x11,
+ (byte) 0xE2,
+ (byte) 0xB4,
+ (byte) 0x7C,
+ (byte) 0x00,
+ (byte) 0x50,
+ (byte) 0xC2,
+ (byte) 0x49,
+ (byte) 0x00,
+ (byte) 0x48
+ };
private static final int CONNECT = 0;
private static final int DISCONNECT = 1;
@@ -85,9 +86,7 @@ public class AvrcpBipClient {
private final Callback mCallback;
- /**
- * Callback object used to be notified of when a request has been completed.
- */
+ /** Callback object used to be notified of when a request has been completed. */
interface Callback {
/**
@@ -104,8 +103,8 @@ public class AvrcpBipClient {
* @param status A status code to indicate a success or error
* @param properties The BipImageProperties object returned if successful, null otherwise
*/
- void onGetImagePropertiesComplete(int status, String imageHandle,
- BipImageProperties properties);
+ void onGetImagePropertiesComplete(
+ int status, String imageHandle, BipImageProperties properties);
/**
* Notify of a get image operation completing
@@ -141,9 +140,7 @@ public class AvrcpBipClient {
mHandler = new AvrcpBipClientHandler(looper, this);
}
- /**
- * Refreshes this client's OBEX session
- */
+ /** Refreshes this client's OBEX session */
public void refreshSession() {
debug("Refresh client session");
if (!isConnected()) {
@@ -159,9 +156,7 @@ public class AvrcpBipClient {
}
}
- /**
- * Safely disconnects the client from the server
- */
+ /** Safely disconnects the client from the server */
public void shutdown() {
debug("Shutdown client");
try {
@@ -201,11 +196,9 @@ public class AvrcpBipClient {
return mPsm;
}
- /**
- * Retrieve the image properties associated with the given imageHandle
- */
+ /** Retrieve the image properties associated with the given imageHandle */
public boolean getImageProperties(String imageHandle) {
- RequestGetImageProperties request = new RequestGetImageProperties(imageHandle);
+ RequestGetImageProperties request = new RequestGetImageProperties(imageHandle);
boolean status = mHandler.sendMessage(mHandler.obtainMessage(REQUEST, request));
if (!status) {
error("Adding messages failed, connection state: " + isConnected());
@@ -214,11 +207,9 @@ public class AvrcpBipClient {
return true;
}
- /**
- * Download the image object associated with the given imageHandle
- */
+ /** Download the image object associated with the given imageHandle */
public boolean getImage(String imageHandle, BipImageDescriptor descriptor) {
- RequestGetImage request = new RequestGetImage(imageHandle, descriptor);
+ RequestGetImage request = new RequestGetImage(imageHandle, descriptor);
boolean status = mHandler.sendMessage(mHandler.obtainMessage(REQUEST, request));
if (!status) {
error("Adding messages failed, connection state: " + isConnected());
@@ -227,9 +218,7 @@ public class AvrcpBipClient {
return true;
}
- /**
- * Update our client's connection state and notify of the new status
- */
+ /** Update our client's connection state and notify of the new status */
@VisibleForTesting
void setConnectionState(int state) {
int oldState = -1;
@@ -237,7 +226,7 @@ public class AvrcpBipClient {
oldState = mState;
mState = state;
}
- if (oldState != state) {
+ if (oldState != state) {
mCallback.onConnectionStateChanged(oldState, mState);
}
}
@@ -247,9 +236,7 @@ public class AvrcpBipClient {
mHandler.obtainMessage(CONNECT).sendToTarget();
}
- /**
- * Connects to the remote device's BIP Image Pull server
- */
+ /** Connects to the remote device's BIP Image Pull server */
private synchronized void connect() {
debug("Connect using psm: " + mPsm);
if (isConnected()) {
@@ -284,9 +271,7 @@ public class AvrcpBipClient {
}
}
- /**
- * Disconnect and reconnect the OBEX session.
- */
+ /** Disconnect and reconnect the OBEX session. */
private synchronized void refreshObexSession() {
if (mSession == null) return;
@@ -359,8 +344,7 @@ public class AvrcpBipClient {
private void executeRequest(BipRequest request) {
if (!isConnected()) {
- error("Cannot execute request " + request.toString()
- + ", we're not connected");
+ error("Cannot execute request " + request.toString() + ", we're not connected");
notifyCaller(request);
return;
}
@@ -397,9 +381,7 @@ public class AvrcpBipClient {
}
}
- /**
- * Handles this AVRCP BIP Image Pull Client's requests
- */
+ /** Handles this AVRCP BIP Image Pull Client's requests */
private static class AvrcpBipClientHandler extends Handler {
WeakReference When given an image handle and device, this manager will negotiate the downloaded image
* properties, download the image, and place it into a Content Provider for others to retrieve from
*/
public class AvrcpCoverArtManager {
@@ -60,13 +60,16 @@ public class AvrcpCoverArtManager {
public class DownloadEvent {
final String mImageUuid;
final Uri mUri;
+
public DownloadEvent(String uuid, Uri uri) {
mImageUuid = uuid;
mUri = uri;
}
+
public String getUuid() {
return mImageUuid;
}
+
public Uri getUri() {
return mUri;
}
@@ -83,10 +86,10 @@ public class AvrcpCoverArtManager {
}
/**
- * A thread-safe collection of BIP connection specific imformation meant to be cleared each
- * time a client disconnects from the Target's BIP OBEX server.
+ * A thread-safe collection of BIP connection specific imformation meant to be cleared each time
+ * a client disconnects from the Target's BIP OBEX server.
*
- * Currently contains the mapping of image handles seen to assigned UUIDs.
+ * Currently contains the mapping of image handles seen to assigned UUIDs.
*/
private class AvrcpBipSession {
private Map By the BIP specification that AVRCP uses, "Image handles are 7 character long strings
* containing only the digits 0 to 9."
*
* @return True if the input string is a valid image handle
@@ -137,8 +140,7 @@ public class AvrcpCoverArtManager {
mService = service;
mCoverArtStorage = new AvrcpCoverArtStorage(mService);
mCallback = callback;
- mDownloadScheme =
- SystemProperties.get(AVRCP_CONTROLLER_COVER_ART_SCHEME, SCHEME_THUMBNAIL);
+ mDownloadScheme = SystemProperties.get(AVRCP_CONTROLLER_COVER_ART_SCHEME, SCHEME_THUMBNAIL);
mCoverArtStorage.clear();
}
@@ -199,7 +201,7 @@ public class AvrcpCoverArtManager {
/**
* Cleanup all cover art related resources
*
- * Please call when you've committed to shutting down the service.
+ * Please call when you've committed to shutting down the service.
*/
public synchronized void cleanup() {
debug("Clean up and shutdown");
@@ -220,21 +222,21 @@ public class AvrcpCoverArtManager {
return client.getState();
}
- /**
+ /**
* Get the UUID for an image handle coming from a particular device.
*
- * This UUID is used to request and track downloads.
+ * This UUID is used to request and track downloads.
*
- * Image handles are only good for the life of the BIP client. Since this connection is torn
- * down frequently by specification, we have a layer of indirection to the images in the form
- * of an UUID. This UUID will allow images to be identified outside the connection lifecycle.
- * It also allows handles to be reused by the target in ways that won't impact image consumer's
+ * Image handles are only good for the life of the BIP client. Since this connection is torn
+ * down frequently by specification, we have a layer of indirection to the images in the form of
+ * an UUID. This UUID will allow images to be identified outside the connection lifecycle. It
+ * also allows handles to be reused by the target in ways that won't impact image consumer's
* cache schemes.
*
* @param device The Bluetooth device you want a handle from
* @param handle The image handle you want a UUID for
* @return A string UUID by which the handle can be identified during the life of the BIP
- * connection.
+ * connection.
*/
public String getUuidForHandle(BluetoothDevice device, String handle) {
AvrcpBipSession session = getSession(device);
@@ -245,7 +247,7 @@ public class AvrcpCoverArtManager {
/**
* Get the handle thats associated with a particular UUID.
*
- * The handle must have been seen during this connection.
+ * The handle must have been seen during this connection.
*
* @param device The Bluetooth device you want a handle from
* @param uuid The UUID you want the associated handle for
@@ -280,16 +282,15 @@ public class AvrcpCoverArtManager {
/**
* Download an image from a remote device and make it findable via the given uri
*
- * Downloading happens in three steps:
- * 1) Get the available image formats by requesting the Image Properties
- * 2) Determine the specific format we want the image in and turn it into an image descriptor
- * 3) Get the image using the chosen descriptor
+ * Downloading happens in three steps: 1) Get the available image formats by requesting the
+ * Image Properties 2) Determine the specific format we want the image in and turn it into an
+ * image descriptor 3) Get the image using the chosen descriptor
*
- * Getting image properties and the image are both asynchronous in nature.
+ * Getting image properties and the image are both asynchronous in nature.
*
* @param device The remote Bluetooth device you wish to download from
* @param imageUuid The UUID associated with the image you wish to download. This will be
- * translated into an image handle.
+ * translated into an image handle.
* @return A Uri that will be assign to the image once the download is complete
*/
public Uri downloadImage(BluetoothDevice device, String imageUuid) {
@@ -365,8 +366,8 @@ public class AvrcpCoverArtManager {
* Determines our preferred download descriptor from the list of available image download
* formats presented in the image properties object.
*
- * Our goal is ensure the image arrives in a format Android can consume and to minimize transfer
- * size if possible.
+ * Our goal is ensure the image arrives in a format Android can consume and to minimize
+ * transfer size if possible.
*
* @param properties The set of available formats and image is downloadable in
* @return A descriptor containing the desirable download format
@@ -377,10 +378,10 @@ public class AvrcpCoverArtManager {
}
BipImageDescriptor.Builder builder = new BipImageDescriptor.Builder();
switch (mDownloadScheme) {
- // BIP Specification says a blank/null descriptor signals to pull the native format
+ // BIP Specification says a blank/null descriptor signals to pull the native format
case SCHEME_NATIVE:
return null;
- // AVRCP 1.6.2 defined "thumbnail" size is guaranteed so we'll do that for now
+ // AVRCP 1.6.2 defined "thumbnail" size is guaranteed so we'll do that for now
case SCHEME_THUMBNAIL:
default:
builder.setEncoding(BipEncoding.JPEG);
@@ -390,9 +391,7 @@ public class AvrcpCoverArtManager {
return builder.build();
}
- /**
- * Callback for facilitating image download
- */
+ /** Callback for facilitating image download */
class BipClientCallback implements AvrcpBipClient.Callback {
final BluetoothDevice mDevice;
@@ -422,11 +421,15 @@ public class AvrcpCoverArtManager {
}
@Override
- public void onGetImagePropertiesComplete(int status, String imageHandle,
- BipImageProperties properties) {
+ public void onGetImagePropertiesComplete(
+ int status, String imageHandle, BipImageProperties properties) {
if (status != ResponseCodes.OBEX_HTTP_OK || properties == null) {
- warn(mDevice + ": GetImageProperties() failed - Handle: " + imageHandle
- + ", Code: " + status);
+ warn(
+ mDevice
+ + ": GetImageProperties() failed - Handle: "
+ + imageHandle
+ + ", Code: "
+ + status);
return;
}
BipImageDescriptor descriptor = determineImageDescriptor(properties);
@@ -434,8 +437,11 @@ public class AvrcpCoverArtManager {
AvrcpBipClient client = getClient(mDevice);
if (client == null) {
- warn(mDevice + ": Could not getImage() for " + imageHandle
- + " because client has disconnected.");
+ warn(
+ mDevice
+ + ": Could not getImage() for "
+ + imageHandle
+ + " because client has disconnected.");
return;
}
client.getImage(imageHandle, descriptor);
@@ -444,13 +450,23 @@ public class AvrcpCoverArtManager {
@Override
public void onGetImageComplete(int status, String imageHandle, BipImage image) {
if (status != ResponseCodes.OBEX_HTTP_OK) {
- warn(mDevice + ": GetImage() failed - Handle: " + imageHandle
- + ", Code: " + status);
+ warn(
+ mDevice
+ + ": GetImage() failed - Handle: "
+ + imageHandle
+ + ", Code: "
+ + status);
return;
}
String imageUuid = getUuidForHandle(mDevice, imageHandle);
- debug(mDevice + ": Received image data for handle: " + imageHandle
- + ", uuid: " + imageUuid + ", image: " + image);
+ debug(
+ mDevice
+ + ": Received image data for handle: "
+ + imageHandle
+ + ", uuid: "
+ + imageUuid
+ + ", image: "
+ + image);
Uri uri = mCoverArtStorage.addImage(mDevice, imageUuid, image.getImage());
if (uri == null) {
error("Could not store downloaded image");
@@ -479,23 +495,17 @@ public class AvrcpCoverArtManager {
return s;
}
- /**
- * Print to debug if debug is enabled for this class
- */
+ /** Print to debug if debug is enabled for this class */
private void debug(String msg) {
Log.d(TAG, msg);
}
- /**
- * Print to warn
- */
+ /** Print to warn */
private void warn(String msg) {
Log.w(TAG, msg);
}
- /**
- * Print to error
- */
+ /** Print to error */
private void error(String msg) {
Log.e(TAG, msg);
}
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtProvider.java b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtProvider.java
index ea73cf8b4d7029b4aa339113f3b57875cd2f739f..71728e29db309163a32908d590c5138767b4efe4 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtProvider.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtProvider.java
@@ -33,15 +33,15 @@ import java.io.IOException;
/**
* A provider of downloaded cover art images.
*
- * Cover art images are downloaded from remote devices and are promised to be "good" for the life of
- * a connection.
+ * Cover art images are downloaded from remote devices and are promised to be "good" for the life
+ * of a connection.
*
- * Android applications are provided a Uri with their MediaMetadata and MediaItem objects that
+ * Android applications are provided a Uri with their MediaMetadata and MediaItem objects that
* points back to this provider. Uris are in the following format:
*
- * content://com.android.bluetooth.avrcpcontroller.AvrcpCoverArtProvider/ content://com.android.bluetooth.avrcpcontroller.AvrcpCoverArtProvider/ It's expected by the Media framework that artwork at URIs will be available using the
* ContentResolver#openInputStream and BitmapFactory#decodeStream functions. Our provider must
* enable that usage pattern.
*/
@@ -50,8 +50,7 @@ public class AvrcpCoverArtProvider extends ContentProvider {
private BluetoothAdapter mAdapter;
- public AvrcpCoverArtProvider() {
- }
+ public AvrcpCoverArtProvider() {}
static final String AUTHORITY = "com.android.bluetooth.avrcpcontroller.AvrcpCoverArtProvider";
static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
@@ -65,9 +64,12 @@ public class AvrcpCoverArtProvider extends ContentProvider {
*/
public static Uri getImageUri(BluetoothDevice device, String imageUuid) {
if (device == null || imageUuid == null || "".equals(imageUuid)) return null;
- Uri uri = CONTENT_URI.buildUpon().appendQueryParameter("device", device.getAddress())
- .appendQueryParameter("uuid", imageUuid)
- .build();
+ Uri uri =
+ CONTENT_URI
+ .buildUpon()
+ .appendQueryParameter("device", device.getAddress())
+ .appendQueryParameter("uuid", imageUuid)
+ .build();
debug("getImageUri -> " + uri.toString());
return uri;
}
@@ -97,19 +99,20 @@ public class AvrcpCoverArtProvider extends ContentProvider {
}
final ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
- Thread transferThread = new Thread() {
- public void run() {
- try {
- FileOutputStream fout =
- new ParcelFileDescriptor.AutoCloseOutputStream(pipe[1]);
- image.compress(Bitmap.CompressFormat.PNG, 100, fout);
- fout.flush();
- fout.close();
- } catch (IOException e) {
- /* Something bad must have happened writing the image data */
- }
- }
- };
+ Thread transferThread =
+ new Thread() {
+ public void run() {
+ try {
+ FileOutputStream fout =
+ new ParcelFileDescriptor.AutoCloseOutputStream(pipe[1]);
+ image.compress(Bitmap.CompressFormat.PNG, 100, fout);
+ fout.flush();
+ fout.close();
+ } catch (IOException e) {
+ /* Something bad must have happened writing the image data */
+ }
+ }
+ };
transferThread.start();
return pipe[0];
}
@@ -150,7 +153,11 @@ public class AvrcpCoverArtProvider extends ContentProvider {
}
@Override
- public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+ public Cursor query(
+ Uri uri,
+ String[] projection,
+ String selection,
+ String[] selectionArgs,
String sortOrder) {
return null;
}
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtStorage.java b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtStorage.java
index 765112ff69e33697b79f4c4cf3cfa12318462efd..402134098ad821fec3881dc87bca33515a7b54c6 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtStorage.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpCoverArtStorage.java
@@ -25,9 +25,7 @@ import android.util.Log;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-/**
- * An abstraction of the cover art image storage mechanism.
- */
+/** An abstraction of the cover art image storage mechanism. */
public class AvrcpCoverArtStorage {
private static final String TAG = AvrcpCoverArtStorage.class.getSimpleName();
@@ -42,9 +40,7 @@ public class AvrcpCoverArtStorage {
private final Map This object knows how to turn itself into each of the Android Media Framework objects so the
* metadata can easily be shared with the system.
*/
public class AvrcpItem {
@@ -94,8 +94,7 @@ public class AvrcpItem {
// Our own internal Uri value that points to downloaded cover art image
private Uri mImageUri;
- private AvrcpItem() {
- }
+ private AvrcpItem() {}
public BluetoothDevice getDevice() {
return mDevice;
@@ -177,9 +176,7 @@ public class AvrcpItem {
mImageUri = uri;
}
- /**
- * Convert this item an Android Media Framework MediaMetadata
- */
+ /** Convert this item an Android Media Framework MediaMetadata */
public MediaMetadataCompat toMediaMetadata() {
MediaMetadataCompat.Builder metaDataBuilder = new MediaMetadataCompat.Builder();
Uri coverArtUri = getCoverArtLocation();
@@ -202,9 +199,7 @@ public class AvrcpItem {
return metaDataBuilder.build();
}
- /**
- * Convert this item an Android Media Framework MediaItem
- */
+ /** Convert this item an Android Media Framework MediaItem */
public MediaItem toMediaItem() {
MediaDescriptionCompat.Builder descriptionBuilder = new MediaDescriptionCompat.Builder();
@@ -237,12 +232,35 @@ public class AvrcpItem {
@Override
public String toString() {
- return "AvrcpItem{mUuid=" + mUuid + ", mUid=" + mUid + ", mItemType=" + mItemType
- + ", mType=" + mType + ", mDisplayableName=" + mDisplayableName
- + ", mTitle=" + mTitle + " mPlayingTime=" + mPlayingTime + " mTrack="
- + mTrackNumber + "/" + mTotalNumberOfTracks + ", mPlayable=" + mPlayable
- + ", mBrowsable=" + mBrowsable + ", mCoverArtHandle=" + getCoverArtHandle()
- + ", mImageUuid=" + mImageUuid + ", mImageUri" + mImageUri + "}";
+ return "AvrcpItem{mUuid="
+ + mUuid
+ + ", mUid="
+ + mUid
+ + ", mItemType="
+ + mItemType
+ + ", mType="
+ + mType
+ + ", mDisplayableName="
+ + mDisplayableName
+ + ", mTitle="
+ + mTitle
+ + " mPlayingTime="
+ + mPlayingTime
+ + " mTrack="
+ + mTrackNumber
+ + "/"
+ + mTotalNumberOfTracks
+ + ", mPlayable="
+ + mPlayable
+ + ", mBrowsable="
+ + mBrowsable
+ + ", mCoverArtHandle="
+ + getCoverArtHandle()
+ + ", mImageUuid="
+ + mImageUuid
+ + ", mImageUri"
+ + mImageUri
+ + "}";
}
@Override
@@ -275,9 +293,7 @@ public class AvrcpItem {
&& Objects.equals(mImageUri, other.getCoverArtLocation());
}
- /**
- * Builder for an AvrcpItem
- */
+ /** Builder for an AvrcpItem */
public static class Builder {
private static final String TAG = "AvrcpItem.Builder";
@@ -298,7 +314,7 @@ public class AvrcpItem {
* item attributes
*
* @param attrIds The array of AVRCP specification defined IDs in the order they match to
- * the value string attrMap
+ * the value string attrMap
* @param attrMap The mapped values for each ID
* @return This object so you can continue building
*/
@@ -351,7 +367,7 @@ public class AvrcpItem {
/**
* Set the item type for the AvrcpItem you are building
*
- * Type can be one of PLAYER, FOLDER, or MEDIA
+ * Type can be one of PLAYER, FOLDER, or MEDIA
*
* @param itemType The item type as an AvrcpItem.* type value
* @return This object, so you can continue building
@@ -364,7 +380,7 @@ public class AvrcpItem {
/**
* Set the type for the AvrcpItem you are building
*
- * This is the type of the PLAYER, FOLDER, or MEDIA item.
+ * This is the type of the PLAYER, FOLDER, or MEDIA item.
*
* @param type The type as one of the AvrcpItem.MEDIA_* or FOLDER_* types
* @return This object, so you can continue building
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpPlayer.java b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpPlayer.java
index 2922f2c8179b361c61777c314ba5527f357b20c2..7a2800eb3e6e44f6753abf63907773c14a4fad12 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpPlayer.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpPlayer.java
@@ -73,8 +73,8 @@ class AvrcpPlayer {
mId = id;
mName = name;
mPlayerFeatures = Arrays.copyOf(playerFeatures, playerFeatures.length);
- PlaybackStateCompat.Builder playbackStateBuilder = new PlaybackStateCompat.Builder()
- .setActions(mAvailableActions);
+ PlaybackStateCompat.Builder playbackStateBuilder =
+ new PlaybackStateCompat.Builder().setActions(mAvailableActions);
mPlaybackStateCompat = playbackStateBuilder.build();
updateAvailableActions();
setPlayStatus(playStatus);
@@ -94,9 +94,10 @@ class AvrcpPlayer {
public void setPlayTime(int playTime) {
mPlayTime = playTime;
- mPlaybackStateCompat = new PlaybackStateCompat.Builder(mPlaybackStateCompat).setState(
- mPlayStatus, mPlayTime,
- mPlaySpeed).build();
+ mPlaybackStateCompat =
+ new PlaybackStateCompat.Builder(mPlaybackStateCompat)
+ .setState(mPlayStatus, mPlayTime, mPlaySpeed)
+ .build();
}
public long getPlayTime() {
@@ -105,8 +106,10 @@ class AvrcpPlayer {
public void setPlayStatus(int playStatus) {
if (mPlayTime != PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN) {
- mPlayTime += mPlaySpeed * (SystemClock.elapsedRealtime()
- - mPlaybackStateCompat.getLastPositionUpdateTime());
+ mPlayTime +=
+ mPlaySpeed
+ * (SystemClock.elapsedRealtime()
+ - mPlaybackStateCompat.getLastPositionUpdateTime());
}
mPlayStatus = playStatus;
switch (mPlayStatus) {
@@ -127,9 +130,10 @@ class AvrcpPlayer {
break;
}
- mPlaybackStateCompat = new PlaybackStateCompat.Builder(mPlaybackStateCompat).setState(
- mPlayStatus, mPlayTime,
- mPlaySpeed).build();
+ mPlaybackStateCompat =
+ new PlaybackStateCompat.Builder(mPlaybackStateCompat)
+ .setState(mPlayStatus, mPlayTime, mPlaySpeed)
+ .build();
}
public void setSupportedPlayerApplicationSettings(
@@ -143,10 +147,12 @@ class AvrcpPlayer {
Log.d(TAG, "Play application settings changed, settings=" + playerApplicationSettings);
mCurrentPlayerApplicationSettings = playerApplicationSettings;
MediaSessionCompat session = BluetoothMediaBrowserService.getSession();
- session.setRepeatMode(mCurrentPlayerApplicationSettings.getSetting(
- PlayerApplicationSettings.REPEAT_STATUS));
- session.setShuffleMode(mCurrentPlayerApplicationSettings.getSetting(
- PlayerApplicationSettings.SHUFFLE_STATUS));
+ session.setRepeatMode(
+ mCurrentPlayerApplicationSettings.getSetting(
+ PlayerApplicationSettings.REPEAT_STATUS));
+ session.setShuffleMode(
+ mCurrentPlayerApplicationSettings.getSetting(
+ PlayerApplicationSettings.SHUFFLE_STATUS));
}
public int getPlayStatus() {
@@ -171,9 +177,10 @@ class AvrcpPlayer {
public synchronized void updateCurrentTrack(AvrcpItem update) {
if (update != null) {
long trackNumber = update.getTrackNumber();
- mPlaybackStateCompat = new PlaybackStateCompat.Builder(
- mPlaybackStateCompat).setActiveQueueItemId(
- trackNumber - 1).build();
+ mPlaybackStateCompat =
+ new PlaybackStateCompat.Builder(mPlaybackStateCompat)
+ .setActiveQueueItemId(trackNumber - 1)
+ .build();
}
mCurrentTrack = update;
}
@@ -224,22 +231,28 @@ class AvrcpPlayer {
PlayerApplicationSettings.SHUFFLE_STATUS)) {
mAvailableActions |= PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE;
}
- mPlaybackStateCompat = new PlaybackStateCompat.Builder(mPlaybackStateCompat)
- .setActions(mAvailableActions).build();
+ mPlaybackStateCompat =
+ new PlaybackStateCompat.Builder(mPlaybackStateCompat)
+ .setActions(mAvailableActions)
+ .build();
Log.d(TAG, "Supported Actions = " + mAvailableActions);
}
@Override
public String toString() {
- return " This service provides a means for external applications to access A2DP and AVRCP. The
+ * applications are expected to use MediaBrowser (see API) and all the music
* browsing/playback/metadata can be controlled via MediaBrowser and MediaController.
*
- * The current behavior of MediaSessionCompat exposed by this service is as follows:
- * 1. MediaSessionCompat is active (i.e. SystemUI and other overview UIs can see updates) when
- * device is connected and first starts playing. Before it starts playing we do not activate the
- * session.
- * 1.1 The session is active throughout the duration of connection.
- * 2. The session is de-activated when the device disconnects. It will be connected again when (1)
- * happens.
+ * The current behavior of MediaSessionCompat exposed by this service is as follows: 1.
+ * MediaSessionCompat is active (i.e. SystemUI and other overview UIs can see updates) when device
+ * is connected and first starts playing. Before it starts playing we do not activate the session.
+ * 1.1 The session is active throughout the duration of connection. 2. The session is de-activated
+ * when the device disconnects. It will be connected again when (1) happens.
*/
public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat {
private static final String TAG = BluetoothMediaBrowserService.class.getSimpleName();
@@ -117,8 +115,9 @@ public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat {
// Create and configure the MediaSessionCompat
mSession = new MediaSessionCompat(this, TAG);
setSessionToken(mSession.getSessionToken());
- mSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
- | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
+ mSession.setFlags(
+ MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
+ | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
mSession.setQueueTitle(getString(R.string.bluetooth_a2dp_sink_queue_name));
mSession.setQueue(mMediaQueue);
setErrorPlaybackState();
@@ -139,17 +138,15 @@ public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat {
}
/**
- * BrowseResult is used to return the contents of a node along with a status. The status is
- * used to indicate success, a pending download, or error conditions. BrowseResult is used in
+ * BrowseResult is used to return the contents of a node along with a status. The status is used
+ * to indicate success, a pending download, or error conditions. BrowseResult is used in
* onLoadChildren() and getContents() in BluetoothMediaBrowserService and in getContents() in
- * AvrcpControllerService.
- * The following statuses have been implemented:
- * 1. SUCCESS - Contents have been retrieved successfully.
- * 2. DOWNLOAD_PENDING - Download is in progress and may or may not have contents to return.
- * 3. NO_DEVICE_CONNECTED - If no device is connected there are no contents to be retrieved.
- * 4. ERROR_MEDIA_ID_INVALID - Contents could not be retrieved as the media ID is invalid.
- * 5. ERROR_NO_AVRCP_SERVICE - Contents could not be retrieved as AvrcpControllerService is not
- * connected.
+ * AvrcpControllerService. The following statuses have been implemented: 1. SUCCESS - Contents
+ * have been retrieved successfully. 2. DOWNLOAD_PENDING - Download is in progress and may or
+ * may not have contents to return. 3. NO_DEVICE_CONNECTED - If no device is connected there are
+ * no contents to be retrieved. 4. ERROR_MEDIA_ID_INVALID - Contents could not be retrieved as
+ * the media ID is invalid. 5. ERROR_NO_AVRCP_SERVICE - Contents could not be retrieved as
+ * AvrcpControllerService is not connected.
*/
public static class BrowseResult {
// Possible statuses for onLoadChildren
@@ -206,20 +203,21 @@ public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat {
private void setErrorPlaybackState() {
Bundle extras = new Bundle();
- extras.putString(ERROR_RESOLUTION_ACTION_LABEL,
- getString(R.string.bluetooth_connect_action));
+ extras.putString(
+ ERROR_RESOLUTION_ACTION_LABEL, getString(R.string.bluetooth_connect_action));
Intent launchIntent = new Intent();
launchIntent.setAction(BluetoothPrefs.BLUETOOTH_SETTING_ACTION);
launchIntent.addCategory(BluetoothPrefs.BLUETOOTH_SETTING_CATEGORY);
int flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
- PendingIntent pendingIntent = PendingIntent.getActivity(getApplicationContext(), 0,
- launchIntent, flags);
+ PendingIntent pendingIntent =
+ PendingIntent.getActivity(getApplicationContext(), 0, launchIntent, flags);
extras.putParcelable(ERROR_RESOLUTION_ACTION_INTENT, pendingIntent);
- PlaybackStateCompat errorState = new PlaybackStateCompat.Builder()
- .setErrorMessage(getString(R.string.bluetooth_disconnected))
- .setExtras(extras)
- .setState(PlaybackStateCompat.STATE_ERROR, 0, 0)
- .build();
+ PlaybackStateCompat errorState =
+ new PlaybackStateCompat.Builder()
+ .setErrorMessage(getString(R.string.bluetooth_disconnected))
+ .setExtras(extras)
+ .setState(PlaybackStateCompat.STATE_ERROR, 0, 0)
+ .build();
mSession.setPlaybackState(errorState);
}
@@ -232,8 +230,8 @@ public class BluetoothMediaBrowserService extends MediaBrowserServiceCompat {
}
@Override
- public synchronized void onLoadChildren(final String parentMediaId,
- final Result Browsing hierarchy follows the AVRCP specification's description of various scopes and looks
+ * like follows: Root: Player1: Now_Playing: MediaItem1 MediaItem2 Folder1 Folder2 .... Player2 ....
*/
public class BrowseTree {
private static final String TAG = BrowseTree.class.getSimpleName();
@@ -64,6 +54,7 @@ public class BrowseTree {
// Static instance of Folder ID <-> Folder Instance (for navigation purposes)
@VisibleForTesting
final HashMap Content type is the only spec-required field.
*
- * Examples:
- * Examples: This is required by the specification
*/
private final String mContentType;
- /**
- * MIME character set of the image attachment, i.e. "ISO-8859-1"
- */
+ /** MIME character set of the image attachment, i.e. "ISO-8859-1" */
private final String mCharset;
/**
* File name of the image attachment
*
- * This is required by the specification
+ * This is required by the specification
*/
private final String mName;
- /**
- * Size of the image attachment in bytes
- */
+ /** Size of the image attachment in bytes */
private final int mSize;
- /**
- * Date the image attachment was created
- */
+ /** Date the image attachment was created */
private final BipDateTime mCreated;
- /**
- * Date the image attachment was last modified
- */
+ /** Date the image attachment was last modified */
private final BipDateTime mModified;
- public BipAttachmentFormat(String contentType, String charset, String name, String size,
- String created, String modified) {
+ public BipAttachmentFormat(
+ String contentType,
+ String charset,
+ String name,
+ String size,
+ String created,
+ String modified) {
if (contentType == null) {
throw new ParseException("ContentType is required and must be valid");
}
@@ -98,8 +94,13 @@ public class BipAttachmentFormat {
mModified = bipModified;
}
- public BipAttachmentFormat(String contentType, String charset, String name, int size,
- Date created, Date modified) {
+ public BipAttachmentFormat(
+ String contentType,
+ String charset,
+ String name,
+ int size,
+ Date created,
+ Date modified) {
mContentType = Objects.requireNonNull(contentType, "Content-Type cannot be null");
mName = Objects.requireNonNull(name, "Name cannot be null");
mCharset = charset;
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipDateTime.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipDateTime.java
index bd648a4cf355e6f619d8cfcea9ac207c77f2acfe..cd7aa3fc62717af32a8cf3740d4fdf6f161e99f4 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipDateTime.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipDateTime.java
@@ -27,18 +27,13 @@ import java.util.regex.Pattern;
/**
* An object representing a DateTime sent over the Basic Imaging Profile
*
- * Date-time format is as follows:
+ * Date-time format is as follows:
*
- * YYYYMMDDTHHMMSSZ, where
- * Y/M/D/H/M/S - years, months, days, hours, minutes, seconds
- * T - A delimiter
- * Z - An optional, but recommended, character indicating the time is in UTC. If UTC
- * is not used then we're to assume "local timezone" instead.
+ * YYYYMMDDTHHMMSSZ, where Y/M/D/H/M/S - years, months, days, hours, minutes, seconds T - A
+ * delimiter Z - An optional, but recommended, character indicating the time is in UTC. If UTC is
+ * not used then we're to assume "local timezone" instead.
*
- * Example date-time values:
- * 20000101T000000Z
- * 20000101T235959Z
- * 20000101T000000
+ * Example date-time values: 20000101T000000Z 20000101T235959Z 20000101T000000
*/
public class BipDateTime {
private static final String TAG = "avrcpcontroller.BipDateTime";
@@ -49,12 +44,12 @@ public class BipDateTime {
public BipDateTime(String time) {
try {
/*
- * Match groups for the timestamp are numbered as follows:
- *
- * YYYY MM DD T HH MM SS Z
- * ^^^^ ^^ ^^ ^^ ^^ ^^ ^
- * 1 2 3 4 5 6 7
- */
+ * Match groups for the timestamp are numbered as follows:
+ *
+ * YYYY MM DD T HH MM SS Z
+ * ^^^^ ^^ ^^ ^^ ^^ ^^ ^
+ * 1 2 3 4 5 6 7
+ */
Pattern p = Pattern.compile("(\\d{4})(\\d{2})(\\d{2})T(\\d{2})(\\d{2})(\\d{2})([Z])?");
Matcher m = p.matcher(time);
@@ -66,15 +61,17 @@ public class BipDateTime {
builder.setLenient(false);
/* Note that Calendar months are zero-based in Java framework */
- builder.setDate(Integer.parseInt(m.group(1)), /* year */
- Integer.parseInt(m.group(2)) - 1, /* month */
- Integer.parseInt(m.group(3))); /* day of month */
+ builder.setDate(
+ Integer.parseInt(m.group(1)), /* year */
+ Integer.parseInt(m.group(2)) - 1, /* month */
+ Integer.parseInt(m.group(3))); /* day of month */
/* Note the timestamp doesn't have milliseconds and we're explicitly setting to 0 */
- builder.setTimeOfDay(Integer.parseInt(m.group(4)), /* hours */
- Integer.parseInt(m.group(5)), /* minutes */
- Integer.parseInt(m.group(6)), /* seconds */
- 0); /* milliseconds */
+ builder.setTimeOfDay(
+ Integer.parseInt(m.group(4)), /* hours */
+ Integer.parseInt(m.group(5)), /* minutes */
+ Integer.parseInt(m.group(6)), /* seconds */
+ 0); /* milliseconds */
/* If the 7th group is matched then we have UTC based timestamp */
if (m.group(7) != null) {
@@ -137,15 +134,25 @@ public class BipDateTime {
TimeZone utc = TimeZone.getTimeZone("UTC");
utc.setRawOffset(0);
cal.setTimeZone(utc);
- return String.format(Locale.US, "%04d%02d%02dT%02d%02d%02dZ", cal.get(Calendar.YEAR),
- cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DATE),
- cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE),
+ return String.format(
+ Locale.US,
+ "%04d%02d%02dT%02d%02d%02dZ",
+ cal.get(Calendar.YEAR),
+ cal.get(Calendar.MONTH) + 1,
+ cal.get(Calendar.DATE),
+ cal.get(Calendar.HOUR_OF_DAY),
+ cal.get(Calendar.MINUTE),
cal.get(Calendar.SECOND));
} else {
cal.setTimeZone(TimeZone.getDefault());
- return String.format(Locale.US, "%04d%02d%02dT%02d%02d%02d", cal.get(Calendar.YEAR),
- cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DATE),
- cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE),
+ return String.format(
+ Locale.US,
+ "%04d%02d%02dT%02d%02d%02d",
+ cal.get(Calendar.YEAR),
+ cal.get(Calendar.MONTH) + 1,
+ cal.get(Calendar.DATE),
+ cal.get(Calendar.HOUR_OF_DAY),
+ cal.get(Calendar.MINUTE),
cal.get(Calendar.SECOND));
}
}
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipEncoding.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipEncoding.java
index c4c401ebf79aefd857274e40e0c20699fe938d06..4de8caf7edb49001c35a05f999f65b5ba0ba8e86 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipEncoding.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipEncoding.java
@@ -23,22 +23,17 @@ import java.util.HashMap;
/**
* Represents an encoding method in which a BIP image is available.
*
- * The encodings supported by this profile include:
- * - JPEG
- * - GIF
- * - WBMP
- * - PNG
- * - JPEG2000
- * - BMP
- * - USR-xxx
+ * The encodings supported by this profile include: - JPEG - GIF - WBMP - PNG - JPEG2000 - BMP -
+ * USR-xxx
*
- * The tag USR-xxx is used to represent proprietary encodings. The tag shall begin with the string
- * “USR-” but the implementer assigns the characters of the second half of the string. This tag can
- * be used by a manufacturer to enable its devices to exchange images under a proprietary encoding.
+ * The tag USR-xxx is used to represent proprietary encodings. The tag shall begin with the
+ * string “USR-” but the implementer assigns the characters of the second half of the string. This
+ * tag can be used by a manufacturer to enable its devices to exchange images under a proprietary
+ * encoding.
*
- * Example proprietary encoding:
+ * Example proprietary encoding:
*
- * - USR-NOKIA-FORMAT1
+ * - USR-NOKIA-FORMAT1
*/
public class BipEncoding {
public static final int JPEG = 0;
@@ -51,6 +46,7 @@ public class BipEncoding {
public static final int UNKNOWN = 7; // i.e 'not assigned' or 'not assigned anything valid'
private static final HashMap sEncodingNamesToIds = new HashMap Android's Bitmap/BitmapFactory can handle BMP, GIF, JPEG, PNG, WebP, and HEIF formats.
*
* @return True if the encoding is supported, False otherwise.
*/
public boolean isAndroidSupported() {
- return mType == BipEncoding.JPEG || mType == BipEncoding.PNG || mType == BipEncoding.BMP
+ return mType == BipEncoding.JPEG
+ || mType == BipEncoding.PNG
+ || mType == BipEncoding.BMP
|| mType == BipEncoding.GIF;
}
- /**
- * Determine the encoding type based on an input string
- */
+ /** Determine the encoding type based on an input string */
private static int determineEncoding(String encoding) {
Integer type = (Integer) sEncodingNamesToIds.get(encoding);
if (type != null) return type.intValue();
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImage.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImage.java
index cb31f43da5e0a64a6f6c1e61d1c6176e74b2448a..29936696ec192f3b7dc4628eba79e89eb19201aa 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImage.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImage.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
/**
* An image object sent over BIP.
*
- * The image is sent as bytes in the payload of a GetImage request. The format of those bytes is
+ * The image is sent as bytes in the payload of a GetImage request. The format of those bytes is
* determined by the BipImageDescriptor used when making the request.
*/
public class BipImage {
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageDescriptor.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageDescriptor.java
index a2bee5f3fbd9a1244775dccf14639c335cc65f55..c38019b12849d9ae78f410d41c6049b8cac13bf8 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageDescriptor.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageDescriptor.java
@@ -33,31 +33,29 @@ import java.io.UnsupportedEncodingException;
* Contains the metadata that describes either (1) the desired size of a image to be downloaded or
* (2) the extact size of an image to be uploaded.
*
- * When using this to assert the size of an image to download/pull, it's best to derive this
+ * When using this to assert the size of an image to download/pull, it's best to derive this
* specific descriptor from any of the available BipImageFormat options returned from a
* RequestGetImageProperties. Note that if a BipImageFormat is not of a fixed size type then you
* must arrive on a desired fixed size for this descriptor.
*
- * When using this to denote the size of an image when pushing an image for transfer this descriptor
- * must match the metadata of the image being sent.
+ * When using this to denote the size of an image when pushing an image for transfer this
+ * descriptor must match the metadata of the image being sent.
*
- * Note, the encoding and pixel values are mandatory by specification. The version number is fixed.
- * All other values are optional. The transformation field is to have *one* selected option in it.
+ * Note, the encoding and pixel values are mandatory by specification. The version number is
+ * fixed. All other values are optional. The transformation field is to have *one* selected option
+ * in it.
*
- * Example:
- * < image-descriptor version=“1.0” >
- * < image encoding=“JPEG” pixel=“1280*960” size=“500000”/>
- * < /image-descriptor >
+ * Example: < image-descriptor version=“1.0” > < image encoding=“JPEG” pixel=“1280*960”
+ * size=“500000”/> < /image-descriptor >
*/
public class BipImageDescriptor {
private static final String TAG = "avrcpcontroller.BipImageDescriptor";
private static final String sVersion = "1.0";
- /**
- * A Builder for an ImageDescriptor object
- */
+ /** A Builder for an ImageDescriptor object */
public static class Builder {
private BipImageDescriptor mImageDescriptor = new BipImageDescriptor();
+
/**
* Set the encoding for the descriptor you're building using a BipEncoding object
*
@@ -147,14 +145,10 @@ public class BipImageDescriptor {
}
}
- /**
- * The encoding of the image, required by the specification
- */
+ /** The encoding of the image, required by the specification */
private BipEncoding mEncoding = null;
- /**
- * The width and height of the image, required by the specification
- */
+ /** The width and height of the image, required by the specification */
private BipPixel mPixel = null;
/**
@@ -163,15 +157,13 @@ public class BipImageDescriptor {
*/
private BipTransformation mTransformation = null;
- /**
- * The size in bytes of the image
- */
+ /** The size in bytes of the image */
private int mSize = -1;
/**
* The max size in bytes of the image.
*
- * Optional, used only when describing an image to pull
+ * Optional, used only when describing an image to pull
*/
private int mMaxSize = -1;
@@ -195,8 +187,9 @@ public class BipImageDescriptor {
mPixel = new BipPixel(xpp.getAttributeValue(null, "pixel"));
mSize = parseInt(xpp.getAttributeValue(null, "size"));
mMaxSize = parseInt(xpp.getAttributeValue(null, "maxsize"));
- mTransformation = new BipTransformation(
- xpp.getAttributeValue(null, "transformation"));
+ mTransformation =
+ new BipTransformation(
+ xpp.getAttributeValue(null, "transformation"));
} else {
Log.w(TAG, "Unrecognized tag in x-bt/img-Description object: " + tag);
}
@@ -275,8 +268,10 @@ public class BipImageDescriptor {
@Override
public String toString() {
if (mEncoding == null || mPixel == null) {
- error("Missing required fields [ " + (mEncoding == null ? "encoding " : "")
- + (mPixel == null ? "pixel " : ""));
+ error(
+ "Missing required fields [ "
+ + (mEncoding == null ? "encoding " : "")
+ + (mPixel == null ? "pixel " : ""));
return null;
}
StringWriter writer = new StringWriter();
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageFormat.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageFormat.java
index 43cbef9dd780ecb2e0dff04f798f563fc1cb8d47..0572e814166be31110c8118d43b5c527be9bbab1 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageFormat.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageFormat.java
@@ -24,16 +24,15 @@ import java.util.Objects;
* Describes a single native or variant format available for an image, coming from a
* BipImageProperties object.
*
- * This is not an object by specification, per say. It abstracts all the various native and variant
- * formats available in a given set of image properties.
+ * This is not an object by specification, per say. It abstracts all the various native and
+ * variant formats available in a given set of image properties.
*
- * This BipImageFormat can be used to choose a specific BipImageDescriptor when downloading an image
+ * This BipImageFormat can be used to choose a specific BipImageDescriptor when downloading an
+ * image
*
- * Examples:
- * Examples: Used by the variant type only
*/
private final BipTransformation mTransformation;
/**
* Size in bytes of the image.
*
- * Used by the native type only
+ * Used by the native type only
*/
private final int mSize;
/**
* The estimated maximum size of an image after a transformation is performed.
*
- * Used by the variant type only
+ * Used by the variant type only
*/
private final int mMaxSize;
- private BipImageFormat(int type, BipEncoding encoding, BipPixel pixel, int size, int maxSize,
+ private BipImageFormat(
+ int type,
+ BipEncoding encoding,
+ BipPixel pixel,
+ int size,
+ int maxSize,
BipTransformation transformation) {
mFormatType = type;
mEncoding = Objects.requireNonNull(encoding, "Encoding cannot be null");
@@ -123,7 +115,12 @@ public class BipImageFormat {
mMaxSize = maxSize;
}
- private BipImageFormat(int type, String encoding, String pixel, String size, String maxSize,
+ private BipImageFormat(
+ int type,
+ String encoding,
+ String pixel,
+ String size,
+ String maxSize,
String transformation) {
mFormatType = type;
mEncoding = new BipEncoding(encoding);
@@ -183,10 +180,14 @@ public class BipImageFormat {
@Override
public String toString() {
- if (mEncoding == null || mEncoding.getType() == BipEncoding.UNKNOWN || mPixel == null
+ if (mEncoding == null
+ || mEncoding.getType() == BipEncoding.UNKNOWN
+ || mPixel == null
|| mPixel.getType() == BipPixel.TYPE_UNKNOWN) {
- error("Missing required fields [ " + (mEncoding == null ? "encoding " : "")
- + (mPixel == null ? "pixel " : ""));
+ error(
+ "Missing required fields [ "
+ + (mEncoding == null ? "encoding " : "")
+ + (mPixel == null ? "pixel " : ""));
return null;
}
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageProperties.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageProperties.java
index 94ae058d2e0e9e281f0723eaae3403d12714f2e5..e5b1e5b88385a5091557b621b633f69534bfd66f 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageProperties.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipImageProperties.java
@@ -35,39 +35,33 @@ import java.util.Objects;
* Represents the return value of a BIP GetImageProperties request, giving a detailed description of
* an image and its available descriptors before download.
*
- * Format is as described by version 1.2.1 of the Basic Image Profile Specification. The
+ * Format is as described by version 1.2.1 of the Basic Image Profile Specification. The
* specification describes three types of metadata that can arrive with an image -- native, variant
- * and attachment. Native describes which native formats a particular image is available in.
- * Variant describes which other types of encodings/sizes can be created from the native image using
- * various transformations. Attachments describes other items that can be downloaded that are
- * associated with the image (text, sounds, etc.)
+ * and attachment. Native describes which native formats a particular image is available in. Variant
+ * describes which other types of encodings/sizes can be created from the native image using various
+ * transformations. Attachments describes other items that can be downloaded that are associated
+ * with the image (text, sounds, etc.)
*
- * The specification requires that
- * 1. The fixed version string of "1.0" is used
- * 2. There is an image handle
- * 3. The "imaging thumbnail format" is included. This is defined for BIP in section 4.4.3
- * (160x120 JPEG) and redefined for AVRCP in section 5.14.2.2.1 I (200x200 JPEG). It can be
- * either a native or variant format.
+ * The specification requires that 1. The fixed version string of "1.0" is used 2. There is an
+ * image handle 3. The "imaging thumbnail format" is included. This is defined for BIP in section
+ * 4.4.3 (160x120 JPEG) and redefined for AVRCP in section 5.14.2.2.1 I (200x200 JPEG). It can be
+ * either a native or variant format.
*
- * Example:
- * Example: Objects that are not valid will fail to serialize and return null.
*
* @return Byte array representing this object, ready to send over OBEX, or null on error.
*/
@@ -415,10 +410,8 @@ public class BipImageProperties {
/**
* Determine if the contents of this BipImageProperties object are valid and meet the
- * specification requirements:
- * 1. Include the fixed 1.0 version
- * 2. Include an image handle
- * 3. Have the thumbnail format as either the native or variant
+ * specification requirements: 1. Include the fixed 1.0 version 2. Include an image handle 3.
+ * Have the thumbnail format as either the native or variant
*
* @return True if our contents are valid, false otherwise
*/
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipPixel.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipPixel.java
index bba0cefaeb58d1ae9dcab1f3fdb613405370b12c..f3be13363d85bef3b52560d398d2d005098a07af 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipPixel.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipPixel.java
@@ -22,27 +22,27 @@ import java.util.regex.Pattern;
/**
* The pixel size or range of pixel sizes in which the image is available
*
- * A FIXED size is represented as the following, where W is width and H is height. The domain
- * of values is [0, 65535]
+ * A FIXED size is represented as the following, where W is width and H is height. The domain of
+ * values is [0, 65535]
*
- * W*H
+ * W*H
*
- * A RESIZABLE size that allows a modified aspect ratio is represented as the following, where
- * W_1*H_1 is the minimum width and height pair and W2*H2 is the maximum width and height pair.
- * The domain of values is [0, 65535]
+ * A RESIZABLE size that allows a modified aspect ratio is represented as the following, where
+ * W_1*H_1 is the minimum width and height pair and W2*H2 is the maximum width and height pair. The
+ * domain of values is [0, 65535]
*
- * W_1*H_1-W2*H2
+ * W_1*H_1-W2*H2
*
- * A RESIZABLE size that allows a fixed aspect ratio is represented as the following, where
- * W_1 is the minimum width and W2*H2 is the maximum width and height pair.
- * The domain of values is [0, 65535]
+ * A RESIZABLE size that allows a fixed aspect ratio is represented as the following, where W_1
+ * is the minimum width and W2*H2 is the maximum width and height pair. The domain of values is [0,
+ * 65535]
*
- * W_1**-W2*H2
+ * W_1**-W2*H2
*
- * For each possible intermediate width value, the corresponding height is calculated using the
+ * For each possible intermediate width value, the corresponding height is calculated using the
* formula
*
- * H=(W*H2)/W2
+ * H=(W*H2)/W2
*/
public class BipPixel {
private static final String TAG = "avrcpcontroller.BipPixel";
@@ -64,37 +64,33 @@ public class BipPixel {
private final int mMaxWidth;
private final int mMaxHeight;
- /**
- * Create a fixed size BipPixel object
- */
+ /** Create a fixed size BipPixel object */
public static BipPixel createFixed(int width, int height) {
return new BipPixel(TYPE_FIXED, width, height, width, height);
}
- /**
- * Create a resizable modifiable aspect ratio BipPixel object
- */
- public static BipPixel createResizableModified(int minWidth, int minHeight, int maxWidth,
- int maxHeight) {
- return new BipPixel(TYPE_RESIZE_MODIFIED_ASPECT_RATIO, minWidth, minHeight, maxWidth,
- maxHeight);
+ /** Create a resizable modifiable aspect ratio BipPixel object */
+ public static BipPixel createResizableModified(
+ int minWidth, int minHeight, int maxWidth, int maxHeight) {
+ return new BipPixel(
+ TYPE_RESIZE_MODIFIED_ASPECT_RATIO, minWidth, minHeight, maxWidth, maxHeight);
}
- /**
- * Create a resizable fixed aspect ratio BipPixel object
- */
+ /** Create a resizable fixed aspect ratio BipPixel object */
public static BipPixel createResizableFixed(int minWidth, int maxWidth, int maxHeight) {
int minHeight = (minWidth * maxHeight) / maxWidth;
- return new BipPixel(TYPE_RESIZE_FIXED_ASPECT_RATIO, minWidth, minHeight,
- maxWidth, maxHeight);
+ return new BipPixel(
+ TYPE_RESIZE_FIXED_ASPECT_RATIO, minWidth, minHeight, maxWidth, maxHeight);
}
/**
* Directly create a BipPixel object knowing your exact type and dimensions. Internal use only
*/
private BipPixel(int type, int minWidth, int minHeight, int maxWidth, int maxHeight) {
- if (isDimensionInvalid(minWidth) || isDimensionInvalid(maxWidth)
- || isDimensionInvalid(minHeight) || isDimensionInvalid(maxHeight)) {
+ if (isDimensionInvalid(minWidth)
+ || isDimensionInvalid(maxWidth)
+ || isDimensionInvalid(minHeight)
+ || isDimensionInvalid(maxHeight)) {
throw new IllegalArgumentException("Dimension's must be in [0, " + PIXEL_MAX + "]");
}
@@ -105,9 +101,7 @@ public class BipPixel {
mMaxHeight = maxHeight;
}
- /**
- * Create a BipPixel object from an Image Format pixel attribute string
- */
+ /** Create a BipPixel object from an Image Format pixel attribute string */
public BipPixel(String pixel) {
int type = TYPE_UNKNOWN;
int minWidth = -1;
@@ -129,8 +123,8 @@ public class BipPixel {
}
break;
case TYPE_RESIZE_MODIFIED_ASPECT_RATIO:
- Pattern modifiedRatio = Pattern.compile(
- "^(\\d{1,5})\\*(\\d{1,5})-(\\d{1,5})\\*(\\d{1,5})$");
+ Pattern modifiedRatio =
+ Pattern.compile("^(\\d{1,5})\\*(\\d{1,5})-(\\d{1,5})\\*(\\d{1,5})$");
Matcher m2 = modifiedRatio.matcher(pixel);
if (m2.matches()) {
type = TYPE_RESIZE_MODIFIED_ASPECT_RATIO;
@@ -157,8 +151,10 @@ public class BipPixel {
if (type == TYPE_UNKNOWN) {
throw new ParseException("Failed to determine type of '" + pixel + "'");
}
- if (isDimensionInvalid(minWidth) || isDimensionInvalid(maxWidth)
- || isDimensionInvalid(minHeight) || isDimensionInvalid(maxHeight)) {
+ if (isDimensionInvalid(minWidth)
+ || isDimensionInvalid(maxWidth)
+ || isDimensionInvalid(minHeight)
+ || isDimensionInvalid(maxHeight)) {
throw new ParseException("Parsed dimensions must be in [0, " + PIXEL_MAX + "]");
}
@@ -193,8 +189,8 @@ public class BipPixel {
* Determines the type of the pixel string by counting the number of '*' delimiters in the
* string.
*
- * Note that the overall maximum size of any pixel string is 23 characters in length due to the
- * max size of each dimension
+ * Note that the overall maximum size of any pixel string is 23 characters in length due to
+ * the max size of each dimension
*
* @return The corresponding type we should assume the given pixel string is
*/
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipRequest.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipRequest.java
index 82b9fe972933b92e1b8b57d4ea261a96845689cb..88fca6aa1a8c3d14e7f43308e6307cb2e946ac5f 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipRequest.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipRequest.java
@@ -27,9 +27,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
-/**
- * This is a base class for implementing AVRCP Controller Basic Image Profile (BIP) requests
- */
+/** This is a base class for implementing AVRCP Controller Basic Image Profile (BIP) requests */
abstract class BipRequest {
private static final String TAG = BipRequest.class.getSimpleName();
@@ -53,15 +51,15 @@ abstract class BipRequest {
/**
* A function that returns the type of the request.
*
- * Used to determine type instead of using 'instanceof'
+ * Used to determine type instead of using 'instanceof'
*/
public abstract int getType();
/**
* A single point of entry for kicking off a AVRCP BIP request.
*
- * Child classes are expected to implement this interface, filling in the details of the request
- * (headers, operation type, error handling, etc).
+ * Child classes are expected to implement this interface, filling in the details of the
+ * request (headers, operation type, error handling, etc).
*/
public abstract void execute(ClientSession session) throws IOException;
@@ -90,9 +88,7 @@ abstract class BipRequest {
debug("GET final response code is '" + mResponseCode + "'");
}
- /**
- * A generica PUT operation, providing overridable hooks to read response headers.
- */
+ /** A generica PUT operation, providing overridable hooks to read response headers. */
protected void executePut(ClientSession session, byte[] body) throws IOException {
debug("Exeucting PUT");
setOperation(null);
@@ -157,23 +153,17 @@ abstract class BipRequest {
return TAG + " (type: " + getType() + ", mResponseCode: " + mResponseCode + ")";
}
- /**
- * Print to debug if debug is enabled for this class
- */
+ /** Print to debug if debug is enabled for this class */
protected void debug(String msg) {
Log.d(TAG, msg);
}
- /**
- * Print to warn
- */
+ /** Print to warn */
protected void warn(String msg) {
Log.w(TAG, msg);
}
- /**
- * Print to error
- */
+ /** Print to error */
protected void error(String msg) {
Log.e(TAG, msg);
}
diff --git a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipTransformation.java b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipTransformation.java
index 9922f61f6dfedc5b07eee792fa0fcca08fd77136..bb2e7ecb496b812d19bde8ec71adaf8939682b51 100644
--- a/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipTransformation.java
+++ b/android/app/src/com/android/bluetooth/avrcpcontroller/bip/BipTransformation.java
@@ -24,20 +24,15 @@ import java.util.HashSet;
* Represents the set of possible transformations available for a variant of an image to get the
* image to a particular pixel size.
*
- * The transformations supported by BIP v1.2.1 include:
- * - Stretch
- * - Fill
- * - Crop
+ * The transformations supported by BIP v1.2.1 include: - Stretch - Fill - Crop
*
- * Example in an image properties/format:
- * Example in an image properties/format: Example in an image descriptor: The device should already be paired.
- * Connection policy can be one of:
- * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
- * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN},
- * {@link BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
+ * The device should already be paired. Connection policy can be one of: {@link
+ * BluetoothProfile#CONNECTION_POLICY_ALLOWED}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
*
* @param device the remote device
* @param connectionPolicy is the connection policy to set to for this profile
@@ -386,11 +378,11 @@ public class BatteryService extends ProfileService {
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
- enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
- "Need BLUETOOTH_PRIVILEGED permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
- mDatabaseManager.setProfileConnectionPolicy(device, BluetoothProfile.BATTERY,
- connectionPolicy);
+ mDatabaseManager.setProfileConnectionPolicy(
+ device, BluetoothProfile.BATTERY, connectionPolicy);
if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
connect(device);
} else if (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN) {
@@ -399,21 +391,18 @@ public class BatteryService extends ProfileService {
return true;
}
- /**
- * Gets the connection policy for the battery service of the given device.
- */
+ /** Gets the connection policy for the battery service of the given device. */
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
public int getConnectionPolicy(BluetoothDevice device) {
- enforceCallingOrSelfPermission(BLUETOOTH_PRIVILEGED,
- "Need BLUETOOTH_PRIVILEGED permission");
+ enforceCallingOrSelfPermission(
+ BLUETOOTH_PRIVILEGED, "Need BLUETOOTH_PRIVILEGED permission");
return mDatabaseManager.getProfileConnectionPolicy(device, BluetoothProfile.BATTERY);
}
- /**
- * Called when the battery level of the device is notified.
- */
+
+ /** Called when the battery level of the device is notified. */
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void handleBatteryChanged(BluetoothDevice device, int batteryLevel) {
- mAdapterService.setBatteryLevel(device, batteryLevel, /*isBas=*/ true);
+ mAdapterService.setBatteryLevel(device, batteryLevel, /* isBas= */ true);
}
private BatteryStateMachine getOrCreateStateMachine(BluetoothDevice device) {
@@ -428,8 +417,10 @@ public class BatteryService extends ProfileService {
}
// Limit the maximum number of state machines to avoid DoS attack
if (mStateMachines.size() >= MAX_BATTERY_STATE_MACHINES) {
- Log.e(TAG, "Maximum number of Battery state machines reached: "
- + MAX_BATTERY_STATE_MACHINES);
+ Log.e(
+ TAG,
+ "Maximum number of Battery state machines reached: "
+ + MAX_BATTERY_STATE_MACHINES);
return null;
}
Log.d(TAG, "Creating a new state machine for " + device);
@@ -480,8 +471,9 @@ public class BatteryService extends ProfileService {
synchronized (mStateMachines) {
BatteryStateMachine sm = mStateMachines.remove(device);
if (sm == null) {
- Log.w(TAG, "removeStateMachine: device " + device
- + " does not have a state machine");
+ Log.w(
+ TAG,
+ "removeStateMachine: device " + device + " does not have a state machine");
return;
}
Log.i(TAG, "removeGatt: removing bluetooth gatt for device: " + device);
@@ -490,9 +482,7 @@ public class BatteryService extends ProfileService {
}
}
- /**
- * Binder object: must be a static class or memory leak may occur
- */
+ /** Binder object: must be a static class or memory leak may occur */
@VisibleForTesting
static class BluetoothBatteryBinder extends IBluetoothBattery.Stub
implements IProfileServiceBinder {
diff --git a/android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java b/android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java
index 218cff125e14ed0d31b7d9a55765d030b4697231..cd0332f17368df6ab9e517d132ee6f1797de4c28 100644
--- a/android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java
+++ b/android/app/src/com/android/bluetooth/bas/BatteryStateMachine.java
@@ -44,9 +44,7 @@ import java.lang.ref.WeakReference;
import java.util.Scanner;
import java.util.UUID;
-/**
- * It manages Battery service of a BLE device
- */
+/** It manages Battery service of a BLE device */
public class BatteryStateMachine extends StateMachine {
private static final String TAG = "BatteryStateMachine";
@@ -63,8 +61,7 @@ public class BatteryStateMachine extends StateMachine {
private static final int CONNECT_TIMEOUT = 201;
// NOTE: the value is not "final" - it is modified in the unit tests
- @VisibleForTesting
- static int sConnectTimeoutMs = 30000; // 30s
+ @VisibleForTesting static int sConnectTimeoutMs = 30000; // 30s
private Disconnected mDisconnected;
private Connecting mConnecting;
@@ -103,17 +100,13 @@ public class BatteryStateMachine extends StateMachine {
return sm;
}
- /**
- * Quits the state machine
- */
+ /** Quits the state machine */
public void doQuit() {
log("doQuit for device " + mDevice);
quitNow();
}
- /**
- * Cleans up the resources the state machine held.
- */
+ /** Cleans up the resources the state machine held. */
public void cleanup() {
log("cleanup for device " + mDevice);
if (mBluetoothGatt != null) {
@@ -163,9 +156,7 @@ public class BatteryStateMachine extends StateMachine {
return Integer.toString(state);
}
- /**
- * Dumps battery state machine state.
- */
+ /** Dumps battery state machine state. */
public void dump(StringBuilder sb) {
ProfileService.println(sb, "mDevice: " + mDevice);
ProfileService.println(sb, " StateMachine: " + this);
@@ -173,7 +164,7 @@ public class BatteryStateMachine extends StateMachine {
// Dump the state machine logs
StringWriter stringWriter = new StringWriter();
PrintWriter printWriter = new PrintWriter(stringWriter);
- super.dump(new FileDescriptor(), printWriter, new String[]{});
+ super.dump(new FileDescriptor(), printWriter, new String[] {});
printWriter.flush();
stringWriter.flush();
ProfileService.println(sb, " StateMachineLog:");
@@ -204,8 +195,13 @@ public class BatteryStateMachine extends StateMachine {
}
void dispatchConnectionStateChanged(int fromState, int toState) {
- log("Connection state " + mDevice + ": " + profileStateToString(fromState)
- + "->" + profileStateToString(toState));
+ log(
+ "Connection state "
+ + mDevice
+ + ": "
+ + profileStateToString(fromState)
+ + "->"
+ + profileStateToString(toState));
BatteryService service = mServiceRef.get();
if (service != null) {
@@ -232,9 +228,15 @@ public class BatteryStateMachine extends StateMachine {
Log.w(TAG, "Trying connectGatt with existing BluetoothGatt instance.");
mBluetoothGatt.close();
}
- mBluetoothGatt = mDevice.connectGatt(service, /*autoConnect=*/false,
- mGattCallback, TRANSPORT_LE, /*opportunistic=*/true,
- PHY_LE_1M_MASK | PHY_LE_2M_MASK, getHandler());
+ mBluetoothGatt =
+ mDevice.connectGatt(
+ service,
+ /* autoConnect= */ false,
+ mGattCallback,
+ TRANSPORT_LE,
+ /* opportunistic= */ true,
+ PHY_LE_1M_MASK | PHY_LE_2M_MASK,
+ getHandler());
return mBluetoothGatt != null;
}
@@ -274,8 +276,7 @@ public class BatteryStateMachine extends StateMachine {
@Override
public void enter() {
- log(TAG, "Enter (" + mDevice + "): " + messageWhatToString(
- getCurrentMessage().what));
+ log(TAG, "Enter (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
if (mBluetoothGatt != null) {
mBluetoothGatt.close();
@@ -284,22 +285,20 @@ public class BatteryStateMachine extends StateMachine {
if (mLastConnectionState != BluetoothProfile.STATE_DISCONNECTED) {
// Don't broadcast during startup
- dispatchConnectionStateChanged(mLastConnectionState,
- BluetoothProfile.STATE_DISCONNECTED);
+ dispatchConnectionStateChanged(
+ mLastConnectionState, BluetoothProfile.STATE_DISCONNECTED);
}
}
@Override
public void exit() {
- log(TAG, "Exit (" + mDevice + "): " + messageWhatToString(
- getCurrentMessage().what));
+ log(TAG, "Exit (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
mLastConnectionState = BluetoothProfile.STATE_DISCONNECTED;
}
@Override
public boolean processMessage(Message message) {
- log(TAG, "Process message(" + mDevice + "): " + messageWhatToString(
- message.what));
+ log(TAG, "Process message(" + mDevice + "): " + messageWhatToString(message.what));
BatteryService service = mServiceRef.get();
switch (message.what) {
@@ -309,13 +308,15 @@ public class BatteryStateMachine extends StateMachine {
if (connectGatt()) {
transitionTo(mConnecting);
} else {
- Log.w(TAG, "Battery connecting request rejected due to "
- + "GATT connection rejection: " + mDevice);
+ Log.w(
+ TAG,
+ "Battery connecting request rejected due to "
+ + "GATT connection rejection: "
+ + mDevice);
}
} else {
// Reject the request and stay in Disconnected state
- Log.w(TAG, "Battery connecting request rejected: "
- + mDevice);
+ Log.w(TAG, "Battery connecting request rejected: " + mDevice);
}
break;
case DISCONNECT:
@@ -346,24 +347,22 @@ public class BatteryStateMachine extends StateMachine {
@VisibleForTesting
class Connecting extends State {
private static final String TAG = "BASM_Connecting";
+
@Override
public void enter() {
- log(TAG, "Enter (" + mDevice + "): "
- + messageWhatToString(getCurrentMessage().what));
+ log(TAG, "Enter (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
dispatchConnectionStateChanged(mLastConnectionState, BluetoothProfile.STATE_CONNECTING);
}
@Override
public void exit() {
- log(TAG, "Exit (" + mDevice + "): "
- + messageWhatToString(getCurrentMessage().what));
+ log(TAG, "Exit (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
mLastConnectionState = BluetoothProfile.STATE_CONNECTING;
}
@Override
public boolean processMessage(Message message) {
- log(TAG, "process message(" + mDevice + "): "
- + messageWhatToString(message.what));
+ log(TAG, "process message(" + mDevice + "): " + messageWhatToString(message.what));
switch (message.what) {
case CONNECT:
@@ -409,31 +408,29 @@ public class BatteryStateMachine extends StateMachine {
@VisibleForTesting
class Disconnecting extends State {
private static final String TAG = "BASM_Disconnecting";
+
@Override
public void enter() {
- log(TAG, "Enter (" + mDevice + "): "
- + messageWhatToString(getCurrentMessage().what));
+ log(TAG, "Enter (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
sendMessageDelayed(CONNECT_TIMEOUT, sConnectTimeoutMs);
- dispatchConnectionStateChanged(mLastConnectionState,
- BluetoothProfile.STATE_DISCONNECTING);
+ dispatchConnectionStateChanged(
+ mLastConnectionState, BluetoothProfile.STATE_DISCONNECTING);
}
@Override
public void exit() {
- log(TAG, "Exit (" + mDevice + "): "
- + messageWhatToString(getCurrentMessage().what));
+ log(TAG, "Exit (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
mLastConnectionState = BluetoothProfile.STATE_DISCONNECTING;
removeMessages(CONNECT_TIMEOUT);
}
@Override
public boolean processMessage(Message message) {
- log(TAG, "Process message(" + mDevice + "): "
- + messageWhatToString(message.what));
+ log(TAG, "Process message(" + mDevice + "): " + messageWhatToString(message.what));
switch (message.what) {
- //TODO: Check if connect while disconnecting is okay.
- // It is related to CONNECT_TIMEOUT as well.
+ // TODO: Check if connect while disconnecting is okay.
+ // It is related to CONNECT_TIMEOUT as well.
case CONNECT:
Log.w(TAG, "CONNECT ignored: " + mDevice);
break;
@@ -460,17 +457,17 @@ public class BatteryStateMachine extends StateMachine {
Log.i(TAG, "Disconnected: " + mDevice);
transitionTo(mDisconnected);
break;
- case BluetoothGatt.STATE_CONNECTED: {
- // Reject the connection and stay in Disconnecting state
- Log.w(TAG, "Incoming Battery connected request rejected: "
- + mDevice);
- if (mBluetoothGatt != null) {
- mBluetoothGatt.disconnect();
- } else {
- transitionTo(mDisconnected);
+ case BluetoothGatt.STATE_CONNECTED:
+ {
+ // Reject the connection and stay in Disconnecting state
+ Log.w(TAG, "Incoming Battery connected request rejected: " + mDevice);
+ if (mBluetoothGatt != null) {
+ mBluetoothGatt.disconnect();
+ } else {
+ transitionTo(mDisconnected);
+ }
+ break;
}
- break;
- }
default:
Log.e(TAG, "Incorrect state: " + state);
break;
@@ -481,10 +478,10 @@ public class BatteryStateMachine extends StateMachine {
@VisibleForTesting
class Connected extends State {
private static final String TAG = "BASM_Connected";
+
@Override
public void enter() {
- log(TAG, "Enter (" + mDevice + "): "
- + messageWhatToString(getCurrentMessage().what));
+ log(TAG, "Enter (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
dispatchConnectionStateChanged(mLastConnectionState, BluetoothProfile.STATE_CONNECTED);
if (mBluetoothGatt != null) {
@@ -494,8 +491,7 @@ public class BatteryStateMachine extends StateMachine {
@Override
public void exit() {
- log(TAG, "Exit (" + mDevice + "): "
- + messageWhatToString(getCurrentMessage().what));
+ log(TAG, "Exit (" + mDevice + "): " + messageWhatToString(getCurrentMessage().what));
// Reset the battery level only after connected
resetBatteryLevel();
mLastConnectionState = BluetoothProfile.STATE_CONNECTED;
@@ -503,8 +499,7 @@ public class BatteryStateMachine extends StateMachine {
@Override
public boolean processMessage(Message message) {
- log(TAG, "Process message(" + mDevice + "): "
- + messageWhatToString(message.what));
+ log(TAG, "Process message(" + mDevice + "): " + messageWhatToString(message.what));
switch (message.what) {
case CONNECT:
@@ -577,16 +572,19 @@ public class BatteryStateMachine extends StateMachine {
}
@Override
- public void onCharacteristicChanged(BluetoothGatt gatt,
- BluetoothGattCharacteristic characteristic, byte[] value) {
+ public void onCharacteristicChanged(
+ BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, byte[] value) {
if (GATT_BATTERY_LEVEL_CHARACTERISTIC_UUID.equals(characteristic.getUuid())) {
updateBatteryLevel(value);
}
}
@Override
- public void onCharacteristicRead(BluetoothGatt gatt,
- BluetoothGattCharacteristic characteristic, byte[] value, int status) {
+ public void onCharacteristicRead(
+ BluetoothGatt gatt,
+ BluetoothGattCharacteristic characteristic,
+ byte[] value,
+ int status) {
if (status != BluetoothGatt.GATT_SUCCESS) {
Log.e(TAG, "Read characteristic failure on " + gatt + " " + characteristic);
return;
@@ -597,18 +595,19 @@ public class BatteryStateMachine extends StateMachine {
BluetoothGattDescriptor cccd =
characteristic.getDescriptor(CLIENT_CHARACTERISTIC_CONFIG_DESCRIPTOR_UUID);
if (cccd != null) {
- gatt.setCharacteristicNotification(characteristic, /*enable=*/true);
+ gatt.setCharacteristicNotification(characteristic, /* enable= */ true);
gatt.writeDescriptor(cccd, BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
} else {
- Log.w(TAG, "No CCCD for battery level characteristic, "
- + "it won't be notified");
+ Log.w(
+ TAG,
+ "No CCCD for battery level characteristic, " + "it won't be notified");
}
}
}
@Override
- public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor,
- int status) {
+ public void onDescriptorWrite(
+ BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
if (status != BluetoothGatt.GATT_SUCCESS) {
Log.w(TAG, "Failed to write descriptor " + descriptor.getUuid());
}
diff --git a/android/app/src/com/android/bluetooth/bass_client/BaseData.java b/android/app/src/com/android/bluetooth/bass_client/BaseData.java
index f98dda279c2d338d372e9f536d25d237a4f221c6..bd5a4dba5d3ea370e36f53b48b65ec4a133060de 100644
--- a/android/app/src/com/android/bluetooth/bass_client/BaseData.java
+++ b/android/app/src/com/android/bluetooth/bass_client/BaseData.java
@@ -30,9 +30,7 @@ import java.util.Map;
import java.util.MissingResourceException;
import java.util.Set;
-/**
- * Helper class to parse the Broadcast Announcement BASE data
- */
+/** Helper class to parse the Broadcast Announcement BASE data */
class BaseData {
private static final String TAG = "Bassclient-BaseData";
private static final byte UNKNOWN_CODEC = (byte) 0xFE;
@@ -143,8 +141,11 @@ class BaseData {
if (keyMetadataDiff != null) {
Iterator The connection policy can be one of:
- * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
- * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN},
- * {@link BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
+ * The connection policy can be one of: {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
+ * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
*
* @param device paired bluetooth device
* @param connectionPolicy is the connection policy to set to for this profile
@@ -1456,8 +1519,8 @@ public class BassClientService extends ProfileService {
public boolean setConnectionPolicy(BluetoothDevice device, int connectionPolicy) {
Log.d(TAG, "Saved connectionPolicy " + device + " = " + connectionPolicy);
boolean setSuccessfully =
- mDatabaseManager.setProfileConnectionPolicy(device,
- BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT, connectionPolicy);
+ mDatabaseManager.setProfileConnectionPolicy(
+ device, BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT, connectionPolicy);
if (setSuccessfully && connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED) {
connect(device);
} else if (setSuccessfully
@@ -1470,17 +1533,16 @@ public class BassClientService extends ProfileService {
/**
* Get the connection policy of the profile.
*
- * The connection policy can be any of:
- * {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
- * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN},
- * {@link BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
+ * The connection policy can be any of: {@link BluetoothProfile#CONNECTION_POLICY_ALLOWED},
+ * {@link BluetoothProfile#CONNECTION_POLICY_FORBIDDEN}, {@link
+ * BluetoothProfile#CONNECTION_POLICY_UNKNOWN}
*
* @param device paired bluetooth device
* @return connection policy of the device
*/
public int getConnectionPolicy(BluetoothDevice device) {
- return mDatabaseManager
- .getProfileConnectionPolicy(device, BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
+ return mDatabaseManager.getProfileConnectionPolicy(
+ device, BluetoothProfile.LE_AUDIO_BROADCAST_ASSISTANT);
}
/**
@@ -1619,29 +1681,35 @@ public class BassClientService extends ProfileService {
if (mPeriodicAdvertisementResultMap != null) {
clearNotifiedFlags();
}
- ScanSettings settings = new ScanSettings.Builder().setCallbackType(
- ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
- .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
- .setLegacy(false)
- .build();
+ ScanSettings settings =
+ new ScanSettings.Builder()
+ .setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
+ .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+ .setLegacy(false)
+ .build();
if (filters == null) {
filters = new ArrayList Current policy (subject to change): 1) If the maximum number of connected devices is one, the
+ * manager doesn't do anything. Each profile is responsible for automatically selecting the
+ * connected device as active. Only if the maximum number of connected devices is more than one, the
+ * rules below will apply. 2) The selected A2DP active device is the one used for AVRCP as well. 3)
+ * The HFP active device might be different from the A2DP active device. 4) The Active Device
+ * Manager always listens for the change of active devices. When it changed (e.g., triggered
+ * indirectly by user action on the UI), the new active device is marked as the current active
+ * device for that profile. 5) If there is a HearingAid active device, then A2DP, HFP and LE audio
+ * active devices must be set to null (i.e., A2DP, HFP and LE audio cannot have active devices). The
+ * reason is that A2DP, HFP or LE audio cannot be used together with HearingAid. 6) If there are no
+ * connected devices (e.g., during startup, or after all devices have been disconnected, the active
+ * device per profile (A2DP/HFP/HearingAid/LE audio) is selected as follows: 6.1) The last connected
+ * HearingAid device is selected as active. If there is an active A2DP, HFP or LE audio device,
+ * those must be set to null. 6.2) The last connected A2DP, HFP or LE audio device is selected as
+ * active. However, if there is an active HearingAid device, then the A2DP, HFP, or LE audio active
+ * device is not set (must remain null). 7) If the currently active device (per profile) is
+ * disconnected, the Active Device Manager just marks that the profile has no active device, and the
+ * lastly activated BT device that is still connected would be selected. 8) If there is already an
+ * active device, however, if active device change notified with a null device, the corresponding
+ * profile is marked as having no active device. 9) If a wired audio device is connected, the audio
+ * output is switched by the Audio Framework itself to that device. We detect this here, and the
+ * active device for each profile (A2DP/HFP/HearingAid/LE audio) is set to null to reflect the
+ * output device state change. However, if the wired audio device is disconnected, we don't do
+ * anything explicit and apply the default behavior instead: 9.1) If the wired headset is still the
+ * selected output device (i.e. the active device is set to null), the Phone itself will become the
+ * output device (i.e., the active device will remain null). If music was playing, it will stop.
+ * 9.2) If one of the Bluetooth devices is the selected active device (e.g., by the user in the UI),
+ * disconnecting the wired audio device will have no impact. E.g., music will continue streaming
+ * over the active Bluetooth device.
*/
public class ActiveDeviceManager implements AdapterService.BluetoothStateCallback {
private static final String TAG = ActiveDeviceManager.class.getSimpleName();
- @VisibleForTesting
- static final int A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS = 5_000;
+ @VisibleForTesting static final int A2DP_HFP_SYNC_CONNECTION_TIMEOUT_MS = 5_000;
private final AdapterService mAdapterService;
private DatabaseManager mDbManager;
@@ -113,28 +100,40 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac
private final AudioManagerAudioDeviceCallback mAudioManagerAudioDeviceCallback;
private final Object mLock = new Object();
+
@GuardedBy("mLock")
private final List Transition States: {@link TurningBleOnState} : OffState to BleOnState {@link
+ * TurningBleOffState} : BleOnState to OffState {@link TurningOnState} : BleOnState to OnState
+ * {@link TurningOffState} : OnState to BleOnState
*
+ * +------ Off <-----+ | | v | TurningBleOn TO---> TurningBleOff | ^ ^ | | | +-----> ----+ |
+ * BleOn | +------ <---+ O v | T TurningOn TO----> TurningOff | ^ | | +-----> On ------+
*/
-
final class AdapterState extends StateMachine {
private static final String TAG = AdapterState.class.getSimpleName();
@@ -72,19 +54,17 @@ final class AdapterState extends StateMachine {
static final int BLE_STOP_TIMEOUT = 11;
static final int BLE_START_TIMEOUT = 12;
- static final String BLE_START_TIMEOUT_DELAY_PROPERTY =
- "ro.bluetooth.ble_start_timeout_delay";
- static final String BLE_STOP_TIMEOUT_DELAY_PROPERTY =
- "ro.bluetooth.ble_stop_timeout_delay";
+ static final String BLE_START_TIMEOUT_DELAY_PROPERTY = "ro.bluetooth.ble_start_timeout_delay";
+ static final String BLE_STOP_TIMEOUT_DELAY_PROPERTY = "ro.bluetooth.ble_stop_timeout_delay";
static final int BLE_START_TIMEOUT_DELAY =
- 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
+ 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
static final int BLE_STOP_TIMEOUT_DELAY =
- 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
+ 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
static final int BREDR_START_TIMEOUT_DELAY =
- 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
+ 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
static final int BREDR_STOP_TIMEOUT_DELAY =
- 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
+ 4000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1);
private AdapterService mAdapterService;
private TurningOnState mTurningOnState = new TurningOnState();
@@ -113,19 +93,32 @@ final class AdapterState extends StateMachine {
private String messageString(int message) {
switch (message) {
- case BLE_TURN_ON: return "BLE_TURN_ON";
- case USER_TURN_ON: return "USER_TURN_ON";
- case BREDR_STARTED: return "BREDR_STARTED";
- case BLE_STARTED: return "BLE_STARTED";
- case USER_TURN_OFF: return "USER_TURN_OFF";
- case BLE_TURN_OFF: return "BLE_TURN_OFF";
- case BLE_STOPPED: return "BLE_STOPPED";
- case BREDR_STOPPED: return "BREDR_STOPPED";
- case BLE_START_TIMEOUT: return "BLE_START_TIMEOUT";
- case BLE_STOP_TIMEOUT: return "BLE_STOP_TIMEOUT";
- case BREDR_START_TIMEOUT: return "BREDR_START_TIMEOUT";
- case BREDR_STOP_TIMEOUT: return "BREDR_STOP_TIMEOUT";
- default: return "Unknown message (" + message + ")";
+ case BLE_TURN_ON:
+ return "BLE_TURN_ON";
+ case USER_TURN_ON:
+ return "USER_TURN_ON";
+ case BREDR_STARTED:
+ return "BREDR_STARTED";
+ case BLE_STARTED:
+ return "BLE_STARTED";
+ case USER_TURN_OFF:
+ return "USER_TURN_OFF";
+ case BLE_TURN_OFF:
+ return "BLE_TURN_OFF";
+ case BLE_STOPPED:
+ return "BLE_STOPPED";
+ case BREDR_STOPPED:
+ return "BREDR_STOPPED";
+ case BLE_START_TIMEOUT:
+ return "BLE_START_TIMEOUT";
+ case BLE_STOP_TIMEOUT:
+ return "BLE_STOP_TIMEOUT";
+ case BREDR_START_TIMEOUT:
+ return "BREDR_START_TIMEOUT";
+ case BREDR_STOP_TIMEOUT:
+ return "BREDR_STOP_TIMEOUT";
+ default:
+ return "Unknown message (" + message + ")";
}
}
@@ -263,8 +256,9 @@ final class AdapterState extends StateMachine {
@Override
public void enter() {
super.enter();
- final int timeoutDelay = SystemProperties.getInt(
- BLE_START_TIMEOUT_DELAY_PROPERTY, BLE_START_TIMEOUT_DELAY);
+ final int timeoutDelay =
+ SystemProperties.getInt(
+ BLE_START_TIMEOUT_DELAY_PROPERTY, BLE_START_TIMEOUT_DELAY);
Log.d(TAG, "Start Timeout Delay: " + timeoutDelay);
sendMessageDelayed(BLE_START_TIMEOUT, timeoutDelay);
mAdapterService.bringUpBle();
@@ -386,8 +380,9 @@ final class AdapterState extends StateMachine {
@Override
public void enter() {
super.enter();
- final int timeoutDelay = SystemProperties.getInt(
- BLE_STOP_TIMEOUT_DELAY_PROPERTY, BLE_STOP_TIMEOUT_DELAY);
+ final int timeoutDelay =
+ SystemProperties.getInt(
+ BLE_STOP_TIMEOUT_DELAY_PROPERTY, BLE_STOP_TIMEOUT_DELAY);
Log.d(TAG, "Stop Timeout Delay: " + timeoutDelay);
sendMessageDelayed(BLE_STOP_TIMEOUT, timeoutDelay);
mAdapterService.bringDownBle();
diff --git a/android/app/src/com/android/bluetooth/btservice/AudioRoutingManager.java b/android/app/src/com/android/bluetooth/btservice/AudioRoutingManager.java
index 8b1dc2e8b5fd5ceb4f2a7d82af09c9c823461a29..8f2ca9c35920e8b2c265423180be56ec7426ec63 100644
--- a/android/app/src/com/android/bluetooth/btservice/AudioRoutingManager.java
+++ b/android/app/src/com/android/bluetooth/btservice/AudioRoutingManager.java
@@ -564,25 +564,26 @@ public class AudioRoutingManager extends ActiveDeviceManager {
+ ", "
+ device
+ ")");
- boolean activated = switch (profile) {
- case BluetoothProfile.A2DP -> {
- A2dpService service = mFactory.getA2dpService();
- yield service == null ? false : service.setActiveDevice(device);
- }
- case BluetoothProfile.HEADSET -> {
- HeadsetService service = mFactory.getHeadsetService();
- yield service == null ? false : service.setActiveDevice(device);
- }
- case BluetoothProfile.LE_AUDIO -> {
- LeAudioService service = mFactory.getLeAudioService();
- yield service == null ? false : service.setActiveDevice(device);
- }
- case BluetoothProfile.HEARING_AID -> {
- HearingAidService service = mFactory.getHearingAidService();
- yield service == null ? false : service.setActiveDevice(device);
- }
- default -> false;
- };
+ boolean activated =
+ switch (profile) {
+ case BluetoothProfile.A2DP -> {
+ A2dpService service = mFactory.getA2dpService();
+ yield service == null ? false : service.setActiveDevice(device);
+ }
+ case BluetoothProfile.HEADSET -> {
+ HeadsetService service = mFactory.getHeadsetService();
+ yield service == null ? false : service.setActiveDevice(device);
+ }
+ case BluetoothProfile.LE_AUDIO -> {
+ LeAudioService service = mFactory.getLeAudioService();
+ yield service == null ? false : service.setActiveDevice(device);
+ }
+ case BluetoothProfile.HEARING_AID -> {
+ HearingAidService service = mFactory.getHearingAidService();
+ yield service == null ? false : service.setActiveDevice(device);
+ }
+ default -> false;
+ };
if (activated) {
List This is necessary due to the "final" attribute of the BluetoothAdapter class. In order to test
+ * the correct functioning of the ScanManager class, the final class must be put into a container
+ * that can be mocked correctly.
*/
public class BluetoothAdapterProxy {
private static final String TAG = BluetoothAdapterProxy.class.getSimpleName();
diff --git a/android/app/src/com/android/bluetooth/btservice/BluetoothQualityReportNativeInterface.java b/android/app/src/com/android/bluetooth/btservice/BluetoothQualityReportNativeInterface.java
index 3fa40e4b1824f9c7134409c666b8002180b6afec..279d625c8c8b3d89384a76c21b1f31737dcf206e 100644
--- a/android/app/src/com/android/bluetooth/btservice/BluetoothQualityReportNativeInterface.java
+++ b/android/app/src/com/android/bluetooth/btservice/BluetoothQualityReportNativeInterface.java
@@ -70,9 +70,7 @@ public class BluetoothQualityReportNativeInterface {
cleanupNative();
}
- /**
- * Callback from the native stack back into the Java framework.
- */
+ /** Callback from the native stack back into the Java framework. */
private void bqrDeliver(
byte[] remoteAddr, int lmpVer, int lmpSubVer, int manufacturerId, byte[] bqrRawData) {
BluetoothClass remoteBtClass = null;
@@ -91,8 +89,12 @@ public class BluetoothQualityReportNativeInterface {
remoteName = device.getName();
remoteBtClass = device.getBluetoothClass();
} else {
- Log.e(TAG, "bqrDeliver failed: "
- + (remoteAddress == null ? "remoteAddress is null" : "adapter is null"));
+ Log.e(
+ TAG,
+ "bqrDeliver failed: "
+ + (remoteAddress == null
+ ? "remoteAddress is null"
+ : "adapter is null"));
return;
}
diff --git a/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java b/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
index 355a3ad5a9b2b4a643e6137d188eed83befaac50..10f3b195358d497f0e5652458c56840939693e4c 100644
--- a/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/android/app/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -58,13 +58,10 @@ import java.util.Optional;
import java.util.Set;
/**
- * This state machine handles Bluetooth Adapter State.
- * States:
- * {@link StableState} : No device is in bonding / unbonding state.
- * {@link PendingCommandState} : Some device is in bonding / unbonding state.
- * TODO(BT) This class can be removed and this logic moved to the stack.
+ * This state machine handles Bluetooth Adapter State. States: {@link StableState} : No device is in
+ * bonding / unbonding state. {@link PendingCommandState} : Some device is in bonding / unbonding
+ * state. TODO(BT) This class can be removed and this logic moved to the stack.
*/
-
final class BondStateMachine extends StateMachine {
private static final String TAG = "BluetoothBondStateMachine";
@@ -99,8 +96,8 @@ final class BondStateMachine extends StateMachine {
@VisibleForTesting Set 1. A paired device is recognized as a companion device if its METADATA_SOFTWARE_VERSION is set
+ * to BluetoothDevice.COMPANION_TYPE_PRIMARY or BluetoothDevice.COMPANION_TYPE_SECONDARY. 2. Only
+ * can have one companion device at a time. 3. Remove bond does not remove the companion device
+ * record. 4. Factory reset Bluetooth removes the companion device. 5. Companion device has
+ * individual GATT connection parameters.
+ */
public class CompanionManager {
private static final String TAG = "BluetoothCompanionManager";
@@ -59,13 +57,13 @@ public class CompanionManager {
private final int[] mGattConnLowDefault;
private final int[] mGattConnDckDefault;
- @VisibleForTesting static final int COMPANION_TYPE_NONE = 0;
- @VisibleForTesting static final int COMPANION_TYPE_PRIMARY = 1;
+ @VisibleForTesting static final int COMPANION_TYPE_NONE = 0;
+ @VisibleForTesting static final int COMPANION_TYPE_PRIMARY = 1;
@VisibleForTesting static final int COMPANION_TYPE_SECONDARY = 2;
public static final int GATT_CONN_INTERVAL_MIN = 0;
public static final int GATT_CONN_INTERVAL_MAX = 1;
- public static final int GATT_CONN_LATENCY = 2;
+ public static final int GATT_CONN_LATENCY = 2;
@VisibleForTesting static final String COMPANION_INFO = "bluetooth_companion_info";
@VisibleForTesting static final String COMPANION_DEVICE_KEY = "companion_device";
@@ -95,72 +93,113 @@ public class CompanionManager {
public CompanionManager(AdapterService service, ServiceFactory factory) {
mAdapterService = service;
- mGattConnHighDefault = new int[] {
- getGattConfig(PROPERTY_HIGH_MIN_INTERVAL,
- R.integer.gatt_high_priority_min_interval),
- getGattConfig(PROPERTY_HIGH_MAX_INTERVAL,
- R.integer.gatt_high_priority_max_interval),
- getGattConfig(PROPERTY_HIGH_LATENCY,
- R.integer.gatt_high_priority_latency)};
- mGattConnBalanceDefault = new int[] {
- getGattConfig(PROPERTY_BALANCED_MIN_INTERVAL,
- R.integer.gatt_balanced_priority_min_interval),
- getGattConfig(PROPERTY_BALANCED_MAX_INTERVAL,
- R.integer.gatt_balanced_priority_max_interval),
- getGattConfig(PROPERTY_BALANCED_LATENCY,
- R.integer.gatt_balanced_priority_latency)};
- mGattConnLowDefault = new int[] {
- getGattConfig(PROPERTY_LOW_MIN_INTERVAL, R.integer.gatt_low_power_min_interval),
- getGattConfig(PROPERTY_LOW_MAX_INTERVAL, R.integer.gatt_low_power_max_interval),
- getGattConfig(PROPERTY_LOW_LATENCY, R.integer.gatt_low_power_latency)};
- mGattConnDckDefault = new int[] {
- getGattConfig(PROPERTY_DCK_MIN_INTERVAL, R.integer.gatt_dck_priority_min_interval),
- getGattConfig(PROPERTY_DCK_MAX_INTERVAL, R.integer.gatt_dck_priority_max_interval),
- getGattConfig(PROPERTY_DCK_LATENCY, R.integer.gatt_dck_priority_latency)};
-
- mGattConnHighPrimary = new int[] {
- getGattConfig(PROPERTY_HIGH_MIN_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_high_priority_min_interval_primary),
- getGattConfig(PROPERTY_HIGH_MAX_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_high_priority_max_interval_primary),
- getGattConfig(PROPERTY_HIGH_LATENCY + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_high_priority_latency_primary)};
- mGattConnBalancePrimary = new int[] {
- getGattConfig(PROPERTY_BALANCED_MIN_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_balanced_priority_min_interval_primary),
- getGattConfig(PROPERTY_BALANCED_MAX_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_balanced_priority_max_interval_primary),
- getGattConfig(PROPERTY_BALANCED_LATENCY + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_balanced_priority_latency_primary)};
- mGattConnLowPrimary = new int[] {
- getGattConfig(PROPERTY_LOW_MIN_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_low_power_min_interval_primary),
- getGattConfig(PROPERTY_LOW_MAX_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_low_power_max_interval_primary),
- getGattConfig(PROPERTY_LOW_LATENCY + PROPERTY_SUFFIX_PRIMARY,
- R.integer.gatt_low_power_latency_primary)};
-
- mGattConnHighSecondary = new int[] {
- getGattConfig(PROPERTY_HIGH_MIN_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_high_priority_min_interval_secondary),
- getGattConfig(PROPERTY_HIGH_MAX_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_high_priority_max_interval_secondary),
- getGattConfig(PROPERTY_HIGH_LATENCY + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_high_priority_latency_secondary)};
- mGattConnBalanceSecondary = new int[] {
- getGattConfig(PROPERTY_BALANCED_MIN_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_balanced_priority_min_interval_secondary),
- getGattConfig(PROPERTY_BALANCED_MAX_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_balanced_priority_max_interval_secondary),
- getGattConfig(PROPERTY_BALANCED_LATENCY + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_balanced_priority_latency_secondary)};
- mGattConnLowSecondary = new int[] {
- getGattConfig(PROPERTY_LOW_MIN_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_low_power_min_interval_secondary),
- getGattConfig(PROPERTY_LOW_MAX_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_low_power_max_interval_secondary),
- getGattConfig(PROPERTY_LOW_LATENCY + PROPERTY_SUFFIX_SECONDARY,
- R.integer.gatt_low_power_latency_secondary)};
+ mGattConnHighDefault =
+ new int[] {
+ getGattConfig(
+ PROPERTY_HIGH_MIN_INTERVAL, R.integer.gatt_high_priority_min_interval),
+ getGattConfig(
+ PROPERTY_HIGH_MAX_INTERVAL, R.integer.gatt_high_priority_max_interval),
+ getGattConfig(PROPERTY_HIGH_LATENCY, R.integer.gatt_high_priority_latency)
+ };
+ mGattConnBalanceDefault =
+ new int[] {
+ getGattConfig(
+ PROPERTY_BALANCED_MIN_INTERVAL,
+ R.integer.gatt_balanced_priority_min_interval),
+ getGattConfig(
+ PROPERTY_BALANCED_MAX_INTERVAL,
+ R.integer.gatt_balanced_priority_max_interval),
+ getGattConfig(
+ PROPERTY_BALANCED_LATENCY, R.integer.gatt_balanced_priority_latency)
+ };
+ mGattConnLowDefault =
+ new int[] {
+ getGattConfig(PROPERTY_LOW_MIN_INTERVAL, R.integer.gatt_low_power_min_interval),
+ getGattConfig(PROPERTY_LOW_MAX_INTERVAL, R.integer.gatt_low_power_max_interval),
+ getGattConfig(PROPERTY_LOW_LATENCY, R.integer.gatt_low_power_latency)
+ };
+ mGattConnDckDefault =
+ new int[] {
+ getGattConfig(
+ PROPERTY_DCK_MIN_INTERVAL, R.integer.gatt_dck_priority_min_interval),
+ getGattConfig(
+ PROPERTY_DCK_MAX_INTERVAL, R.integer.gatt_dck_priority_max_interval),
+ getGattConfig(PROPERTY_DCK_LATENCY, R.integer.gatt_dck_priority_latency)
+ };
+
+ mGattConnHighPrimary =
+ new int[] {
+ getGattConfig(
+ PROPERTY_HIGH_MIN_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_high_priority_min_interval_primary),
+ getGattConfig(
+ PROPERTY_HIGH_MAX_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_high_priority_max_interval_primary),
+ getGattConfig(
+ PROPERTY_HIGH_LATENCY + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_high_priority_latency_primary)
+ };
+ mGattConnBalancePrimary =
+ new int[] {
+ getGattConfig(
+ PROPERTY_BALANCED_MIN_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_balanced_priority_min_interval_primary),
+ getGattConfig(
+ PROPERTY_BALANCED_MAX_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_balanced_priority_max_interval_primary),
+ getGattConfig(
+ PROPERTY_BALANCED_LATENCY + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_balanced_priority_latency_primary)
+ };
+ mGattConnLowPrimary =
+ new int[] {
+ getGattConfig(
+ PROPERTY_LOW_MIN_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_low_power_min_interval_primary),
+ getGattConfig(
+ PROPERTY_LOW_MAX_INTERVAL + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_low_power_max_interval_primary),
+ getGattConfig(
+ PROPERTY_LOW_LATENCY + PROPERTY_SUFFIX_PRIMARY,
+ R.integer.gatt_low_power_latency_primary)
+ };
+
+ mGattConnHighSecondary =
+ new int[] {
+ getGattConfig(
+ PROPERTY_HIGH_MIN_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_high_priority_min_interval_secondary),
+ getGattConfig(
+ PROPERTY_HIGH_MAX_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_high_priority_max_interval_secondary),
+ getGattConfig(
+ PROPERTY_HIGH_LATENCY + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_high_priority_latency_secondary)
+ };
+ mGattConnBalanceSecondary =
+ new int[] {
+ getGattConfig(
+ PROPERTY_BALANCED_MIN_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_balanced_priority_min_interval_secondary),
+ getGattConfig(
+ PROPERTY_BALANCED_MAX_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_balanced_priority_max_interval_secondary),
+ getGattConfig(
+ PROPERTY_BALANCED_LATENCY + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_balanced_priority_latency_secondary)
+ };
+ mGattConnLowSecondary =
+ new int[] {
+ getGattConfig(
+ PROPERTY_LOW_MIN_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_low_power_min_interval_secondary),
+ getGattConfig(
+ PROPERTY_LOW_MAX_INTERVAL + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_low_power_max_interval_secondary),
+ getGattConfig(
+ PROPERTY_LOW_LATENCY + PROPERTY_SUFFIX_SECONDARY,
+ R.integer.gatt_low_power_latency_secondary)
+ };
}
private int getGattConfig(String property, int resId) {
@@ -173,8 +212,8 @@ public class CompanionManager {
try {
mCompanionDevice = mAdapter.getRemoteDevice(address);
- mCompanionType = getCompanionPreferences().getInt(
- COMPANION_TYPE_KEY, COMPANION_TYPE_NONE);
+ mCompanionType =
+ getCompanionPreferences().getInt(COMPANION_TYPE_KEY, COMPANION_TYPE_NONE);
} catch (IllegalArgumentException e) {
mCompanionDevice = null;
mCompanionType = COMPANION_TYPE_NONE;
@@ -184,8 +223,9 @@ public class CompanionManager {
if (mCompanionDevice == null) {
// We don't have any companion phone registered, try look from the bonded devices
for (BluetoothDevice device : mAdapter.getBondedDevices()) {
- byte[] metadata = mAdapterService.getMetadata(device,
- BluetoothDevice.METADATA_SOFTWARE_VERSION);
+ byte[] metadata =
+ mAdapterService.getMetadata(
+ device, BluetoothDevice.METADATA_SOFTWARE_VERSION);
if (metadata == null) {
continue;
}
@@ -208,11 +248,14 @@ public class CompanionManager {
@Override
public void onMetadataChanged(BluetoothDevice device, int key, byte[] value) {
String valueStr = new String(value);
- Log.d(TAG, String.format("Metadata updated in Device %s: %d = %s.", device,
- key, value == null ? null : valueStr));
+ Log.d(
+ TAG,
+ String.format(
+ "Metadata updated in Device %s: %d = %s.",
+ device, key, value == null ? null : valueStr));
if (key == BluetoothDevice.METADATA_SOFTWARE_VERSION
&& (valueStr.equals(BluetoothDevice.COMPANION_TYPE_PRIMARY)
- || valueStr.equals(BluetoothDevice.COMPANION_TYPE_SECONDARY))) {
+ || valueStr.equals(BluetoothDevice.COMPANION_TYPE_SECONDARY))) {
setCompanionDevice(device, valueStr);
}
}
@@ -222,16 +265,17 @@ public class CompanionManager {
synchronized (mMetadataListeningDevices) {
Log.i(TAG, "setCompanionDevice: " + companionDevice + ", type=" + type);
mCompanionDevice = companionDevice;
- mCompanionType = type.equals(BluetoothDevice.COMPANION_TYPE_PRIMARY)
- ? COMPANION_TYPE_PRIMARY : COMPANION_TYPE_SECONDARY;
+ mCompanionType =
+ type.equals(BluetoothDevice.COMPANION_TYPE_PRIMARY)
+ ? COMPANION_TYPE_PRIMARY
+ : COMPANION_TYPE_SECONDARY;
// unregister all metadata listeners
for (BluetoothDevice device : mMetadataListeningDevices) {
try {
mAdapter.removeOnMetadataChangedListener(device, mMetadataListener);
} catch (IllegalArgumentException e) {
- Log.e(TAG, "failed to unregister metadata listener for "
- + device + " " + e);
+ Log.e(TAG, "failed to unregister metadata listener for " + device + " " + e);
}
}
mMetadataListeningDevices.clear();
@@ -279,8 +323,7 @@ public class CompanionManager {
mAdapter.addOnMetadataChangedListener(
device, mAdapterService.getMainExecutor(), mMetadataListener);
} catch (IllegalArgumentException e) {
- Log.e(TAG, "failed to register metadata listener for "
- + device + " " + e);
+ Log.e(TAG, "failed to register metadata listener for " + device + " " + e);
}
mMetadataListeningDevices.add(device);
}
@@ -294,14 +337,12 @@ public class CompanionManager {
try {
mAdapter.removeOnMetadataChangedListener(device, mMetadataListener);
} catch (IllegalArgumentException e) {
- Log.e(TAG, "failed to unregister metadata listener for "
- + device + " " + e);
+ Log.e(TAG, "failed to unregister metadata listener for " + device + " " + e);
}
mMetadataListeningDevices.remove(device);
}
}
-
/**
* Method to get the stored companion device
*
@@ -336,9 +377,7 @@ public class CompanionManager {
return device.equals(mCompanionDevice);
}
- /**
- * Method to reset the stored companion info
- */
+ /** Method to reset the stored companion info */
public void factoryReset() {
synchronized (mMetadataListeningDevices) {
mCompanionDevice = null;
@@ -355,11 +394,11 @@ public class CompanionManager {
* Gets the GATT connection parameters of the device
*
* @param address the address of the Bluetooth device
- * @param type type of the parameter, can be GATT_CONN_INTERVAL_MIN, GATT_CONN_INTERVAL_MAX
- * or GATT_CONN_LATENCY
+ * @param type type of the parameter, can be GATT_CONN_INTERVAL_MIN, GATT_CONN_INTERVAL_MAX or
+ * GATT_CONN_LATENCY
* @param priority the priority of the connection, can be
- * BluetoothGatt.CONNECTION_PRIORITY_HIGH, BluetoothGatt.CONNECTION_PRIORITY_LOW_POWER or
- * BluetoothGatt.CONNECTION_PRIORITY_BALANCED
+ * BluetoothGatt.CONNECTION_PRIORITY_HIGH, BluetoothGatt.CONNECTION_PRIORITY_LOW_POWER or
+ * BluetoothGatt.CONNECTION_PRIORITY_BALANCED
* @return the connection parameter in integer
*/
public int getGattConnParameters(String address, int type, int priority) {
diff --git a/android/app/src/com/android/bluetooth/btservice/DataMigration.java b/android/app/src/com/android/bluetooth/btservice/DataMigration.java
index 7586658d3775d9f3c4a390b90cbfdabeb5db2322..3d4f964060760e70dd5367d139b0cc7f1f10f80b 100644
--- a/android/app/src/com/android/bluetooth/btservice/DataMigration.java
+++ b/android/app/src/com/android/bluetooth/btservice/DataMigration.java
@@ -32,21 +32,17 @@ import com.android.internal.annotations.VisibleForTesting;
import java.util.List;
final class DataMigration {
- private DataMigration(){}
+ private DataMigration() {}
+
private static final String TAG = "DataMigration";
- @VisibleForTesting
- static final String AUTHORITY = "bluetooth_legacy.provider";
+ @VisibleForTesting static final String AUTHORITY = "bluetooth_legacy.provider";
- @VisibleForTesting
- static final String START_MIGRATION_CALL = "start_legacy_migration";
- @VisibleForTesting
- static final String FINISH_MIGRATION_CALL = "finish_legacy_migration";
+ @VisibleForTesting static final String START_MIGRATION_CALL = "start_legacy_migration";
+ @VisibleForTesting static final String FINISH_MIGRATION_CALL = "finish_legacy_migration";
- @VisibleForTesting
- static final String BLUETOOTH_DATABASE = "bluetooth_db";
- @VisibleForTesting
- static final String OPP_DATABASE = "btopp.db";
+ @VisibleForTesting static final String BLUETOOTH_DATABASE = "bluetooth_db";
+ @VisibleForTesting static final String OPP_DATABASE = "btopp.db";
// AvrcpVolumeManager.VOLUME_MAP
private static final String VOLUME_MAP_PREFERENCE_FILE = "bluetooth_volume_map";
@@ -78,26 +74,18 @@ final class DataMigration {
};
// Main key use for storing all the key in the associate bundle
- @VisibleForTesting
- static final String KEY_LIST = "key_list";
+ @VisibleForTesting static final String KEY_LIST = "key_list";
- @VisibleForTesting
- static final String BLUETOOTH_CONFIG = "bluetooth_config";
+ @VisibleForTesting static final String BLUETOOTH_CONFIG = "bluetooth_config";
static final String MIGRATION_DONE_PROPERTY = "migration_done";
- @VisibleForTesting
- static final String MIGRATION_ATTEMPT_PROPERTY = "migration_attempt";
+ @VisibleForTesting static final String MIGRATION_ATTEMPT_PROPERTY = "migration_attempt";
- @VisibleForTesting
- public static final int MIGRATION_STATUS_TO_BE_DONE = 0;
- @VisibleForTesting
- public static final int MIGRATION_STATUS_COMPLETED = 1;
- @VisibleForTesting
- public static final int MIGRATION_STATUS_MISSING_APK = 2;
- @VisibleForTesting
- public static final int MIGRATION_STATUS_MAX_ATTEMPT = 3;
+ @VisibleForTesting public static final int MIGRATION_STATUS_TO_BE_DONE = 0;
+ @VisibleForTesting public static final int MIGRATION_STATUS_COMPLETED = 1;
+ @VisibleForTesting public static final int MIGRATION_STATUS_MISSING_APK = 2;
+ @VisibleForTesting public static final int MIGRATION_STATUS_MAX_ATTEMPT = 3;
- @VisibleForTesting
- static final int MAX_ATTEMPT = 3;
+ @VisibleForTesting static final int MAX_ATTEMPT = 3;
static int run(Context ctx) {
if (migrationStatus(ctx) == MIGRATION_STATUS_COMPLETED) {
@@ -115,7 +103,7 @@ final class DataMigration {
return MIGRATION_STATUS_MAX_ATTEMPT;
}
- for (String pref: sharedPreferencesKeys) {
+ for (String pref : sharedPreferencesKeys) {
sharedPreferencesMigration(pref, ctx);
}
// Migration for DefaultSharedPreferences used in PbapUtils. Contains Long
@@ -133,9 +121,13 @@ final class DataMigration {
static boolean bluetoothDatabaseMigration(Context ctx) {
final String logHeader = BLUETOOTH_DATABASE + ": ";
ContentResolver resolver = ctx.getContentResolver();
- Cursor cursor = resolver.query(
- Uri.parse("content://" + AUTHORITY + "/" + BLUETOOTH_DATABASE),
- null, null, null, null);
+ Cursor cursor =
+ resolver.query(
+ Uri.parse("content://" + AUTHORITY + "/" + BLUETOOTH_DATABASE),
+ null,
+ null,
+ null,
+ null);
if (cursor == null) {
Log.d(TAG, logHeader + "Nothing to migrate");
return true;
@@ -155,9 +147,13 @@ final class DataMigration {
static boolean oppDatabaseMigration(Context ctx) {
final String logHeader = OPP_DATABASE + ": ";
ContentResolver resolver = ctx.getContentResolver();
- Cursor cursor = resolver.query(
- Uri.parse("content://" + AUTHORITY + "/" + OPP_DATABASE),
- null, null, null, null);
+ Cursor cursor =
+ resolver.query(
+ Uri.parse("content://" + AUTHORITY + "/" + OPP_DATABASE),
+ null,
+ null,
+ null,
+ null);
if (cursor == null) {
Log.d(TAG, logHeader + "Nothing to migrate");
return true;
@@ -173,8 +169,8 @@ final class DataMigration {
return status;
}
- private static boolean writeObjectToEditor(SharedPreferences.Editor editor, Bundle b,
- String itemKey) {
+ private static boolean writeObjectToEditor(
+ SharedPreferences.Editor editor, Bundle b, String itemKey) {
Object value = b.get(itemKey);
if (value == null) {
Log.e(TAG, itemKey + ": No value associated with this itemKey");
@@ -189,8 +185,12 @@ final class DataMigration {
} else if (value instanceof String) {
editor.putString(itemKey, (String) value);
} else {
- Log.e(TAG, itemKey + ": Failed to migrate: "
- + value.getClass().getSimpleName() + ": Data type not handled");
+ Log.e(
+ TAG,
+ itemKey
+ + ": Failed to migrate: "
+ + value.getClass().getSimpleName()
+ + ": Data type not handled");
return false;
}
return true;
@@ -241,9 +241,7 @@ final class DataMigration {
static boolean incrementeMigrationAttempt(Context ctx) {
SharedPreferences pref = ctx.getSharedPreferences(BLUETOOTH_CONFIG, Context.MODE_PRIVATE);
int currentAttempt = Math.min(pref.getInt(MIGRATION_ATTEMPT_PROPERTY, 0), MAX_ATTEMPT);
- pref.edit()
- .putInt(MIGRATION_ATTEMPT_PROPERTY, currentAttempt + 1)
- .apply();
+ pref.edit().putInt(MIGRATION_ATTEMPT_PROPERTY, currentAttempt + 1).apply();
return currentAttempt < MAX_ATTEMPT;
}
@@ -261,8 +259,8 @@ final class DataMigration {
@VisibleForTesting
static void markMigrationStatus(Context ctx, int status) {
ctx.getSharedPreferences(BLUETOOTH_CONFIG, Context.MODE_PRIVATE)
- .edit()
- .putInt(MIGRATION_DONE_PROPERTY, status)
- .apply();
+ .edit()
+ .putInt(MIGRATION_DONE_PROPERTY, status)
+ .apply();
}
}
diff --git a/android/app/src/com/android/bluetooth/btservice/DeviceBloomfilterGenerator.java b/android/app/src/com/android/bluetooth/btservice/DeviceBloomfilterGenerator.java
index 02b2c4bef8ce902ea2eadfdc35fc04cef1d90f91..4e22c1ce4b48005d9800495db91790fc015170f8 100644
--- a/android/app/src/com/android/bluetooth/btservice/DeviceBloomfilterGenerator.java
+++ b/android/app/src/com/android/bluetooth/btservice/DeviceBloomfilterGenerator.java
@@ -19,9 +19,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-/**
- * Class to generate a default Device Bloomfilter
- */
+/** Class to generate a default Device Bloomfilter */
public class DeviceBloomfilterGenerator {
public static final String BLOOM_FILTER_DEFAULT =
@@ -373,8 +371,10 @@ public class DeviceBloomfilterGenerator {
int len = s.length();
byte[] data = new byte[len / 2];
for (int i = 0; i < len; i += 2) {
- data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
- + Character.digit(s.charAt(i + 1), 16));
+ data[i / 2] =
+ (byte)
+ ((Character.digit(s.charAt(i), 16) << 4)
+ + Character.digit(s.charAt(i + 1), 16));
}
return data;
}
diff --git a/android/app/src/com/android/bluetooth/btservice/DiscoveringPackage.java b/android/app/src/com/android/bluetooth/btservice/DiscoveringPackage.java
index 72bf389feb3516cbc10db5df7760da6ed18b840b..e2b729532289a4e41ed1627140cd85c457f9e007 100644
--- a/android/app/src/com/android/bluetooth/btservice/DiscoveringPackage.java
+++ b/android/app/src/com/android/bluetooth/btservice/DiscoveringPackage.java
@@ -24,7 +24,9 @@ final class DiscoveringPackage {
private @Nullable String mPermission;
private boolean mHasDisavowedLocation;
- DiscoveringPackage(@NonNull String packageName, @Nullable String permission,
+ DiscoveringPackage(
+ @NonNull String packageName,
+ @Nullable String permission,
boolean hasDisavowedLocation) {
mPackageName = packageName;
mPermission = permission;
diff --git a/android/app/src/com/android/bluetooth/btservice/InteropUtil.java b/android/app/src/com/android/bluetooth/btservice/InteropUtil.java
index 32e2476249de2aee120d5814fb06fa1d31f88b6e..93ab3ac4f2a6dad9887f6c8ad5c1cbc8751b27cf 100644
--- a/android/app/src/com/android/bluetooth/btservice/InteropUtil.java
+++ b/android/app/src/com/android/bluetooth/btservice/InteropUtil.java
@@ -20,18 +20,17 @@ package com.android.bluetooth.btservice;
import android.util.Log;
/**
- * APIs of interoperability workaround utilities.
- * These APIs will call stack layer's interop APIs of interop.cc to do matching
- * or entry adding/removing.
+ * APIs of interoperability workaround utilities. These APIs will call stack layer's interop APIs of
+ * interop.cc to do matching or entry adding/removing.
*/
public class InteropUtil {
private static final String TAG = "InteropUtil";
/**
- * Add interop feature from device/include/interop.h to below InteropFeature if
- * this feature needs to be matched at java layer. Feature's name will be passed to
- * stack layer to do matching, so make sure that the added feature's name is exactly
- * same as that in device/include/interop.h.
+ * Add interop feature from device/include/interop.h to below InteropFeature if this feature
+ * needs to be matched at java layer. Feature's name will be passed to stack layer to do
+ * matching, so make sure that the added feature's name is exactly same as that in
+ * device/include/interop.h.
*/
public enum InteropFeature {
INTEROP_NOT_UPDATE_AVRCP_PAUSED_TO_REMOTE,
@@ -45,8 +44,8 @@ public class InteropUtil {
}
/**
- * Check if a given address matches a known interoperability workaround
- * identified by the interop feature.
+ * Check if a given address matches a known interoperability workaround identified by the
+ * interop feature.
*
* @param feature a given interop feature defined in {@link InteropFeature}.
* @param address a given address to be matched.
@@ -55,8 +54,11 @@ public class InteropUtil {
public static boolean interopMatchAddr(InteropFeature feature, String address) {
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService == null) {
- Log.d(TAG, "interopMatchAddr: feature=" + feature.name()
- + ", adapterService is null or vendor intf is not enabled");
+ Log.d(
+ TAG,
+ "interopMatchAddr: feature="
+ + feature.name()
+ + ", adapterService is null or vendor intf is not enabled");
return false;
}
@@ -71,8 +73,8 @@ public class InteropUtil {
}
/**
- * Check if a given name matches a known interoperability workaround
- * identified by the interop feature.
+ * Check if a given name matches a known interoperability workaround identified by the interop
+ * feature.
*
* @param feature a given interop feature defined in {@link InteropFeature}.
* @param name a given name to be matched.
@@ -81,8 +83,11 @@ public class InteropUtil {
public static boolean interopMatchName(InteropFeature feature, String name) {
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService == null) {
- Log.d(TAG, "interopMatchName: feature=" + feature.name()
- + ", adapterService is null or vendor intf is not enabled");
+ Log.d(
+ TAG,
+ "interopMatchName: feature="
+ + feature.name()
+ + ", adapterService is null or vendor intf is not enabled");
return false;
}
@@ -98,8 +103,8 @@ public class InteropUtil {
/**
* Check if a given address or remote device name matches a known interoperability workaround
- * identified by the interop feature. remote device name will be fetched internally based on
- * the given address at stack layer.
+ * identified by the interop feature. remote device name will be fetched internally based on the
+ * given address at stack layer.
*
* @param feature a given interop feature defined in {@link InteropFeature}.
* @param address a given address to be matched.
@@ -108,8 +113,11 @@ public class InteropUtil {
public static boolean interopMatchAddrOrName(InteropFeature feature, String address) {
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService == null) {
- Log.d(TAG, "interopMatchAddrOrName: feature=" + feature.name()
- + ", adapterService is null or vendor intf is not enabled");
+ Log.d(
+ TAG,
+ "interopMatchAddrOrName: feature="
+ + feature.name()
+ + ", adapterService is null or vendor intf is not enabled");
return false;
}
@@ -124,25 +132,33 @@ public class InteropUtil {
}
/**
- * Add a dynamic address interop database entry identified by the interop feature
- * for a device matching the first length bytes of addr.
+ * Add a dynamic address interop database entry identified by the interop feature for a device
+ * matching the first length bytes of addr.
*
* @param feature a given interop feature defined in {@link InteropFeature}.
* @param address a given address to be added.
- * @param length the number of bytes of address to be stored,
- * length must be in [1,6], and usually it is 3.
+ * @param length the number of bytes of address to be stored, length must be in [1,6], and
+ * usually it is 3.
*/
- public static void interopDatabaseAddAddr(InteropFeature feature,
- String address, int length) {
+ public static void interopDatabaseAddAddr(InteropFeature feature, String address, int length) {
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService == null) {
- Log.d(TAG, "interopDatabaseAddAddr: feature=" + feature.name()
- + ", adapterService is null or vendor intf is not enabled");
+ Log.d(
+ TAG,
+ "interopDatabaseAddAddr: feature="
+ + feature.name()
+ + ", adapterService is null or vendor intf is not enabled");
return;
}
- Log.d(TAG, "interopDatabaseAddAddr: feature=" + feature.name()
- + ", address=" + address + ", length=" + length);
+ Log.d(
+ TAG,
+ "interopDatabaseAddAddr: feature="
+ + feature.name()
+ + ", address="
+ + address
+ + ", length="
+ + length);
if (address == null || (length <= 0 || length > 6)) {
return;
}
@@ -151,8 +167,8 @@ public class InteropUtil {
}
/**
- * Remove a dynamic address interop database entry identified by the interop feature
- * for a device matching the addr.
+ * Remove a dynamic address interop database entry identified by the interop feature for a
+ * device matching the addr.
*
* @param feature a given interop feature defined in {@link InteropFeature}.
* @param address a given address to be removed.
@@ -160,8 +176,11 @@ public class InteropUtil {
public static void interopDatabaseRemoveAddr(InteropFeature feature, String address) {
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService == null) {
- Log.d(TAG, "interopDatabaseRemoveAddr: feature=" + feature.name()
- + ", adapterService is null or vendor intf is not enabled");
+ Log.d(
+ TAG,
+ "interopDatabaseRemoveAddr: feature="
+ + feature.name()
+ + ", adapterService is null or vendor intf is not enabled");
return;
}
@@ -182,8 +201,11 @@ public class InteropUtil {
public static void interopDatabaseAddName(InteropFeature feature, String name) {
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService == null) {
- Log.d(TAG, "interopDatabaseAddName: feature=" + feature.name()
- + ", adapterService is null or vendor intf is not enabled");
+ Log.d(
+ TAG,
+ "interopDatabaseAddName: feature="
+ + feature.name()
+ + ", adapterService is null or vendor intf is not enabled");
return;
}
@@ -204,8 +226,11 @@ public class InteropUtil {
public static void interopDatabaseRemoveName(InteropFeature feature, String name) {
AdapterService adapterService = AdapterService.getAdapterService();
if (adapterService == null) {
- Log.d(TAG, "interopDatabaseRemoveName: feature=" + feature.name()
- + ", adapterService is null or vendor intf is not enabled");
+ Log.d(
+ TAG,
+ "interopDatabaseRemoveName: feature="
+ + feature.name()
+ + ", adapterService is null or vendor intf is not enabled");
return;
}
diff --git a/android/app/src/com/android/bluetooth/btservice/JniCallbacks.java b/android/app/src/com/android/bluetooth/btservice/JniCallbacks.java
index f8904bd6d433ebc255b1428de3dc5a9beee07a20..2822345ed4c9f274ff18511176201ef80b0110f0 100644
--- a/android/app/src/com/android/bluetooth/btservice/JniCallbacks.java
+++ b/android/app/src/com/android/bluetooth/btservice/JniCallbacks.java
@@ -76,10 +76,15 @@ class JniCallbacks {
mRemoteDevices.leAddressAssociateCallback(mainAddress, secondaryAddress);
}
- void aclStateChangeCallback(int status, byte[] address, int newState,
- int transportLinkType, int hciReason, int handle) {
- mRemoteDevices.aclStateChangeCallback(status, address, newState,
- transportLinkType, hciReason, handle);
+ void aclStateChangeCallback(
+ int status,
+ byte[] address,
+ int newState,
+ int transportLinkType,
+ int hciReason,
+ int handle) {
+ mRemoteDevices.aclStateChangeCallback(
+ status, address, newState, transportLinkType, hciReason, handle);
}
void keyMissingCallback(byte[] address) {
@@ -111,8 +116,13 @@ class JniCallbacks {
int packets_not_receive_count,
int negative_acknowledgement_count) {
mAdapterService.linkQualityReportCallback(
- timestamp, report_id, rssi, snr, retransmission_count,
- packets_not_receive_count, negative_acknowledgement_count);
+ timestamp,
+ report_id,
+ rssi,
+ snr,
+ retransmission_count,
+ packets_not_receive_count,
+ negative_acknowledgement_count);
}
void switchBufferSizeCallback(boolean is_low_latency_buffer_size) {
diff --git a/android/app/src/com/android/bluetooth/btservice/PhonePolicy.java b/android/app/src/com/android/bluetooth/btservice/PhonePolicy.java
index 737abd3a56a2a8f0c58564770b1106fe2dee1740..7b490e2bbb28d06f80823e2eb85767500190352b 100644
--- a/android/app/src/com/android/bluetooth/btservice/PhonePolicy.java
+++ b/android/app/src/com/android/bluetooth/btservice/PhonePolicy.java
@@ -72,8 +72,8 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
// Message types for the handler (internal messages generated by intents or timeouts)
private static final int MESSAGE_CONNECT_OTHER_PROFILES = 3;
- @VisibleForTesting static final String AUTO_CONNECT_PROFILES_PROPERTY =
- "bluetooth.auto_connect_profiles.enabled";
+ @VisibleForTesting
+ static final String AUTO_CONNECT_PROFILES_PROPERTY = "bluetooth.auto_connect_profiles.enabled";
private static final String LE_AUDIO_CONNECTION_BY_DEFAULT_PROPERTY =
"ro.bluetooth.leaudio.le_audio_connection_by_default";
@@ -144,18 +144,19 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
- case MESSAGE_CONNECT_OTHER_PROFILES: {
- // Called when we try connect some profiles in processConnectOtherProfiles but
- // we send a delayed message to try connecting the remaining profiles
- BluetoothDevice device = (BluetoothDevice) msg.obj;
- processConnectOtherProfiles(device);
- mConnectOtherProfilesDeviceSet.remove(device);
- break;
- }
+ case MESSAGE_CONNECT_OTHER_PROFILES:
+ {
+ // Called when we try connect some profiles in processConnectOtherProfiles
+ // but
+ // we send a delayed message to try connecting the remaining profiles
+ BluetoothDevice device = (BluetoothDevice) msg.obj;
+ processConnectOtherProfiles(device);
+ mConnectOtherProfilesDeviceSet.remove(device);
+ break;
+ }
}
}
}
-
;
// Policy API functions for lifecycle management (protected)
@@ -174,8 +175,10 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
PhonePolicy(AdapterService service, ServiceFactory factory) {
mAdapterService = service;
- mDatabaseManager = Objects.requireNonNull(mAdapterService.getDatabase(),
- "DatabaseManager cannot be null when PhonePolicy starts");
+ mDatabaseManager =
+ Objects.requireNonNull(
+ mAdapterService.getDatabase(),
+ "DatabaseManager cannot be null when PhonePolicy starts");
mFactory = factory;
mHandler = new PhonePolicyHandler(service.getMainLooper());
mAutoConnectProfilesSupported =
@@ -293,9 +296,8 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
HearingAidService hearingAidService = mFactory.getHearingAidService();
LeAudioService leAudioService = mFactory.getLeAudioService();
CsipSetCoordinatorService csipSetCoordinatorService =
- mFactory.getCsipSetCoordinatorService();
- VolumeControlService volumeControlService =
- mFactory.getVolumeControlService();
+ mFactory.getCsipSetCoordinatorService();
+ VolumeControlService volumeControlService = mFactory.getVolumeControlService();
HapClientService hapClientService = mFactory.getHapClientService();
BassClientService bcService = mFactory.getBassClientService();
BatteryService batteryService = mFactory.getBatteryService();
@@ -341,8 +343,12 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
if (mAutoConnectProfilesSupported) {
hidService.setConnectionPolicy(device, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
} else {
- mAdapterService.getDatabase().setProfileConnectionPolicy(device,
- BluetoothProfile.HID_HOST, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
+ mAdapterService
+ .getDatabase()
+ .setProfileConnectionPolicy(
+ device,
+ BluetoothProfile.HID_HOST,
+ BluetoothProfile.CONNECTION_POLICY_ALLOWED);
}
MetricsLogger.getInstance()
.count(
@@ -359,17 +365,24 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
&& (headsetService.getConnectionPolicy(device)
== BluetoothProfile.CONNECTION_POLICY_UNKNOWN))) {
if (!isDualModeAudioEnabled() && isLeAudioProfileAllowed) {
- debugLog("clear hfp profile priority for the le audio dual mode device "
- + device);
- mAdapterService.getDatabase().setProfileConnectionPolicy(device,
- BluetoothProfile.HEADSET, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);
+ debugLog("clear hfp profile priority for the le audio dual mode device " + device);
+ mAdapterService
+ .getDatabase()
+ .setProfileConnectionPolicy(
+ device,
+ BluetoothProfile.HEADSET,
+ BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);
} else {
if (mAutoConnectProfilesSupported) {
headsetService.setConnectionPolicy(
device, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
} else {
- mAdapterService.getDatabase().setProfileConnectionPolicy(device,
- BluetoothProfile.HEADSET, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
+ mAdapterService
+ .getDatabase()
+ .setProfileConnectionPolicy(
+ device,
+ BluetoothProfile.HEADSET,
+ BluetoothProfile.CONNECTION_POLICY_ALLOWED);
}
}
}
@@ -381,12 +394,16 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
== BluetoothProfile.CONNECTION_POLICY_UNKNOWN)) {
if (!isDualModeAudioEnabled() && isLeAudioProfileAllowed) {
debugLog("clear a2dp profile priority for the le audio dual mode device " + device);
- mAdapterService.getDatabase().setProfileConnectionPolicy(device,
- BluetoothProfile.A2DP, BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);
+ mAdapterService
+ .getDatabase()
+ .setProfileConnectionPolicy(
+ device,
+ BluetoothProfile.A2DP,
+ BluetoothProfile.CONNECTION_POLICY_FORBIDDEN);
} else {
if (mAutoConnectProfilesSupported) {
- a2dpService.setConnectionPolicy(device,
- BluetoothProfile.CONNECTION_POLICY_ALLOWED);
+ a2dpService.setConnectionPolicy(
+ device, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
} else {
mAdapterService
.getDatabase()
@@ -532,9 +549,12 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
hapClientService.setConnectionPolicy(
device, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
} else {
- mAdapterService.getDatabase().setProfileConnectionPolicy(device,
- BluetoothProfile.HAP_CLIENT,
- BluetoothProfile.CONNECTION_POLICY_ALLOWED);
+ mAdapterService
+ .getDatabase()
+ .setProfileConnectionPolicy(
+ device,
+ BluetoothProfile.HAP_CLIENT,
+ BluetoothProfile.CONNECTION_POLICY_ALLOWED);
}
} else {
mAdapterService
@@ -582,8 +602,8 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
== BluetoothProfile.CONNECTION_POLICY_UNKNOWN)) {
debugLog("setting battery profile priority for device " + device);
if (mAutoConnectProfilesSupported) {
- batteryService.setConnectionPolicy(device,
- BluetoothProfile.CONNECTION_POLICY_ALLOWED);
+ batteryService.setConnectionPolicy(
+ device, BluetoothProfile.CONNECTION_POLICY_ALLOWED);
} else {
mAdapterService
.getDatabase()
@@ -655,8 +675,8 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
}
@RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)
- private void processProfileStateChanged(BluetoothDevice device, int profileId, int nextState,
- int prevState) {
+ private void processProfileStateChanged(
+ BluetoothDevice device, int profileId, int nextState, int prevState) {
debugLog(
"processProfileStateChanged, device="
+ device
@@ -705,9 +725,13 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
* @param device is the device we just made the active device
*/
private void processActiveDeviceChanged(BluetoothDevice device, int profileId) {
- debugLog("processActiveDeviceChanged, device=" + device + ", profile="
- + BluetoothProfile.getProfileName(profileId) + " isDualModeAudioEnabled="
- + isDualModeAudioEnabled());
+ debugLog(
+ "processActiveDeviceChanged, device="
+ + device
+ + ", profile="
+ + BluetoothProfile.getProfileName(profileId)
+ + " isDualModeAudioEnabled="
+ + isDualModeAudioEnabled());
if (device == null) {
return;
@@ -771,7 +795,7 @@ public class PhonePolicy implements AdapterService.BluetoothStateCallback {
PanService panService = mFactory.getPanService();
LeAudioService leAudioService = mFactory.getLeAudioService();
CsipSetCoordinatorService csipSetCooridnatorService =
- mFactory.getCsipSetCoordinatorService();
+ mFactory.getCsipSetCoordinatorService();
if (hsService != null) {
List It's expected that profiles can have a set of components that they may use to provide
* features or interact with other services/the user. Profiles are expected to enable those
* components when they start, and disable them when they stop.
*
@@ -111,8 +109,7 @@ public abstract class ProfileService extends ContextWrapper {
*/
@RequiresPermission(android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE)
protected void setComponentAvailable(String className, boolean enable) {
- Log.d(mName, "setComponentAvailable(className=" + className + ", enable=" + enable
- + ")");
+ Log.d(mName, "setComponentAvailable(className=" + className + ", enable=" + enable + ")");
if (className == null) {
return;
}
@@ -123,7 +120,7 @@ public abstract class ProfileService extends ContextWrapper {
/**
* Set the availability of an owned/managed component (Service, Activity, Provider, etc.)
*
- * It's expected that profiles can have a set of components that they may use to provide
+ * It's expected that profiles can have a set of components that they may use to provide
* features or interact with other services/the user. Profiles are expected to enable those
* components when they start, and disable them when they stop.
*
@@ -132,16 +129,17 @@ public abstract class ProfileService extends ContextWrapper {
*/
@RequiresPermission(android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE)
protected void setComponentAvailable(ComponentName component, boolean enable) {
- Log.d(mName, "setComponentAvailable(component=" + component + ", enable=" + enable
- + ")");
+ Log.d(mName, "setComponentAvailable(component=" + component + ", enable=" + enable + ")");
if (component == null) {
return;
}
- getPackageManager().setComponentEnabledSetting(
- component,
- enable ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
- : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
- PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS);
+ getPackageManager()
+ .setComponentEnabledSetting(
+ component,
+ enable
+ ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+ : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+ PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS);
}
/**
diff --git a/android/app/src/com/android/bluetooth/btservice/RemoteDevices.java b/android/app/src/com/android/bluetooth/btservice/RemoteDevices.java
index 661b7404d41725acf4fedbb7038bf56f31eccaef..8f7e769538ee3b0dcce18abbc4e1f7488950d6d8 100644
--- a/android/app/src/com/android/bluetooth/btservice/RemoteDevices.java
+++ b/android/app/src/com/android/bluetooth/btservice/RemoteDevices.java
@@ -82,17 +82,13 @@ public class RemoteDevices {
private final ArrayDeque 1) If an active device (for A2DP or HFP) enters silence mode, the active device for that
+ * profile will be set to null. 2) If a device exits silence mode while the A2DP or HFP active
+ * device is null, the device will be set as the active device for that profile. 3) If a device is
+ * disconnected, it exits silence mode. 4) If a device is set as the active device for A2DP or HFP,
+ * while silence mode is enabled, then the device will exit silence mode. 5) If a device is in
+ * silence mode, AVRCP position change event and HFP AG indicators will be disabled. 6) If a device
+ * is not connected with A2DP or HFP, it cannot enter silence mode.
*/
public class SilenceDeviceManager {
private static final String TAG = SilenceDeviceManager.class.getSimpleName();
@@ -126,12 +123,13 @@ public class SilenceDeviceManager {
public void handleMessage(Message msg) {
Log.d(TAG, "handleMessage: " + msg.what);
switch (msg.what) {
- case MSG_SILENCE_DEVICE_STATE_CHANGED: {
- BluetoothDevice device = (BluetoothDevice) msg.obj;
- boolean state = (msg.arg1 == ENABLE_SILENCE);
- handleSilenceDeviceStateChanged(device, state);
- }
- break;
+ case MSG_SILENCE_DEVICE_STATE_CHANGED:
+ {
+ BluetoothDevice device = (BluetoothDevice) msg.obj;
+ boolean state = (msg.arg1 == ENABLE_SILENCE);
+ handleSilenceDeviceStateChanged(device, state);
+ }
+ break;
case MSG_A2DP_CONNECTION_STATE_CHANGED:
BluetoothDevice device = (BluetoothDevice) msg.obj;
@@ -221,8 +219,12 @@ public class SilenceDeviceManager {
return false;
}
Log.d(TAG, "setSilenceMode: " + device + ", " + silence);
- Message message = mHandler.obtainMessage(MSG_SILENCE_DEVICE_STATE_CHANGED,
- silence ? ENABLE_SILENCE : DISABLE_SILENCE, 0, device);
+ Message message =
+ mHandler.obtainMessage(
+ MSG_SILENCE_DEVICE_STATE_CHANGED,
+ silence ? ENABLE_SILENCE : DISABLE_SILENCE,
+ 0,
+ device);
mHandler.sendMessage(message);
return true;
}
@@ -252,8 +254,7 @@ public class SilenceDeviceManager {
if (headsetService != null) {
headsetService.setSilenceMode(device, state);
}
- Log.i(TAG, "Silence mode change " + device + ": " + oldState + " -> "
- + state);
+ Log.i(TAG, "Silence mode change " + device + ": " + oldState + " -> " + state);
broadcastSilenceStateChange(device, state);
}
@@ -277,8 +278,12 @@ public class SilenceDeviceManager {
}
void addConnectedDevice(BluetoothDevice device, int profile) {
- Log.d(TAG, "addConnectedDevice: " + device + ", profile:"
- + BluetoothProfile.getProfileName(profile));
+ Log.d(
+ TAG,
+ "addConnectedDevice: "
+ + device
+ + ", profile:"
+ + BluetoothProfile.getProfileName(profile));
switch (profile) {
case BluetoothProfile.A2DP:
if (!mA2dpConnectedDevices.contains(device)) {
@@ -294,8 +299,12 @@ public class SilenceDeviceManager {
}
void removeConnectedDevice(BluetoothDevice device, int profile) {
- Log.d(TAG, "removeConnectedDevice: " + device + ", profile:"
- + BluetoothProfile.getProfileName(profile));
+ Log.d(
+ TAG,
+ "removeConnectedDevice: "
+ + device
+ + ", profile:"
+ + BluetoothProfile.getProfileName(profile));
switch (profile) {
case BluetoothProfile.A2DP:
if (mA2dpConnectedDevices.contains(device)) {
@@ -318,7 +327,7 @@ public class SilenceDeviceManager {
writer.println("\nSilenceDeviceManager:");
writer.println(" Address | Is silenced?");
for (BluetoothDevice device : mSilenceDevices.keySet()) {
- writer.println(" " + device+ " | " + getSilenceMode(device));
+ writer.println(" " + device + " | " + getSilenceMode(device));
}
}
}
diff --git a/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreNativeInterface.java b/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreNativeInterface.java
index d87fca88298c43447a9ab63ab2f61a454ca214ce..073aa34302513564e0bb5cca546b3283cefd0fc6 100644
--- a/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreNativeInterface.java
+++ b/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreNativeInterface.java
@@ -65,9 +65,7 @@ public class BluetoothKeystoreNativeInterface {
initNative();
}
- /**
- * Cleanup the native interface.
- */
+ /** Cleanup the native interface. */
public void cleanup() {
cleanupNative();
mBluetoothKeystoreService = null;
@@ -112,5 +110,6 @@ public class BluetoothKeystoreNativeInterface {
// Native methods that call into the JNI interface
private native void initNative();
+
private native void cleanupNative();
}
diff --git a/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreService.java b/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreService.java
index d9b30db70b6d1a48a0a780957169216c76d66144..0c61375c9112fe3865973a996c244e842196b195 100644
--- a/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreService.java
+++ b/android/app/src/com/android/bluetooth/btservice/bluetoothKeystore/BluetoothKeystoreService.java
@@ -57,9 +57,7 @@ import javax.crypto.NoSuchPaddingException;
import javax.crypto.SecretKey;
import javax.crypto.spec.GCMParameterSpec;
-/**
- * Service used for handling encryption and decryption of the bt_config.conf
- */
+/** Service used for handling encryption and decryption of the bt_config.conf */
public class BluetoothKeystoreService {
private static final String TAG = BluetoothKeystoreService.class.getSimpleName();
@@ -103,8 +101,15 @@ public class BluetoothKeystoreService {
private Map If the value of decryptedString matches {@link #CONFIG_FILE_HASH} then
- * read the hash file and decrypt the keys and place them into {@link mPendingEncryptKey}
- * otherwise cleanup all data and remove the keys.
+ * If the value of decryptedString matches {@link #CONFIG_FILE_HASH} then read the hash file
+ * and decrypt the keys and place them into {@link mPendingEncryptKey} otherwise cleanup all
+ * data and remove the keys.
*
* @param prefixString key to use
* @param decryptedString string to decrypt
@@ -329,9 +318,7 @@ public class BluetoothKeystoreService {
}
}
- /**
- * Clean up memory and all files.
- */
+ /** Clean up memory and all files. */
@VisibleForTesting
public void cleanupAll() throws IOException {
cleanupFile();
@@ -344,9 +331,7 @@ public class BluetoothKeystoreService {
Files.deleteIfExists(Paths.get(CONFIG_BACKUP_ENCRYPTION_PATH));
}
- /**
- * Clean up memory.
- */
+ /** Clean up memory. */
@VisibleForTesting
public void cleanupMemory() {
stopThread();
@@ -355,9 +340,7 @@ public class BluetoothKeystoreService {
startThread();
}
- /**
- * Stop encrypt/decrypt thread.
- */
+ /** Stop encrypt/decrypt thread. */
@VisibleForTesting
public void stopThread() {
try {
@@ -381,9 +364,7 @@ public class BluetoothKeystoreService {
mDecryptDataThread.start();
}
- /**
- * Get key value from the mNameDecryptKey.
- */
+ /** Get key value from the mNameDecryptKey. */
public String getKey(String prefixString) {
infoLog("getKey: prefix: " + prefixString);
if (!mNameDecryptKey.containsKey(prefixString)) {
@@ -393,9 +374,7 @@ public class BluetoothKeystoreService {
return mNameDecryptKey.get(prefixString);
}
- /**
- * Save encryption key into the encryption file.
- */
+ /** Save encryption key into the encryption file. */
@VisibleForTesting
public void saveEncryptedKey() {
stopThread();
@@ -450,9 +429,7 @@ public class BluetoothKeystoreService {
return (mCompareResult & item) == item;
}
- /**
- * Compare config file checksum.
- */
+ /** Compare config file checksum. */
@VisibleForTesting
public boolean compareFileHash(String hashFilePathString)
throws InterruptedException, IOException, NoSuchAlgorithmException {
@@ -475,8 +452,9 @@ public class BluetoothKeystoreService {
readHashFile(hashFilePathString, prefixString);
if (!mNameEncryptKey.containsKey(prefixString)) {
- errorLog("compareFileHash: NameEncryptKey doesn't contain the key, prefix:"
- + prefixString);
+ errorLog(
+ "compareFileHash: NameEncryptKey doesn't contain the key, prefix:"
+ + prefixString);
return false;
}
String encryptedData = mNameEncryptKey.get(prefixString);
@@ -492,7 +470,7 @@ public class BluetoothKeystoreService {
private void readHashFile(String filePathString, String prefixString)
throws InterruptedException, NoSuchAlgorithmException {
byte[] dataBuffer = new byte[BUFFER_SIZE];
- int bytesRead = 0;
+ int bytesRead = 0;
boolean successful = false;
int counter = 0;
while (!successful && counter < TRY_MAX) {
@@ -506,8 +484,9 @@ public class BluetoothKeystoreService {
byte[] messageDigestBytes = messageDigest.digest();
StringBuilder hashString = new StringBuilder();
for (int index = 0; index < messageDigestBytes.length; index++) {
- hashString.append(Integer.toString((
- messageDigestBytes[index] & 0xff) + 0x100, 16).substring(1));
+ hashString.append(
+ Integer.toString((messageDigestBytes[index] & 0xff) + 0x100, 16)
+ .substring(1));
}
mNameDecryptKey.put(prefixString, hashString.toString());
@@ -523,12 +502,9 @@ public class BluetoothKeystoreService {
}
}
- /**
- * Parses a file to search for the key and put it into the pending compute queue
- */
+ /** Parses a file to search for the key and put it into the pending compute queue */
@VisibleForTesting
- public void parseConfigFile(String filePathString)
- throws IOException, InterruptedException {
+ public void parseConfigFile(String filePathString) throws IOException, InterruptedException {
String prefixString = null;
String dataString = null;
String name = null;
@@ -570,9 +546,7 @@ public class BluetoothKeystoreService {
}
}
- /**
- * Load encryption file and push into mNameEncryptKey and pendingDecryptKey.
- */
+ /** Load encryption file and push into mNameEncryptKey and pendingDecryptKey. */
@VisibleForTesting
public void loadEncryptionFile(String filePathString, boolean doDecrypt)
throws InterruptedException {
@@ -640,9 +614,12 @@ public class BluetoothKeystoreService {
if (secretKeyReference != null) {
cipher.init(Cipher.ENCRYPT_MODE, secretKeyReference);
- protobuf = BluetoothKeystoreProto.EncryptedData.newBuilder()
- .setEncryptedData(ByteString.copyFrom(cipher.doFinal(data.getBytes())))
- .setInitVector(ByteString.copyFrom(cipher.getIV())).build();
+ protobuf =
+ BluetoothKeystoreProto.EncryptedData.newBuilder()
+ .setEncryptedData(
+ ByteString.copyFrom(cipher.doFinal(data.getBytes())))
+ .setInitVector(ByteString.copyFrom(cipher.getIV()))
+ .build();
outputBytes = protobuf.toByteArray();
if (outputBytes == null) {
@@ -701,8 +678,8 @@ public class BluetoothKeystoreService {
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
reportBluetoothKeystoreException(e, "decrypt: Failed to parse EncryptedData protobuf.");
} catch (NoSuchAlgorithmException e) {
- reportKeystoreException(e,
- "decrypt could not find cipher algorithm " + CIPHER_ALGORITHM);
+ reportKeystoreException(
+ e, "decrypt could not find cipher algorithm " + CIPHER_ALGORITHM);
} catch (NoSuchPaddingException e) {
reportKeystoreException(e, "decrypt could not find padding algorithm");
} catch (IllegalBlockSizeException e) {
@@ -725,7 +702,9 @@ public class BluetoothKeystoreService {
try {
keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null);
- } catch (KeyStoreException | CertificateException | NoSuchAlgorithmException
+ } catch (KeyStoreException
+ | CertificateException
+ | NoSuchAlgorithmException
| IOException e) {
reportKeystoreException(e, "cannot open keystore");
}
@@ -740,8 +719,8 @@ public class BluetoothKeystoreService {
try {
KeyStore keyStore = getKeyStore();
if (keyStore.containsAlias(KEYALIAS)) { // The key exists in key store. Get the key.
- KeyStore.SecretKeyEntry secretKeyEntry = (KeyStore.SecretKeyEntry) keyStore
- .getEntry(KEYALIAS, null);
+ KeyStore.SecretKeyEntry secretKeyEntry =
+ (KeyStore.SecretKeyEntry) keyStore.getEntry(KEYALIAS, null);
if (secretKeyEntry != null) {
secretKey = secretKeyEntry.getSecretKey();
@@ -750,15 +729,18 @@ public class BluetoothKeystoreService {
}
} else {
// The key does not exist in key store. Create the key and store it.
- KeyGenerator keyGenerator = KeyGenerator
- .getInstance(KeyProperties.KEY_ALGORITHM_AES, KEY_STORE);
-
- KeyGenParameterSpec keyGenParameterSpec = new KeyGenParameterSpec.Builder(KEYALIAS,
- KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
- .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
- .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
- .setKeySize(KEY_LENGTH)
- .build();
+ KeyGenerator keyGenerator =
+ KeyGenerator.getInstance(KeyProperties.KEY_ALGORITHM_AES, KEY_STORE);
+
+ KeyGenParameterSpec keyGenParameterSpec =
+ new KeyGenParameterSpec.Builder(
+ KEYALIAS,
+ KeyProperties.PURPOSE_ENCRYPT
+ | KeyProperties.PURPOSE_DECRYPT)
+ .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
+ .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
+ .setKeySize(KEY_LENGTH)
+ .build();
keyGenerator.init(keyGenParameterSpec);
secretKey = keyGenerator.generateKey();
@@ -772,8 +754,8 @@ public class BluetoothKeystoreService {
} catch (NoSuchProviderException e) {
reportKeystoreException(e, "getOrCreateSecretKey cannot find crypto provider");
} catch (UnrecoverableEntryException e) {
- reportKeystoreException(e,
- "getOrCreateSecretKey had an unrecoverable entry exception.");
+ reportKeystoreException(
+ e, "getOrCreateSecretKey had an unrecoverable entry exception.");
} catch (ProviderException e) {
reportKeystoreException(e, "getOrCreateSecretKey had a provider exception.");
}
@@ -800,9 +782,7 @@ public class BluetoothKeystoreService {
Log.e(TAG, msg);
}
- /**
- * A thread that decrypt data if the queue has new decrypt task.
- */
+ /** A thread that decrypt data if the queue has new decrypt task. */
private class ComputeDataThread extends Thread {
private Map
+ * Wraps multiple BluetoothServerSocket objects to make it possible to accept connections on both a
+ * RFCOMM and L2CAP channel in parallel.
* Create an instance using {@link #create()}, which will block until the sockets have been created
* and channel numbers have been assigned.
- * Use {@link #getRfcommChannel()} and {@link #getL2capPsm()} to get the channel numbers to
- * put into the SDP record.
- * Call {@link #shutdown(boolean)} to terminate the accept threads created by the call to
- * {@link #create(IObexConnectionHandler)}.
+ * Use {@link #getRfcommChannel()} and {@link #getL2capPsm()} to get the channel numbers to put into
+ * the SDP record.
+ * Call {@link #shutdown(boolean)} to terminate the accept threads created by the call to {@link
+ * #create(IObexConnectionHandler)}.
* A reference to an object of this type cannot be reused, and the {@link BluetoothServerSocket}
* object references passed to this object will be closed by this object, hence cannot be reused
* either (This is needed, as the only way to interrupt an accept call is to close the socket...)
*
- * When a connection is accepted,
- * {@link IObexConnectionHandler#onConnect(BluetoothDevice, BluetoothSocket)} will be called.
- * If the an error occur while waiting for an incoming connection
- * {@link IObexConnectionHandler#onConnect(BluetoothDevice, BluetoothSocket)} will be called.
+ * When a connection is accepted, {@link IObexConnectionHandler#onConnect(BluetoothDevice,
+ * BluetoothSocket)} will be called.
+ * If the an error occur while waiting for an incoming connection {@link
+ * IObexConnectionHandler#onConnect(BluetoothDevice, BluetoothSocket)} will be called.
* In both cases the {@link ObexServerSockets} object have terminated, and a new must be created.
*/
public class ObexServerSockets {
@@ -56,8 +56,9 @@ public class ObexServerSockets {
private SocketAcceptThread mRfcommThread;
private SocketAcceptThread mL2capThread;
-
- private ObexServerSockets(IObexConnectionHandler conHandler, BluetoothServerSocket rfcommSocket,
+ private ObexServerSockets(
+ IObexConnectionHandler conHandler,
+ BluetoothServerSocket rfcommSocket,
BluetoothServerSocket l2capSocket) {
mConHandler = conHandler;
mRfcommSocket = rfcommSocket;
@@ -66,27 +67,35 @@ public class ObexServerSockets {
/**
* Creates an RFCOMM {@link BluetoothServerSocket} and a L2CAP {@link BluetoothServerSocket}
- * @param validator a reference to the {@link IObexConnectionHandler} object to call
- * to validate an incoming connection.
+ *
+ * @param validator a reference to the {@link IObexConnectionHandler} object to call to validate
+ * an incoming connection.
* @return a reference to a {@link ObexServerSockets} object instance.
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
public static ObexServerSockets create(IObexConnectionHandler validator) {
- return create(validator, BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP,
- BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP, true);
+ return create(
+ validator,
+ BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP,
+ BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP,
+ true);
}
/**
- * Creates an Insecure RFCOMM {@link BluetoothServerSocket} and a L2CAP
- * {@link BluetoothServerSocket}
- * @param validator a reference to the {@link IObexConnectionHandler} object to call
- * to validate an incoming connection.
+ * Creates an Insecure RFCOMM {@link BluetoothServerSocket} and a L2CAP {@link
+ * BluetoothServerSocket}
+ *
+ * @param validator a reference to the {@link IObexConnectionHandler} object to call to validate
+ * an incoming connection.
* @return a reference to a {@link ObexServerSockets} object instance.
*/
@RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
public static ObexServerSockets createInsecure(IObexConnectionHandler validator) {
- return create(validator, BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP,
- BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP, false);
+ return create(
+ validator,
+ BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP,
+ BluetoothAdapter.SOCKET_CHANNEL_AUTO_STATIC_NO_SDP,
+ false);
}
private static final int CREATE_RETRY_TIME = 10;
@@ -96,17 +105,17 @@ public class ObexServerSockets {
* with specific l2cap and RFCOMM channel numbers. It is the responsibility of the caller to
* ensure the numbers are free and can be used, e.g. by calling {@link #getL2capPsm()} and
* {@link #getRfcommChannel()} in {@link ObexServerSockets}.
- * @param validator a reference to the {@link IObexConnectionHandler} object to call
- * to validate an incoming connection.
+ *
+ * @param validator a reference to the {@link IObexConnectionHandler} object to call to validate
+ * an incoming connection.
* @param isSecure boolean flag to determine whther socket would be secured or inseucure.
* @return a reference to a {@link ObexServerSockets} object instance.
- *
- * TODO: Make public when it becomes possible to determine that the listen-call
- * failed due to channel-in-use.
+ *