)]}' { "log": [ { "commit": "2c0b232ee45d41c568731a0c433b96d9f02075b8", "tree": "3eba7ac3ea893dd30d490c6b9172b4f9cceb0c84", "parents": [ "1e868f87341adad554233fdb7448c3f41e7d3aa0", "57ed41b9554aefdb7f881e15375d75b4c9dd58e9" ], "author": { "name": "Conley Owens", "email": "cco3@android.com", "time": "Tue Mar 10 17:59:21 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 10 17:59:21 2015 +0000" }, "message": "am 57ed41b9: Merge \"Add NOTICE and MODULE_LICENSE files\"\n\n* commit \u002757ed41b9554aefdb7f881e15375d75b4c9dd58e9\u0027:\n Add NOTICE and MODULE_LICENSE files\n" }, { "commit": "57ed41b9554aefdb7f881e15375d75b4c9dd58e9", "tree": "f8bf86ca8c952d8845ea59964ccb5193eb88a4fc", "parents": [ "0cd5a85ee83c1db54fb244300c072ef73c622861", "4305ded3a99d97a0bd848eed58d0d280ef99c1da" ], "author": { "name": "Conley Owens", "email": "cco3@android.com", "time": "Tue Mar 10 17:54:12 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 10 17:54:13 2015 +0000" }, "message": "Merge \"Add NOTICE and MODULE_LICENSE files\"" }, { "commit": "1e868f87341adad554233fdb7448c3f41e7d3aa0", "tree": "da92d422c4fbfbfd7e8f577081691aac94ad2aa1", "parents": [ "3210f865592835629eae0e172dc55bbe1a822041", "0cd5a85ee83c1db54fb244300c072ef73c622861" ], "author": { "name": "Natalie Silvanovich", "email": "natashenka@google.com", "time": "Mon Mar 09 18:32:37 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 09 18:32:37 2015 +0000" }, "message": "am 0cd5a85e: (-s ours) Merge \"Change pairing_cb to assume temporary pairing by default\"\n\n* commit \u00270cd5a85ee83c1db54fb244300c072ef73c622861\u0027:\n Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "0cd5a85ee83c1db54fb244300c072ef73c622861", "tree": "f6d7c3267ef719f986eeb020f91befddbc9ce7cf", "parents": [ "3e12cd500a06053da91f5cb69837838ea7455067", "0360aa7c418152a3e5e335a065ac3629cbb09559" ], "author": { "name": "Natalie Silvanovich", "email": "natashenka@google.com", "time": "Mon Mar 09 18:23:15 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 09 18:23:15 2015 +0000" }, "message": "Merge \"Change pairing_cb to assume temporary pairing by default\"" }, { "commit": "4305ded3a99d97a0bd848eed58d0d280ef99c1da", "tree": "2c120da720ec72f2edec6eb72fd6f58e485faa1f", "parents": [ "3e12cd500a06053da91f5cb69837838ea7455067" ], "author": { "name": "Conley Owens", "email": "cco3@android.com", "time": "Fri Mar 06 16:54:25 2015 -0800" }, "committer": { "name": "Conley Owens", "email": "cco3@android.com", "time": "Fri Mar 06 16:54:25 2015 -0800" }, "message": "Add NOTICE and MODULE_LICENSE files\n\nChange-Id: I28284de20a047470e0afc9d4c0b088efe202eaaf\n" }, { "commit": "0360aa7c418152a3e5e335a065ac3629cbb09559", "tree": "f6d7c3267ef719f986eeb020f91befddbc9ce7cf", "parents": [ "3e12cd500a06053da91f5cb69837838ea7455067" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 26 13:49:36 2015 -0800" }, "committer": { "name": "Natalie Silvanovich", "email": "natashenka@google.com", "time": "Fri Mar 06 15:26:02 2015 -0800" }, "message": "Change pairing_cb to assume temporary pairing by default\n\nWhen pairing takes place, the pairing_cb.is_temp flag indicates whether\na pairing is temporary or permanent. Link keys are not stored for\ntemporary pairings. Since this is a \"positive\" flag, resetting the\npairing_cb control block (ex. memset to 0), it will assume persistent\npairing by default. Under certain circumstances, this can lead to a link\nkey being stored for temporarily secured connection.\n\nThis patch reverses the flag to be a \"negative\" flag. Renamed to\n\"persistent_bond\", the default 0 meaning is now used to indicate a\ntemporary bond. If the lag is not properly set now, it will default to a\ntemporary bond and will not save the link key erronously.\n\nThis fix is for CVE-2014-7914\n\nBug: 18345373\nChange-Id: I6e821595877ff30d64dc6e33602ac049cab3dd1e\n" }, { "commit": "3210f865592835629eae0e172dc55bbe1a822041", "tree": "da92d422c4fbfbfd7e8f577081691aac94ad2aa1", "parents": [ "098f6a78457476a4d3eedf57e9efaad5681c9c67", "3e12cd500a06053da91f5cb69837838ea7455067" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Mar 03 03:25:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 03 03:25:51 2015 +0000" }, "message": "am 3e12cd50: Merge \"reword channle to channel\"\n\n* commit \u00273e12cd500a06053da91f5cb69837838ea7455067\u0027:\n reword channle to channel\n" }, { "commit": "3e12cd500a06053da91f5cb69837838ea7455067", "tree": "79b5c0413daff9f298f901f8d0fb64db44bccb45", "parents": [ "d736b8d6b3f95b7af19b75a613486b023279c3ee", "4fe846855ff0f9bf9313fd7c35beeb7b3bda6115" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Tue Mar 03 03:22:01 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 03 03:22:03 2015 +0000" }, "message": "Merge \"reword channle to channel\"" }, { "commit": "4fe846855ff0f9bf9313fd7c35beeb7b3bda6115", "tree": "79b5c0413daff9f298f901f8d0fb64db44bccb45", "parents": [ "d736b8d6b3f95b7af19b75a613486b023279c3ee" ], "author": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Feb 25 16:34:08 2015 +0900" }, "committer": { "name": "Erik Kline", "email": "ek@google.com", "time": "Wed Feb 25 16:34:08 2015 +0900" }, "message": "reword channle to channel\n\nChange-Id: Ic45f99db717e1efcad4385cbbe1dd658e3a18bfb\n" }, { "commit": "098f6a78457476a4d3eedf57e9efaad5681c9c67", "tree": "714fc56c3a540d999a54c1064e2b1db4641c25b5", "parents": [ "15f13389b9792c3734ff494d5ea93ffe1ba0f28d" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Feb 19 18:02:52 2015 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Feb 19 18:02:52 2015 -0800" }, "message": "Fix the GCC build after fixing the clang build.\n\nGCC doesn\u0027t know this flag, and apparently GCC only actually\ncomplains about not knowing the flag if there is at least one warning\nemitted.\n\nChange-Id: Ic63b915d1f111fead46184ccd765d7a79fb531f9\n" }, { "commit": "15f13389b9792c3734ff494d5ea93ffe1ba0f28d", "tree": "4aabf269399318e62b60c894b47a4cbcfc1cf856", "parents": [ "1b8b1397dad3ba82ec2b7d10233922e13cf510cf" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Feb 19 17:05:03 2015 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Feb 19 17:05:03 2015 -0800" }, "message": "Ignore typdef redefintion warning to fix build.\n\nIt redefines to the same type, so not a problem.\n\nChange-Id: I6139816f02729573474957528a8ac782243b598b\n" }, { "commit": "1b8b1397dad3ba82ec2b7d10233922e13cf510cf", "tree": "ef76a1137549842ffe354c7c5aee2aaaef2ee96c", "parents": [ "2b5cc8eed709a691702734d6caeab07609c7acb8", "dfb3b2f2595dc16fe7f576a4b0c2f5e73db0327f" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Feb 10 00:42:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 00:42:58 2015 +0000" }, "message": "am dfb3b2f2: Add flag indicating encrypted connections to btif_dm_get_connection_state()\n\n* commit \u0027dfb3b2f2595dc16fe7f576a4b0c2f5e73db0327f\u0027:\n Add flag indicating encrypted connections to btif_dm_get_connection_state()\n" }, { "commit": "2b5cc8eed709a691702734d6caeab07609c7acb8", "tree": "66b457c9ac713ea849a7a56e23c80c5028ebb3a2", "parents": [ "e78115f70021ec1c58b8447b7bd766633157fac3", "d736b8d6b3f95b7af19b75a613486b023279c3ee" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Sat Feb 07 01:23:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Feb 07 01:23:27 2015 +0000" }, "message": "am d736b8d6: Merge \"Fix some more missing libc includes.\"\n\n* commit \u0027d736b8d6b3f95b7af19b75a613486b023279c3ee\u0027:\n Fix some more missing libc includes.\n" }, { "commit": "d736b8d6b3f95b7af19b75a613486b023279c3ee", "tree": "0f76871e1cdc76e56b4e697a8bff57f15a22e2b1", "parents": [ "ff50e75d69b5cee253c213f91999e8f6f6129c58", "468e4b983dd59ea58a7518032fa6029b00c56dc4" ], "author": { "name": "Christopher Ferris", "email": "cferris@google.com", "time": "Sat Feb 07 01:15:17 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Feb 07 01:15:18 2015 +0000" }, "message": "Merge \"Fix some more missing libc includes.\"" }, { "commit": "468e4b983dd59ea58a7518032fa6029b00c56dc4", "tree": "0f76871e1cdc76e56b4e697a8bff57f15a22e2b1", "parents": [ "ff50e75d69b5cee253c213f91999e8f6f6129c58" ], "author": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Fri Feb 06 00:28:47 2015 -0800" }, "committer": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Fri Feb 06 15:42:49 2015 -0800" }, "message": "Fix some more missing libc includes.\n\nstddef and signal are not pulled in transitively in glibc.\n\nChange-Id: I7a834bbdc31ae2aee4cb700a223c1636fda42afa\n" }, { "commit": "dfb3b2f2595dc16fe7f576a4b0c2f5e73db0327f", "tree": "2070fba49c3fbabe2766f7cf0797d21f63ff8a11", "parents": [ "d6f2fa93052c1d9bdf6035ace6b32345013516db" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 20:00:45 2015 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Fri Feb 06 11:44:05 2015 -0800" }, "message": "Add flag indicating encrypted connections to btif_dm_get_connection_state()\n\nAdd a check to btif_dm_get_connection_state() to see if the currently\nactive connection is encrypted.\n\nBug: 19186961\nChange-Id: I27bcc6e296d272ffd17c0bbe97631ffa4df57ccd\n" }, { "commit": "e78115f70021ec1c58b8447b7bd766633157fac3", "tree": "4f6746f4e073ffb12298d1631aa533f1e23698a8", "parents": [ "277005e40d677bcd7c982822bd2a4b2cc2e47609", "d6f2fa93052c1d9bdf6035ace6b32345013516db" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Fri Feb 06 00:06:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Feb 06 00:06:48 2015 +0000" }, "message": "am d6f2fa93: am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027d6f2fa93052c1d9bdf6035ace6b32345013516db\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "277005e40d677bcd7c982822bd2a4b2cc2e47609", "tree": "4f6746f4e073ffb12298d1631aa533f1e23698a8", "parents": [ "5be461319d94b47756326422aafb9203323d3d06", "e791f73202a2832b4d20dbc1ecd4b520adbb75d3" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Fri Feb 06 00:06:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Feb 06 00:06:47 2015 +0000" }, "message": "am e791f732: am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027e791f73202a2832b4d20dbc1ecd4b520adbb75d3\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "5be461319d94b47756326422aafb9203323d3d06", "tree": "4f6746f4e073ffb12298d1631aa533f1e23698a8", "parents": [ "b68105ca4a4fc37da18321472e2f823c6c0f4c40", "0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Fri Feb 06 00:06:47 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Feb 06 00:06:47 2015 +0000" }, "message": "am 0ad6cfde: am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u00270ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "d6f2fa93052c1d9bdf6035ace6b32345013516db", "tree": "4a03728029435e4fc12c1f3773d7608dca53fe01", "parents": [ "e791f73202a2832b4d20dbc1ecd4b520adbb75d3", "d6419cd6309bd20a2ab095c783bb6ad1f208bf4f" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 04:38:21 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 04:38:21 2015 +0000" }, "message": "am d6419cd6: am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027d6419cd6309bd20a2ab095c783bb6ad1f208bf4f\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "d6419cd6309bd20a2ab095c783bb6ad1f208bf4f", "tree": "1ac6b887346cb26a471dac7879759087d8819f31", "parents": [ "ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1", "0a8c803a48fe5afa71d1f8660539012e9b1f9642" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 04:32:54 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 04:32:54 2015 +0000" }, "message": "am 0a8c803a: am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u00270a8c803a48fe5afa71d1f8660539012e9b1f9642\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "0a8c803a48fe5afa71d1f8660539012e9b1f9642", "tree": "d990c280f57c08b374a798429f7b0a40acfa2489", "parents": [ "408dec1991255be919b1605e5cfe983b7f7154e9", "7f34538ac0e447a88d1f54ff819c28b3574f0aa4" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 04:25:27 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 04:25:27 2015 +0000" }, "message": "am 7f34538a: (-s ours) am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u00277f34538ac0e447a88d1f54ff819c28b3574f0aa4\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "7f34538ac0e447a88d1f54ff819c28b3574f0aa4", "tree": "486f24e9f502830fa78808929de03d0a07b446c1", "parents": [ "977acabd3744a3308057b1485c7ac8658698e96b", "65aec3a3f62c004d7073470f18330007b7ecf230" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 04:21:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 04:21:04 2015 +0000" }, "message": "am 65aec3a3: am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u002765aec3a3f62c004d7073470f18330007b7ecf230\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "e791f73202a2832b4d20dbc1ecd4b520adbb75d3", "tree": "4a03728029435e4fc12c1f3773d7608dca53fe01", "parents": [ "0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7", "ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 04:07:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 04:07:04 2015 +0000" }, "message": "am ae9d174b: am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "ae9d174bc0afe0a7ed0bb4fb82836338fbb6adb1", "tree": "1ac6b887346cb26a471dac7879759087d8819f31", "parents": [ "ce5ae4abddaab8865bb44c83d2d44e14b0d7536b", "408dec1991255be919b1605e5cfe983b7f7154e9" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 04:01:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 04:01:12 2015 +0000" }, "message": "am 408dec19: am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027408dec1991255be919b1605e5cfe983b7f7154e9\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "408dec1991255be919b1605e5cfe983b7f7154e9", "tree": "d990c280f57c08b374a798429f7b0a40acfa2489", "parents": [ "a708936da347b32f2a0811b5f33d9068c2b0de6f", "977acabd3744a3308057b1485c7ac8658698e96b" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 03:54:01 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 03:54:01 2015 +0000" }, "message": "am 977acabd: (-s ours) am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027977acabd3744a3308057b1485c7ac8658698e96b\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "65aec3a3f62c004d7073470f18330007b7ecf230", "tree": "6d11c60255df3d0ffa225ead50a53494d4a19288", "parents": [ "eebc8ab9c5e362d721f8f606f0a564ca9aff89d9", "6d429d9d0a1b537600c652dda2bc98d4c4ebd783" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 03:51:51 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 03:51:51 2015 +0000" }, "message": "am 6d429d9d: (-s ours) am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u00276d429d9d0a1b537600c652dda2bc98d4c4ebd783\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "977acabd3744a3308057b1485c7ac8658698e96b", "tree": "486f24e9f502830fa78808929de03d0a07b446c1", "parents": [ "595bcb4c72aaa2a9a54a23b127dd5fa9842876ca", "eebc8ab9c5e362d721f8f606f0a564ca9aff89d9" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 03:38:43 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 03:38:43 2015 +0000" }, "message": "am eebc8ab9: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027eebc8ab9c5e362d721f8f606f0a564ca9aff89d9\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "6d429d9d0a1b537600c652dda2bc98d4c4ebd783", "tree": "485581ea2253198f8796020eff53f7208a50d07d", "parents": [ "4a5fc6964313a606abd89268b8a53036b14b4ad7", "3efb9e2e11471a67329ad17d48ffa79118ea76c6" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 03:26:29 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 03:26:29 2015 +0000" }, "message": "am 3efb9e2e: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u00273efb9e2e11471a67329ad17d48ffa79118ea76c6\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "0ad6cfdee8857a7bc54d4c3eb98bf1cdc82dc9a7", "tree": "4a03728029435e4fc12c1f3773d7608dca53fe01", "parents": [ "17d854067162e27c2bf67fd61454ae7b76b79cea", "ce5ae4abddaab8865bb44c83d2d44e14b0d7536b" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 02:24:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 02:24:38 2015 +0000" }, "message": "am ce5ae4ab: am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027ce5ae4abddaab8865bb44c83d2d44e14b0d7536b\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "ce5ae4abddaab8865bb44c83d2d44e14b0d7536b", "tree": "1ac6b887346cb26a471dac7879759087d8819f31", "parents": [ "cf7f6a154aed48659260d391994dc59151be937b", "a708936da347b32f2a0811b5f33d9068c2b0de6f" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Feb 05 02:11:12 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 05 02:11:12 2015 +0000" }, "message": "am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027a708936da347b32f2a0811b5f33d9068c2b0de6f\u0027:\n DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "b68105ca4a4fc37da18321472e2f823c6c0f4c40", "tree": "4f6746f4e073ffb12298d1631aa533f1e23698a8", "parents": [ "40cc40843d88f79b151b7880f33e59a96f4f0182", "ff50e75d69b5cee253c213f91999e8f6f6129c58" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Feb 04 01:59:19 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 04 01:59:19 2015 +0000" }, "message": "am ff50e75d: Merge \"Fix pthread_t confusion.\"\n\n* commit \u0027ff50e75d69b5cee253c213f91999e8f6f6129c58\u0027:\n Fix pthread_t confusion.\n" }, { "commit": "ff50e75d69b5cee253c213f91999e8f6f6129c58", "tree": "588f17752d3b224ba45d5543265ad07fa025d63e", "parents": [ "481b0546db69274145ee129d19bb03cce4763c6f", "df3459935a4c12744a9a78812157890b60ccb77d" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Feb 04 01:49:41 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 04 01:49:42 2015 +0000" }, "message": "Merge \"Fix pthread_t confusion.\"" }, { "commit": "40cc40843d88f79b151b7880f33e59a96f4f0182", "tree": "c187b35ff6e3e03ab165f32a9e942edfa60e00fe", "parents": [ "df61acbd523271cc9b01b81dbbf5c45799bee6b5", "481b0546db69274145ee129d19bb03cce4763c6f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Feb 04 01:32:38 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 04 01:32:38 2015 +0000" }, "message": "am 481b0546: Merge \"Fix non-standard pthread mutex interactions.\"\n\n* commit \u0027481b0546db69274145ee129d19bb03cce4763c6f\u0027:\n Fix non-standard pthread mutex interactions.\n" }, { "commit": "481b0546db69274145ee129d19bb03cce4763c6f", "tree": "7e0b1f7e5fa3b529f6115895477e9d4a256d84c6", "parents": [ "1efdda75d0e7cf4223ba8958a56c2aeafa5129c5", "5381efce1f4fa20401df26b18b779e5b00cd5f1e" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Feb 04 01:21:37 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 04 01:21:37 2015 +0000" }, "message": "Merge \"Fix non-standard pthread mutex interactions.\"" }, { "commit": "df3459935a4c12744a9a78812157890b60ccb77d", "tree": "588f17752d3b224ba45d5543265ad07fa025d63e", "parents": [ "5381efce1f4fa20401df26b18b779e5b00cd5f1e" ], "author": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Mon Feb 02 20:41:11 2015 -0800" }, "committer": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Tue Feb 03 15:39:54 2015 -0800" }, "message": "Fix pthread_t confusion.\n\nDon\u0027t assign pthread_t to pid_t or UINT32.\nJust use pthread_t throughout.\n\nChange-Id: Icb8315c591b4131314c834beebd94f37651eaafb\n" }, { "commit": "a708936da347b32f2a0811b5f33d9068c2b0de6f", "tree": "d990c280f57c08b374a798429f7b0a40acfa2489", "parents": [ "f37767a17b2d80828f7ac4fa170859cb9e2f0bc6" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 26 13:49:36 2015 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Feb 03 15:39:13 2015 -0800" }, "message": "DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\nWhen pairing takes place, the pairing_cb.is_temp flag indicates whether\na pairing is temporary or permanent. Link keys are not stored for\ntemporary pairings. Since this is a \"positive\" flag, resetting the\npairing_cb control block (ex. memset to 0), it will assume persistent\npairing by default. Under certain circumstances, this can lead to a link\nkey being stored for temporarily secured connection.\n\nThis patch reverses the flag to be a \"negative\" flag. Renamed to\n\"persistent_bond\", the default 0 meaning is now used to indicate a\ntemporary bond. If the lag is not properly set now, it will default to a\ntemporary bond and will not save the link key erronously.\n\nBug: 18345373\nChange-Id: I06b1ba9331a70ebc29f4437bf836164658dec5ae\n" }, { "commit": "eebc8ab9c5e362d721f8f606f0a564ca9aff89d9", "tree": "6d11c60255df3d0ffa225ead50a53494d4a19288", "parents": [ "f4471c7e6ca7a0bd4846b2fe4fbe78d79ef37b81" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 26 13:49:36 2015 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Feb 03 15:39:05 2015 -0800" }, "message": "DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\nWhen pairing takes place, the pairing_cb.is_temp flag indicates whether\na pairing is temporary or permanent. Link keys are not stored for\ntemporary pairings. Since this is a \"positive\" flag, resetting the\npairing_cb control block (ex. memset to 0), it will assume persistent\npairing by default. Under certain circumstances, this can lead to a link\nkey being stored for temporarily secured connection.\n\nThis patch reverses the flag to be a \"negative\" flag. Renamed to\n\"persistent_bond\", the default 0 meaning is now used to indicate a\ntemporary bond. If the lag is not properly set now, it will default to a\ntemporary bond and will not save the link key erronously.\n\nBug: 18345373\nChange-Id: I8558abc9eace609b1ba02485b0ff775fb6f3c6af\n" }, { "commit": "3efb9e2e11471a67329ad17d48ffa79118ea76c6", "tree": "485581ea2253198f8796020eff53f7208a50d07d", "parents": [ "98657a365c7230b84a005c63ce5bcf036d69f6eb" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 26 13:49:36 2015 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Feb 03 15:37:49 2015 -0800" }, "message": "DO NOT MERGE Change pairing_cb to assume temporary pairing by default\n\nWhen pairing takes place, the pairing_cb.is_temp flag indicates whether\na pairing is temporary or permanent. Link keys are not stored for\ntemporary pairings. Since this is a \"positive\" flag, resetting the\npairing_cb control block (ex. memset to 0), it will assume persistent\npairing by default. Under certain circumstances, this can lead to a link\nkey being stored for temporarily secured connection.\n\nThis patch reverses the flag to be a \"negative\" flag. Renamed to\n\"persistent_bond\", the default 0 meaning is now used to indicate a\ntemporary bond. If the lag is not properly set now, it will default to a\ntemporary bond and will not save the link key erronously.\n\nBug: 18345373\nChange-Id: Ifb61e7a23db07888a625db9ab851548600183136\n" }, { "commit": "5381efce1f4fa20401df26b18b779e5b00cd5f1e", "tree": "7e0b1f7e5fa3b529f6115895477e9d4a256d84c6", "parents": [ "1efdda75d0e7cf4223ba8958a56c2aeafa5129c5" ], "author": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Mon Feb 02 20:39:09 2015 -0800" }, "committer": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Tue Feb 03 14:34:44 2015 -0800" }, "message": "Fix non-standard pthread mutex interactions.\n\npthread_mutex_t is intended to be opaque.\npthread_attr_t is intended to be opaque.\n\nChange-Id: I9b4f32b695783a4391851269977aa748dcc4f241\n" }, { "commit": "df61acbd523271cc9b01b81dbbf5c45799bee6b5", "tree": "91d39d6e8014870934b4caec6430336f41cec4d8", "parents": [ "c83aa65214a930e3b80e7a2c53f78d79e6e28640", "1efdda75d0e7cf4223ba8958a56c2aeafa5129c5" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Feb 03 16:24:16 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 03 16:24:16 2015 +0000" }, "message": "am 1efdda75: Merge \"btif_pan: Grab interface declarations from net/if.h only.\"\n\n* commit \u00271efdda75d0e7cf4223ba8958a56c2aeafa5129c5\u0027:\n btif_pan: Grab interface declarations from net/if.h only.\n" }, { "commit": "1efdda75d0e7cf4223ba8958a56c2aeafa5129c5", "tree": "2b29ca92ede81934912d4a2dc4d9b679b4f3f2ea", "parents": [ "a51404cfa0fc6ffb504e76874be32977014c647f", "767f6a7bd1db9c94602cfa59460bc122dc375a7f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Feb 03 16:12:30 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 03 16:12:30 2015 +0000" }, "message": "Merge \"btif_pan: Grab interface declarations from net/if.h only.\"" }, { "commit": "767f6a7bd1db9c94602cfa59460bc122dc375a7f", "tree": "2b29ca92ede81934912d4a2dc4d9b679b4f3f2ea", "parents": [ "a51404cfa0fc6ffb504e76874be32977014c647f" ], "author": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Mon Feb 02 20:50:42 2015 -0800" }, "committer": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Mon Feb 02 21:52:16 2015 -0800" }, "message": "btif_pan: Grab interface declarations from net/if.h only.\n\nThis is the libc interface file.\nUsing linux/if.h produces definition collisions on glibc.\n" }, { "commit": "c83aa65214a930e3b80e7a2c53f78d79e6e28640", "tree": "9a372756d51ca0bf62be7040a564529b410105cf", "parents": [ "d78846532fd66d05aa632b55264655b6481c8ac8", "a51404cfa0fc6ffb504e76874be32977014c647f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jan 30 04:55:17 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 30 04:55:17 2015 +0000" }, "message": "am a51404cf: Merge \"Add missing \u003cstring.h\u003e includes.\"\n\n* commit \u0027a51404cfa0fc6ffb504e76874be32977014c647f\u0027:\n Add missing \u003cstring.h\u003e includes.\n" }, { "commit": "a51404cfa0fc6ffb504e76874be32977014c647f", "tree": "cbe8c36891f64925e858ca65572aef8935b5fd73", "parents": [ "61331337c05cde410665e6a533a338b867fad45c", "da9711487f2b60f840aacd6c0a91fc083c3e741f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Jan 30 04:43:40 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 30 04:43:40 2015 +0000" }, "message": "Merge \"Add missing \u003cstring.h\u003e includes.\"" }, { "commit": "da9711487f2b60f840aacd6c0a91fc083c3e741f", "tree": "cbe8c36891f64925e858ca65572aef8935b5fd73", "parents": [ "61331337c05cde410665e6a533a338b867fad45c" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jan 29 20:40:25 2015 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jan 29 20:40:25 2015 -0800" }, "message": "Add missing \u003cstring.h\u003e includes.\n\nChange-Id: Iebebb21a2fd04603e0170d7c3a9f6d9552f39c88\n" }, { "commit": "d78846532fd66d05aa632b55264655b6481c8ac8", "tree": "bbbc0a09479fe293aadd9aba3bc839de1300b0b2", "parents": [ "527a9db58da0f7f43d835b24ceabb8e46010d248", "17d854067162e27c2bf67fd61454ae7b76b79cea" ], "author": { "name": "Prem Kumar", "email": "premk@google.com", "time": "Fri Jan 30 01:15:53 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 30 01:15:53 2015 +0000" }, "message": "am 17d85406: Merge \"bta_dm_search_cancel sends dm_search state machine complete events\" into lmp-mr1-dev\n\n* commit \u002717d854067162e27c2bf67fd61454ae7b76b79cea\u0027:\n bta_dm_search_cancel sends dm_search state machine complete events\n" }, { "commit": "17d854067162e27c2bf67fd61454ae7b76b79cea", "tree": "4a03728029435e4fc12c1f3773d7608dca53fe01", "parents": [ "893637614568b8ac7dc996c2e9bdbde481fbdc08", "c358eed353e80c388ce0424d8cc89d148390ffb1" ], "author": { "name": "Prem Kumar", "email": "premk@google.com", "time": "Fri Jan 30 01:00:49 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 30 01:00:50 2015 +0000" }, "message": "Merge \"bta_dm_search_cancel sends dm_search state machine complete events\" into lmp-mr1-dev" }, { "commit": "527a9db58da0f7f43d835b24ceabb8e46010d248", "tree": "4531562ca8239412df2051fd7f962599edeeb799", "parents": [ "7c5823798cccb6731a164edff7127ebfce074558", "61331337c05cde410665e6a533a338b867fad45c" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jan 29 01:53:18 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 29 01:53:18 2015 +0000" }, "message": "am 61331337: Merge \"Add missing includes.\"\n\n* commit \u002761331337c05cde410665e6a533a338b867fad45c\u0027:\n Add missing includes.\n" }, { "commit": "61331337c05cde410665e6a533a338b867fad45c", "tree": "639c9ec4197f038ad5e0d47b30e18565d1fe6148", "parents": [ "f976082eead2b7c19bf8c00d79e4723e6c4eb8e9", "b9164f414b4d8d414358d0146a8f911207af3122" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Thu Jan 29 01:40:04 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Jan 29 01:40:04 2015 +0000" }, "message": "Merge \"Add missing includes.\"" }, { "commit": "b9164f414b4d8d414358d0146a8f911207af3122", "tree": "639c9ec4197f038ad5e0d47b30e18565d1fe6148", "parents": [ "f976082eead2b7c19bf8c00d79e4723e6c4eb8e9" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jan 28 15:31:26 2015 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Jan 28 17:39:38 2015 -0800" }, "message": "Add missing includes.\n\nChange-Id: I041a5ea84b82155b0a7a8c4e7dc416c2c2b5e251\n" }, { "commit": "c358eed353e80c388ce0424d8cc89d148390ffb1", "tree": "31d9d6dcd3b42cd4d8c8bed9f1f3c425ace43e27", "parents": [ "335bc32bc7dae893358bde20557927e6ed6ad58c" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Wed Jan 28 17:30:13 2015 -0800" }, "committer": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Wed Jan 28 17:30:13 2015 -0800" }, "message": "bta_dm_search_cancel sends dm_search state machine complete events\n\nbta_dm_search_cancel moves dm_search state from active search to\nsearch_canceling state. The function is also responsible of moving\nthe state out of canceling state.\nBug: 19017339\n\nChange-Id: Idea0cb0e2987892a5fc0f66db8eed19f57c68b89\n" }, { "commit": "7c5823798cccb6731a164edff7127ebfce074558", "tree": "d8b29c80d485527fa3a44fca83f7a63b7bef9db5", "parents": [ "7fbc6954fac90dd7148ac73aa478fcc5e2d75be8", "893637614568b8ac7dc996c2e9bdbde481fbdc08" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Jan 28 18:25:28 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 28 18:25:28 2015 +0000" }, "message": "am 89363761: Change pairing_cb to assume temporary pairing by default\n\n* commit \u0027893637614568b8ac7dc996c2e9bdbde481fbdc08\u0027:\n Change pairing_cb to assume temporary pairing by default\n" }, { "commit": "893637614568b8ac7dc996c2e9bdbde481fbdc08", "tree": "430121b304a7982bcf6b43dbb55228d26d552114", "parents": [ "335bc32bc7dae893358bde20557927e6ed6ad58c" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 26 13:49:36 2015 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 26 17:11:37 2015 -0800" }, "message": "Change pairing_cb to assume temporary pairing by default\n\nWhen pairing takes place, the pairing_cb.is_temp flag indicates whether\na pairing is temporary or permanent. Link keys are not stored for\ntemporary pairings. Since this is a \"positive\" flag, resetting the\npairing_cb control block (ex. memset to 0), it will assume persistent\npairing by default. Under certain circumstances, this can lead to a link\nkey being stored for temporarily secured connection.\n\nThis patch reverses the flag to be a \"negative\" flag. Renamed to\n\"persistent_bond\", the default 0 meaning is now used to indicate a\ntemporary bond. If the lag is not properly set now, it will default to a\ntemporary bond and will not save the link key erronously.\n\nBug: 18345373\nChange-Id: I6e821595877ff30d64dc6e33602ac049cab3dd1e\n" }, { "commit": "7fbc6954fac90dd7148ac73aa478fcc5e2d75be8", "tree": "28b173ac59b4908ddff48ccb1d237e2cb40df37e", "parents": [ "fb17c122b09171492d99b208c1fdd6b76d2c431c", "f976082eead2b7c19bf8c00d79e4723e6c4eb8e9" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sun Jan 25 20:43:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Jan 25 20:43:04 2015 +0000" }, "message": "am f976082e: Merge \"Fix omitted libc includes.\"\n\n* commit \u0027f976082eead2b7c19bf8c00d79e4723e6c4eb8e9\u0027:\n Fix omitted libc includes.\n" }, { "commit": "f976082eead2b7c19bf8c00d79e4723e6c4eb8e9", "tree": "fe78f0bcfb5a61396c61006fddaafeb0cf87db31", "parents": [ "5ad6d72549feb5c0f49f654edd177d98907a1586", "c7503db23f91676b2df732becb9579d5ccdcc7a7" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Sun Jan 25 16:14:13 2015 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sun Jan 25 16:14:14 2015 +0000" }, "message": "Merge \"Fix omitted libc includes.\"" }, { "commit": "c7503db23f91676b2df732becb9579d5ccdcc7a7", "tree": "fe78f0bcfb5a61396c61006fddaafeb0cf87db31", "parents": [ "5ad6d72549feb5c0f49f654edd177d98907a1586" ], "author": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Sat Jan 24 02:01:26 2015 -0800" }, "committer": { "name": "Ian Coolidge", "email": "icoolidge@google.com", "time": "Sat Jan 24 02:02:29 2015 -0800" }, "message": "Fix omitted libc includes.\n\nChange-Id: I72c08984aeef60e4833e600b4351759b9687a014\n" }, { "commit": "fb17c122b09171492d99b208c1fdd6b76d2c431c", "tree": "429ccf7ddc139bbf46eca1b1863caeaa0d2065f3", "parents": [ "09dd8cbca5f6846fc0eb7a6dccb6d8426aeb418e", "335bc32bc7dae893358bde20557927e6ed6ad58c" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Jan 15 23:47:45 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 15 23:47:45 2015 +0000" }, "message": "am 335bc32b: Merge \"Relax max PCM frames per tick a bit\" into lmp-mr1-dev\n\n* commit \u0027335bc32bc7dae893358bde20557927e6ed6ad58c\u0027:\n Relax max PCM frames per tick a bit\n" }, { "commit": "335bc32bc7dae893358bde20557927e6ed6ad58c", "tree": "aba65bf01fb81dcaa8c3a7f0d9c1b2d53e92a8df", "parents": [ "5d5b041ca497013df4ecfeb415db3843d0a90eb3", "26e80aad86fae4e468a330d64ee02291f3a1980e" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Jan 15 23:37:10 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 15 23:37:11 2015 +0000" }, "message": "Merge \"Relax max PCM frames per tick a bit\" into lmp-mr1-dev" }, { "commit": "09dd8cbca5f6846fc0eb7a6dccb6d8426aeb418e", "tree": "9155d9e1e0b2c9ccb254819b6a32f4bf607a4130", "parents": [ "f68506e24bc8e9783b40202d01b4154f9f24940a", "5d5b041ca497013df4ecfeb415db3843d0a90eb3" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 12 23:31:30 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 12 23:31:30 2015 +0000" }, "message": "am 5d5b041c: LE: Add error status to failed write operation\n\n* commit \u00275d5b041ca497013df4ecfeb415db3843d0a90eb3\u0027:\n LE: Add error status to failed write operation\n" }, { "commit": "5d5b041ca497013df4ecfeb415db3843d0a90eb3", "tree": "26aba077f471ae2f98100a88f069a862ca3b58b5", "parents": [ "2cfcf51ea3447f2b5cf95dbe7515d230de1e7df7" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 12 13:34:01 2015 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Jan 12 13:34:41 2015 -0800" }, "message": "LE: Add error status to failed write operation\n\nBug: 18833375\nChange-Id: Ib91c8e92658a276d813954264897b02863f1148b\n" }, { "commit": "26e80aad86fae4e468a330d64ee02291f3a1980e", "tree": "7435c5fcc9b2c68263015b23a402a75b886bb4ae", "parents": [ "2cfcf51ea3447f2b5cf95dbe7515d230de1e7df7" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Jan 07 14:30:28 2015 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Jan 07 14:30:28 2015 -0800" }, "message": "Relax max PCM frames per tick a bit\n\nAlso made the value overwrite-able in bt_target.h.\n\nBug: 18913091\nChange-Id: I64bbe453b35fdce6f127b3c23c0552b14d4ac49b\n" }, { "commit": "f68506e24bc8e9783b40202d01b4154f9f24940a", "tree": "d78f10607c3c6b846145341208302718f4ac4c2b", "parents": [ "57fa937805059dcd2b46ee9eec86c81041354482", "2cfcf51ea3447f2b5cf95dbe7515d230de1e7df7" ], "author": { "name": "Tobias Melin", "email": "tobias.melin@sonymobile.com", "time": "Tue Jan 06 21:14:26 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 06 21:14:26 2015 +0000" }, "message": "am 2cfcf51e: Added check if the device address is random\n\n* commit \u00272cfcf51ea3447f2b5cf95dbe7515d230de1e7df7\u0027:\n Added check if the device address is random\n" }, { "commit": "57fa937805059dcd2b46ee9eec86c81041354482", "tree": "e142815ed2de2bb6d7e778db48321466536479c5", "parents": [ "ef8bca3b5da0e2a9907349bff331b20874367581", "5ad6d72549feb5c0f49f654edd177d98907a1586" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Dec 30 12:25:44 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 30 12:25:44 2014 +0000" }, "message": "am 5ad6d725: Merge \"Fix missing #includes in external/bluetooth.\"\n\n* commit \u00275ad6d72549feb5c0f49f654edd177d98907a1586\u0027:\n Fix missing #includes in external/bluetooth.\n" }, { "commit": "5ad6d72549feb5c0f49f654edd177d98907a1586", "tree": "2937a609807428512f808fb37984a3071dd1240e", "parents": [ "6f65f6706f125f4319f041eec51e95655d36c390", "3fd6713276c37ffcec4e51afc21fa1514a10e0e7" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 29 21:18:23 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 29 21:18:23 2014 +0000" }, "message": "Merge \"Fix missing #includes in external/bluetooth.\"" }, { "commit": "3fd6713276c37ffcec4e51afc21fa1514a10e0e7", "tree": "2937a609807428512f808fb37984a3071dd1240e", "parents": [ "6f65f6706f125f4319f041eec51e95655d36c390" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 29 12:32:48 2014 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Mon Dec 29 12:32:48 2014 -0800" }, "message": "Fix missing #includes in external/bluetooth.\n\nChange-Id: I5b1f75efb4b0f595a6e47849b4d8393a8d1dca24\n" }, { "commit": "2cfcf51ea3447f2b5cf95dbe7515d230de1e7df7", "tree": "73f6de24049cd74ef9848d412d3bff24f7e411c3", "parents": [ "01a069a228cb63988e502aed01a73a2a1d8a59eb" ], "author": { "name": "Tobias Melin", "email": "tobias.melin@sonymobile.com", "time": "Wed Dec 17 11:24:31 2014 +0100" }, "committer": { "name": "Prerepa Viswanadham", "email": "dham@google.com", "time": "Mon Dec 22 13:53:49 2014 -0800" }, "message": "Added check if the device address is random\n\nA check if the device address is random is needed since in a\npublic device address the two most significatant bits can also be\nequal to 01 (see Bluetooth specification Core_v4.1.pdf, page 2021\nand page 2500).\n\nBug: 18784040\nChange-Id: I4f967a426ebb825731461e202c0741ae0540ef6a\n" }, { "commit": "ef8bca3b5da0e2a9907349bff331b20874367581", "tree": "296be65884ed31e8b761296151b66a3a78c6d030", "parents": [ "a32e3c12db0411bff2c32b6df1baf50106596cdb", "01a069a228cb63988e502aed01a73a2a1d8a59eb" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Dec 17 17:10:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 17 17:10:11 2014 +0000" }, "message": "am 01a069a2: Allow connection parameters updates by slave\n\n* commit \u002701a069a228cb63988e502aed01a73a2a1d8a59eb\u0027:\n Allow connection parameters updates by slave\n" }, { "commit": "01a069a228cb63988e502aed01a73a2a1d8a59eb", "tree": "24f77ce330f8cd916a248656d470813001523b2c", "parents": [ "40053090c5e4faaf0b1906164569666ae722e6fa" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Dec 16 16:18:10 2014 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Dec 16 16:32:26 2014 -0800" }, "message": "Allow connection parameters updates by slave\n\nGATT service discovery in the slave role does not update to fast connection\nparameters when connected. Accordin to the 4.0 spec, the connection\nparameter disable/enable call is used for only by the masster role.\nThe 4.1 and later spec allows the slave role to control the connection\nparameter update so that a slave role GATT client can perform the service\ndiscovery using fast connection parameters.\n\nAlso switched to requestiong 7.5ms connection interval by default during\nservice discovery.\n\nBug: 18266904\nChange-Id: Ie6300587306be3d694937e3888069e252592be42\n" }, { "commit": "a32e3c12db0411bff2c32b6df1baf50106596cdb", "tree": "13325ce12eefad3d3c1640afaa6c09dafc0ec8df", "parents": [ "11cf5ccd5cd6dd1568bf69e4b6cbc27c95f5026d", "6f65f6706f125f4319f041eec51e95655d36c390" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Dec 16 21:06:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 16 21:06:02 2014 +0000" }, "message": "am 6f65f670: Merge \"Cleanup Obsolete LOCAL_PRELINK_MODULE.\"\n\n* commit \u00276f65f6706f125f4319f041eec51e95655d36c390\u0027:\n Cleanup Obsolete LOCAL_PRELINK_MODULE.\n" }, { "commit": "6f65f6706f125f4319f041eec51e95655d36c390", "tree": "6c13d326aea22d80029d2b6d2993ba2bb7d0595b", "parents": [ "ed0bdd422da488289ec829d2d59b74e7be3eaaec", "2d3ea0f56df43c5cd4650cd74fad5d94f49e87eb" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Dec 16 20:51:01 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 16 20:51:01 2014 +0000" }, "message": "Merge \"Cleanup Obsolete LOCAL_PRELINK_MODULE.\"" }, { "commit": "2d3ea0f56df43c5cd4650cd74fad5d94f49e87eb", "tree": "6c13d326aea22d80029d2b6d2993ba2bb7d0595b", "parents": [ "ed0bdd422da488289ec829d2d59b74e7be3eaaec" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Dec 16 12:31:51 2014 -0800" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Tue Dec 16 12:31:51 2014 -0800" }, "message": "Cleanup Obsolete LOCAL_PRELINK_MODULE.\n\nBug: 18675947\nChange-Id: Iba2a3e4b07b4d11e6584ca3c19f85c82030faa04\n" }, { "commit": "11cf5ccd5cd6dd1568bf69e4b6cbc27c95f5026d", "tree": "2235b3628109d04c7a62e836870630fef1129db3", "parents": [ "803434b0e3334a7bdb7ebbcf9e312b4adfcee08f", "ed0bdd422da488289ec829d2d59b74e7be3eaaec" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Dec 11 14:33:58 2014 -0800" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Dec 11 14:33:58 2014 -0800" }, "message": "resolved conflicts for merge of ed0bdd42 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Ife8b72d3688ed78a95ccb8d5e0b60f40e7fec9e9\n" }, { "commit": "ed0bdd422da488289ec829d2d59b74e7be3eaaec", "tree": "7be6832bf627960b87d0e1acf221a8dea66651f5", "parents": [ "d32ffc7e0661f6fa60ca3fe36acb14d2be953564", "104e3f238f500cacdb8afaccdc672dfc34eae7ee" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Thu Dec 11 21:42:46 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 11 21:42:46 2014 +0000" }, "message": "Merge \"Cleanups needed to make clang happy\"" }, { "commit": "803434b0e3334a7bdb7ebbcf9e312b4adfcee08f", "tree": "2e2dd9e1bf5391ff8ef14083a9e669d7299fb37a", "parents": [ "c1733c49213c04700a3ad8e248d391838d3ad125", "40053090c5e4faaf0b1906164569666ae722e6fa" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Dec 10 03:32:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 10 03:32:34 2014 +0000" }, "message": "am 40053090: Merge \"LE: Register for service change indication\" into lmp-mr1-dev\n\n* commit \u002740053090c5e4faaf0b1906164569666ae722e6fa\u0027:\n LE: Register for service change indication\n" }, { "commit": "c1733c49213c04700a3ad8e248d391838d3ad125", "tree": "118b82c75e8c790186f375578dd141658cd49a02", "parents": [ "544b9ff446a8b2317e4264b25a5d12e6b0c76e16", "a7246ca21d7570a725a9b7781649d194357e474c" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Dec 10 03:32:33 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 10 03:32:33 2014 +0000" }, "message": "am a7246ca2: Do not log LE encryption keys or passkey\n\n* commit \u0027a7246ca21d7570a725a9b7781649d194357e474c\u0027:\n Do not log LE encryption keys or passkey\n" }, { "commit": "40053090c5e4faaf0b1906164569666ae722e6fa", "tree": "afc469c70a97d43d58f1510bada90166d26adb2b", "parents": [ "a7246ca21d7570a725a9b7781649d194357e474c", "adc9f28ad418356cb81640059b59eee4d862e6b4" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Dec 09 23:16:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 09 23:16:11 2014 +0000" }, "message": "Merge \"LE: Register for service change indication\" into lmp-mr1-dev" }, { "commit": "a7246ca21d7570a725a9b7781649d194357e474c", "tree": "c76120d069aa6d86e441478249cddf460164a550", "parents": [ "0668d3a90a69b7dd57eae977c536dc7df043765f" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Dec 09 14:08:58 2014 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Dec 09 14:12:06 2014 -0800" }, "message": "Do not log LE encryption keys or passkey\n\nBug: 18687167\nChange-Id: I2a2a7113e6bc7cfb22a6bd6f16d16ce2b7c84cff\n" }, { "commit": "544b9ff446a8b2317e4264b25a5d12e6b0c76e16", "tree": "0b43588de4e7e797686c7ecba195ba8116746038", "parents": [ "301c55e4053f496496db67923f1d80313b348ce6", "0668d3a90a69b7dd57eae977c536dc7df043765f" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Mon Dec 08 19:18:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 08 19:18:07 2014 +0000" }, "message": "am 0668d3a9: LE: Ignore non-volatile GATT service cache for non-bonded devices\n\n* commit \u00270668d3a90a69b7dd57eae977c536dc7df043765f\u0027:\n LE: Ignore non-volatile GATT service cache for non-bonded devices\n" }, { "commit": "adc9f28ad418356cb81640059b59eee4d862e6b4", "tree": "b6c3781f7a0b123755a2a7e7f3db1e2f8ca7af8d", "parents": [ "a4fa77d1bc661bc72e00e81ce17af0ac4569d41d" ], "author": { "name": "Chaojing Sun", "email": "cjsun@broadcom.com", "time": "Fri Dec 05 17:12:36 2014 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Fri Dec 05 17:16:35 2014 -0800" }, "message": "LE: Register for service change indication\n\nSome bonded remote devices require the client to register for service\nchange indication and actually set the client configuration descriptor\nbefore service change indications can be removed.\n\nThis change add an additional step after device bonding has occured to\nregister for service change indication if possible.\n\nBug: 18173911\nChange-Id: I25386faec0d58834ee2b0a9d1db2d2e052311264\n" }, { "commit": "104e3f238f500cacdb8afaccdc672dfc34eae7ee", "tree": "fac3aff5f06f77b0ac2eec66e2e9534eaf8fb85c", "parents": [ "51dcba7a9a9860eb1f6a44ae268cbf24e3411694" ], "author": { "name": "Bernhard Rosenkränzer", "email": "Bernhard.Rosenkranzer@linaro.org", "time": "Wed Nov 12 21:53:08 2014 +0100" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 05 14:53:48 2014 -0800" }, "message": "Cleanups needed to make clang happy\n\nThis patch removes a slew of unused variables and some unused functions,\nfixes some incomplete initializations of structs and an sprintf\nparameter mismatching the format string.\n\nChange-Id: I35f22fdccc8350f885cd357d3685b869224fa433\nSigned-off-by: Bernhard Rosenkränzer \u003cBernhard.Rosenkranzer@linaro.org\u003e\n" }, { "commit": "301c55e4053f496496db67923f1d80313b348ce6", "tree": "ccd4f22c827a2eb25d4d5518cff17248cf4476e9", "parents": [ "6bf8a5e01c15db12aaf7b3b42256f5fa99409685", "a4fa77d1bc661bc72e00e81ce17af0ac4569d41d" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Fri Dec 05 21:40:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 05 21:40:14 2014 +0000" }, "message": "am a4fa77d1: am cf7f6a15: Prevent Java call for acquiring already held wakelock\n\n* commit \u0027a4fa77d1bc661bc72e00e81ce17af0ac4569d41d\u0027:\n Prevent Java call for acquiring already held wakelock\n" }, { "commit": "6bf8a5e01c15db12aaf7b3b42256f5fa99409685", "tree": "78f9422bc9d7039a96d5e9a61809ad34e104ba66", "parents": [ "2f51cdec0acc9c43c2986ed24b3019719bb4b2d7", "d32ffc7e0661f6fa60ca3fe36acb14d2be953564" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Dec 05 19:28:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 05 19:28:11 2014 +0000" }, "message": "am d32ffc7e: Merge \"Bluetooth: Turn off unused-XXX warnings\"\n\n* commit \u0027d32ffc7e0661f6fa60ca3fe36acb14d2be953564\u0027:\n Bluetooth: Turn off unused-XXX warnings\n" }, { "commit": "d32ffc7e0661f6fa60ca3fe36acb14d2be953564", "tree": "bc2e72125faefa05c87ff9ff575381768cc740a7", "parents": [ "d6984958c38b202d47cdce002429006d5a8ede9e", "135cebd0206ef3477e89d6044f3b20850330e85c" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Fri Dec 05 19:15:29 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 05 19:15:30 2014 +0000" }, "message": "Merge \"Bluetooth: Turn off unused-XXX warnings\"" }, { "commit": "135cebd0206ef3477e89d6044f3b20850330e85c", "tree": "044544d3a2dc7a45eca79196ee5c3eb6fc3c8adf", "parents": [ "51dcba7a9a9860eb1f6a44ae268cbf24e3411694" ], "author": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Thu Dec 04 17:55:57 2014 -0800" }, "committer": { "name": "Andreas Gampe", "email": "agampe@google.com", "time": "Thu Dec 04 17:57:44 2014 -0800" }, "message": "Bluetooth: Turn off unused-XXX warnings\n\nFor build-system CFLAGS clean-up, disable warnings locally.\n\nShould be reverted when the code is fixed.\n\nBug: 18632512\nChange-Id: I2356dbbe89d1ccec5b0bd0b60ab06bf57ce021d1\n" }, { "commit": "0668d3a90a69b7dd57eae977c536dc7df043765f", "tree": "1b2b1ef59b323d28769c0e27a309d1571bb2d43b", "parents": [ "a4fa77d1bc661bc72e00e81ce17af0ac4569d41d" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Dec 04 15:04:23 2014 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Dec 04 15:04:23 2014 -0800" }, "message": "LE: Ignore non-volatile GATT service cache for non-bonded devices\n\nIf a device is not bonded, the non-volatile GATT service cache should\nnot be used. Only bonded devices have the capability to invalidate the\ncache using the service changed indication.\n\nBug: 18571592\nChange-Id: Ia75aa14f1c862a18237e78d24b63c22cf1dc82a8\n" }, { "commit": "2f51cdec0acc9c43c2986ed24b3019719bb4b2d7", "tree": "de5b356b29537369fd1e7e7220f2b6f50c8cb33b", "parents": [ "6fadce76d56cebb4821856127cd89a2eada3d80a", "d6984958c38b202d47cdce002429006d5a8ede9e" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Thu Dec 04 22:44:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 22:44:52 2014 +0000" }, "message": "am d6984958: Merge \"Revert \"Correct the OBEX OPP Profile version\"\"\n\n* commit \u0027d6984958c38b202d47cdce002429006d5a8ede9e\u0027:\n Revert \"Correct the OBEX OPP Profile version\"\n" }, { "commit": "6fadce76d56cebb4821856127cd89a2eada3d80a", "tree": "1dcff60ca89f4c82388ea8b423ff421e89696c6b", "parents": [ "5faeaa8755679cef4d4aa529db813973b7f59380", "e608a529718bb64accdf9f18cb196a9a3c45c90e" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Thu Dec 04 21:47:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 21:47:37 2014 +0000" }, "message": "am e608a529: Merge \"Remove unnecessary check of multiple advertise instance count.\" into lmp-mr1-dev\n\n* commit \u0027e608a529718bb64accdf9f18cb196a9a3c45c90e\u0027:\n Remove unnecessary check of multiple advertise instance count.\n" }, { "commit": "a4fa77d1bc661bc72e00e81ce17af0ac4569d41d", "tree": "6a75f9c81dbba4bf420985efaec862f3cfacbea2", "parents": [ "e608a529718bb64accdf9f18cb196a9a3c45c90e", "cf7f6a154aed48659260d391994dc59151be937b" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Thu Dec 04 21:37:25 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 21:37:25 2014 +0000" }, "message": "am cf7f6a15: Prevent Java call for acquiring already held wakelock\n\n* commit \u0027cf7f6a154aed48659260d391994dc59151be937b\u0027:\n Prevent Java call for acquiring already held wakelock\n" }, { "commit": "5faeaa8755679cef4d4aa529db813973b7f59380", "tree": "2c26cdcaf286b14baa838c09aecef5ffb041b706", "parents": [ "3c70ace5af31d14691de34be35d7c7c73c3fe423", "8a75ab5b918c4e65e1b8fe55ec193b047ddfcb06" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Thu Dec 04 20:25:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 04 20:25:02 2014 +0000" }, "message": "am 8a75ab5b: Merge \"PAN TAP fd is not monitored in all cases\" into lmp-mr1-dev\n\n* commit \u00278a75ab5b918c4e65e1b8fe55ec193b047ddfcb06\u0027:\n PAN TAP fd is not monitored in all cases\n" }, { "commit": "d6984958c38b202d47cdce002429006d5a8ede9e", "tree": "ab704b6be99e15079f20c175ee4a28428e9ab98a", "parents": [ "51dcba7a9a9860eb1f6a44ae268cbf24e3411694", "c60e5d965b217e5bc1701a64edae34f09314d7d1" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Thu Dec 04 19:53:02 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Dec 04 19:53:02 2014 +0000" }, "message": "Merge \"Revert \"Correct the OBEX OPP Profile version\"\"" }, { "commit": "e608a529718bb64accdf9f18cb196a9a3c45c90e", "tree": "25081298c62228ba48dc5e58de06437f0a4fa76d", "parents": [ "8a75ab5b918c4e65e1b8fe55ec193b047ddfcb06", "ffaf9c5358decc3102252e76cc00da5c910bb065" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Thu Dec 04 01:42:56 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 04 01:42:57 2014 +0000" }, "message": "Merge \"Remove unnecessary check of multiple advertise instance count.\" into lmp-mr1-dev" }, { "commit": "cf7f6a154aed48659260d391994dc59151be937b", "tree": "f2a2a98037d511a4be47dda24e0d51616d63eb7b", "parents": [ "254b5ba2e3f4c44b82a0369579b66bafcd0d6aa2" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Dec 03 10:35:53 2014 -0800" }, "committer": { "name": "Simon Wilson", "email": "simonwilson@google.com", "time": "Wed Dec 03 16:09:40 2014 -0800" }, "message": "Prevent Java call for acquiring already held wakelock\n\nChange-Id: Icf455b6aa7c0c1bf7abf7ea9700cfde17f6c7c2b\n" }, { "commit": "8a75ab5b918c4e65e1b8fe55ec193b047ddfcb06", "tree": "61cd109174dcd35db81ce83cf9e58c03b73fb73c", "parents": [ "26d5c34af44bd1d5b430d15f3ac0942108159542", "285f7c6527244c749aafdc1edec39787e12bd871" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Wed Dec 03 22:15:11 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 03 22:15:12 2014 +0000" }, "message": "Merge \"PAN TAP fd is not monitored in all cases\" into lmp-mr1-dev" }, { "commit": "3c70ace5af31d14691de34be35d7c7c73c3fe423", "tree": "819d579d312a9074d691a0ceae3e552afcfb8c9a", "parents": [ "d0f99244a8fef1c25444ee3fd1bc2cd417a1b33e", "26d5c34af44bd1d5b430d15f3ac0942108159542" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Wed Dec 03 20:42:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 03 20:42:06 2014 +0000" }, "message": "am 26d5c34a: Merge \"Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target\" into lmp-mr1-dev\n\n* commit \u002726d5c34af44bd1d5b430d15f3ac0942108159542\u0027:\n Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target\n" }, { "commit": "26d5c34af44bd1d5b430d15f3ac0942108159542", "tree": "00647c330947d23df3541835743d14756c9f90ca", "parents": [ "e79be3d6ca41ed6349012c73a3374aca3714a053", "e6c363badaac6084e84775de59acb3976c80111d" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Wed Dec 03 04:18:03 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 03 04:18:04 2014 +0000" }, "message": "Merge \"Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target\" into lmp-mr1-dev" }, { "commit": "e6c363badaac6084e84775de59acb3976c80111d", "tree": "056cac709770198294857a58431e9e4fa60cf5dc", "parents": [ "2ffda316fc98f98eb7833006bd97a9e7686b6ba3" ], "author": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Tue Dec 02 17:06:03 2014 -0800" }, "committer": { "name": "Matthew Xie", "email": "mattx@google.com", "time": "Tue Dec 02 17:06:03 2014 -0800" }, "message": "Make GKI_TIMER_INTERVAL_FOR_WAKELOCK configurable for different target\n\nSet the default value as 3000 ms\nBug: 18549150\n\nChange-Id: I1d5b4fca627c22fdd8a32a41d5beac6837b6dff4\n" }, { "commit": "d0f99244a8fef1c25444ee3fd1bc2cd417a1b33e", "tree": "4c9072b847e74580643d9dc4ddb19d3c8031a132", "parents": [ "2bd9734ef17616d1352538047f2d71efa5692d65", "e79be3d6ca41ed6349012c73a3374aca3714a053" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Tue Dec 02 08:14:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Dec 02 08:14:17 2014 +0000" }, "message": "am e79be3d6: Add server-side callback for change in MTU (2/4)\n\n* commit \u0027e79be3d6ca41ed6349012c73a3374aca3714a053\u0027:\n Add server-side callback for change in MTU (2/4)\n" }, { "commit": "e79be3d6ca41ed6349012c73a3374aca3714a053", "tree": "865fac7e7f1d1e7ee19224b9d3f2010ca6597f6a", "parents": [ "2ffda316fc98f98eb7833006bd97a9e7686b6ba3" ], "author": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Nov 26 12:56:55 2014 -0800" }, "committer": { "name": "Andre Eisenbach", "email": "eisenbach@google.com", "time": "Wed Nov 26 12:56:55 2014 -0800" }, "message": "Add server-side callback for change in MTU (2/4)\n\nWhen a client requests to update the LE transport MTU, the server\ncurrently does not get notified and can therefor not properly size\nnotifications appropriate to the current MTU.\n\nBug: 18388114\nChange-Id: Ice355f8919d4f69876574df1d90ce7d31f42bc4f\n" }, { "commit": "ffaf9c5358decc3102252e76cc00da5c910bb065", "tree": "fcf3b382630bd160b497e66f06f7abf014286757", "parents": [ "2ffda316fc98f98eb7833006bd97a9e7686b6ba3" ], "author": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Wed Nov 26 12:47:49 2014 -0800" }, "committer": { "name": "Wei Wang", "email": "weiwa@google.com", "time": "Wed Nov 26 12:47:49 2014 -0800" }, "message": "Remove unnecessary check of multiple advertise instance count.\n\nBug:18539121\nChange-Id: I841e4323ed4995bd9f8117681a759f52995d071f\n" } ], "next": "2bd9734ef17616d1352538047f2d71efa5692d65" }