OSDN Git Service
Bryce Lee [Wed, 9 Dec 2015 23:07:23 +0000 (15:07 -0800)]
Improve logging in BluetoothHeadsetClientCall. am:
3c67873f0a am:
180dd72a9b
am:
a83d518689
* commit '
a83d5186898c49888f9b3c1d2ef2333d297d8449':
Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Wed, 9 Dec 2015 23:01:13 +0000 (15:01 -0800)]
Improve logging in BluetoothHeadsetClientCall. am:
3c67873f0a
am:
180dd72a9b
* commit '
180dd72a9b36ca6f74e5ad255347d815a0c8729a':
Improve logging in BluetoothHeadsetClientCall.
Bryce Lee [Wed, 9 Dec 2015 22:54:19 +0000 (22:54 +0000)]
Improve logging in BluetoothHeadsetClientCall.
am:
3c67873f0a
* commit '
3c67873f0a20a958f6cf1ccccb472fa050bf55b7':
Improve logging in BluetoothHeadsetClientCall.
Eino-Ville Talvala [Wed, 9 Dec 2015 21:25:15 +0000 (21:25 +0000)]
Merge "Replace hard-coded errno values with OsConstants"
am:
cb299b858f
* commit '
cb299b858f4f073e2abd4ad45aa944dc0dfd0aa2':
Replace hard-coded errno values with OsConstants
Eino-Ville Talvala [Wed, 9 Dec 2015 21:14:21 +0000 (21:14 +0000)]
Merge "Replace hard-coded errno values with OsConstants"
Chad Brubaker [Wed, 9 Dec 2015 21:07:18 +0000 (21:07 +0000)]
Merge "Use a custom TrustedCertificateStore"
am:
95f15495a2
* commit '
95f15495a2e3d8591fe4eeb25ae55e88da783274':
Use a custom TrustedCertificateStore
Chad Brubaker [Wed, 9 Dec 2015 21:05:50 +0000 (21:05 +0000)]
Merge "Expose findByIssuerAndSignature"
am:
b27d820920
* commit '
b27d8209206e0aad76a257636417341c6f69fbb5':
Expose findByIssuerAndSignature
Chad Brubaker [Wed, 9 Dec 2015 20:53:01 +0000 (20:53 +0000)]
Merge "Use a custom TrustedCertificateStore"
Chad Brubaker [Wed, 9 Dec 2015 20:52:50 +0000 (20:52 +0000)]
Merge "Expose findByIssuerAndSignature"
Chad Brubaker [Wed, 9 Dec 2015 18:54:06 +0000 (18:54 +0000)]
Merge "Refactor NetworkSecurityPolicy to be pluggable"
am:
224318aa13
* commit '
224318aa13ad5b78d19087cc42dcbe2ae0bd0c3f':
Refactor NetworkSecurityPolicy to be pluggable
Chad Brubaker [Wed, 9 Dec 2015 18:40:55 +0000 (18:40 +0000)]
Merge "Refactor NetworkSecurityPolicy to be pluggable"
Christopher Wiley [Tue, 8 Dec 2015 23:26:40 +0000 (23:26 +0000)]
Merge "Rethrow remote\'s ServiceSpecificException"
am:
85eaca25fe
* commit '
85eaca25fe2a89f883e9a87d8f411cfb315f3e03':
Rethrow remote's ServiceSpecificException
Christopher Wiley [Tue, 8 Dec 2015 23:15:52 +0000 (23:15 +0000)]
Merge "Rethrow remote's ServiceSpecificException"
Chad Brubaker [Tue, 8 Dec 2015 21:37:28 +0000 (13:37 -0800)]
Refactor NetworkSecurityPolicy to be pluggable
This allows us to keep the logic for the NetworkSecurityPolicy in the
framework instead of in libcore.
Change-Id: I4bf494f79c27729cb17d93d90a91319492270ce9
Bryce Lee [Tue, 8 Dec 2015 19:22:31 +0000 (11:22 -0800)]
Improve logging in BluetoothHeadsetClientCall.
Bug:
26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
Paul Duffin [Tue, 8 Dec 2015 14:18:30 +0000 (06:18 -0800)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES" am:
e252149ab9
am:
ec9081a004
* commit '
ec9081a004db058bb5ada5173d65a565e2005c6d':
Remove framework from LOCAL_JAVA_LIBRARIES
Paul Duffin [Tue, 8 Dec 2015 14:17:03 +0000 (06:17 -0800)]
Merge "Follow-up to Switch to the latest version of Caliper" am:
80d5bef6f9
am:
0ec9daecc6
* commit '
0ec9daecc6129529fc6f2d66c29876eca88c492f':
Follow-up to Switch to the latest version of Caliper
Paul Duffin [Tue, 8 Dec 2015 14:11:45 +0000 (14:11 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
am:
e252149ab9
* commit '
e252149ab99a008a0a75734326755cadd5c5ee7a':
Remove framework from LOCAL_JAVA_LIBRARIES
Paul Duffin [Tue, 8 Dec 2015 14:10:09 +0000 (14:10 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
am:
80d5bef6f9
* commit '
80d5bef6f9da4a0eeb23c3356843351170553df6':
Follow-up to Switch to the latest version of Caliper
Paul Duffin [Tue, 8 Dec 2015 14:04:29 +0000 (14:04 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
Paul Duffin [Tue, 8 Dec 2015 14:03:10 +0000 (14:03 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
Paul Duffin [Tue, 8 Dec 2015 13:51:27 +0000 (13:51 +0000)]
Remove framework from LOCAL_JAVA_LIBRARIES
After previous change removed LOCAL_NO_STANDARD_LIBRARIES:=true
it is no longer necessary to explicitly add framework to
LOCAL_JAVA_LIBRARIES as it is added automatically by the build.
Change-Id: I68bf700375e34a10302f76d7463110755b815f85
Andreas Gampe [Tue, 8 Dec 2015 02:24:08 +0000 (18:24 -0800)]
Follow-up to Switch to the latest version of Caliper
Remove LOCAL_NO_STANDARD_LIBRARIES.
(cherry pick from commit
c9d6a91cd51a9b7ff00187914fe922b0d22b3d66)
Bug:
24848946
Change-Id: I19feea042c9b4823d4979f4d951476792600edbc
Neil Fuller [Tue, 8 Dec 2015 10:56:41 +0000 (10:56 +0000)]
Merge "Add ICU4J APIs for Android" am:
cb02371ca7
am:
ec1349df9c
* commit '
ec1349df9c1759ca728fc637738592902f2aa44b':
Add ICU4J APIs for Android
Michael Wright [Tue, 8 Dec 2015 10:55:07 +0000 (10:55 +0000)]
Merge "Add support for locking the screen when the lid is closed" am:
9dc3c36c9c
am:
4d9e6190b1
* commit '
4d9e6190b186f1d2e1cd25defd0d6e12dd833b38':
Add support for locking the screen when the lid is closed
Neil Fuller [Tue, 8 Dec 2015 10:47:59 +0000 (10:47 +0000)]
Merge "Add ICU4J APIs for Android"
am:
cb02371ca7
* commit '
cb02371ca70a81796c75bd3bbf88478caf6ea7b7':
Add ICU4J APIs for Android
Neil Fuller [Tue, 8 Dec 2015 10:42:51 +0000 (10:42 +0000)]
Merge "Add ICU4J APIs for Android"
Prashant Malani [Tue, 8 Dec 2015 01:43:27 +0000 (01:43 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev am:
487f0d3d15 am:
6344cb8144
am:
3ebd5ceb90
* commit '
3ebd5ceb90137572262efeda12cdce4b503ddded':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:37:05 +0000 (01:37 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev am:
487f0d3d15
am:
6344cb8144
* commit '
6344cb8144647e4e49bc69cbf34a084ca7712115':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:31:31 +0000 (01:31 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
am:
487f0d3d15
* commit '
487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
Add rotary encoder input source
Prashant Malani [Tue, 8 Dec 2015 01:27:18 +0000 (01:27 +0000)]
Merge "Add rotary encoder input source" into cw-e-dev
Chenjie Luo [Mon, 7 Dec 2015 23:42:07 +0000 (23:42 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d am:
bef0525c38
am:
e4db3f0757
* commit '
e4db3f0757fccdf26d98ab4295ac4828a479e8eb':
Check NPE beforehand instead of catching it at runtime
Samuel Tan [Mon, 7 Dec 2015 23:38:14 +0000 (23:38 +0000)]
Merge "Add support for reading and writing double array values" am:
61c0b7cd4d
am:
ff8ef28e73
* commit '
ff8ef28e73c0959a4993fea975d0bdefbc27a20b':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:35:20 +0000 (23:35 +0000)]
Merge "Switch to the latest version of Caliper" am:
ae119af517
am:
5e2d958157
* commit '
5e2d958157d8043d5a7aca1263af2186fdf17e6c':
Switch to the latest version of Caliper
Amit Mahajan [Mon, 7 Dec 2015 23:32:22 +0000 (23:32 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am:
cd2cc9aa9b
am:
d515b124f7
* commit '
d515b124f7f966a3e4725dc6f6179ade869df636':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:30:22 +0000 (23:30 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev am:
dde5a6ef28
am:
5ff55cec79
* commit '
5ff55cec79b7bda67dd3e458263ccb8e2896af30':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:28:44 +0000 (23:28 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev am:
e56f7b0d1d
am:
bef0525c38
* commit '
bef0525c385c95f4ff6710ad9b117429a4d5ce63':
Check NPE beforehand instead of catching it at runtime
Michael Wright [Mon, 7 Dec 2015 23:19:53 +0000 (23:19 +0000)]
Merge "Add support for locking the screen when the lid is closed"
am:
9dc3c36c9c
* commit '
9dc3c36c9cd796d90b65543567495d910d266e4c':
Add support for locking the screen when the lid is closed
Samuel Tan [Mon, 7 Dec 2015 23:15:15 +0000 (23:15 +0000)]
Merge "Add support for reading and writing double array values"
am:
61c0b7cd4d
* commit '
61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:12:48 +0000 (23:12 +0000)]
Merge "Switch to the latest version of Caliper"
am:
ae119af517
* commit '
ae119af517fc427ead5bd6a3394b3b1f92df790d':
Switch to the latest version of Caliper
Amit Mahajan [Mon, 7 Dec 2015 23:10:55 +0000 (23:10 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
am:
cd2cc9aa9b
* commit '
cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
Julia Reynolds [Mon, 7 Dec 2015 23:08:01 +0000 (23:08 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
am:
dde5a6ef28
* commit '
dde5a6ef2846bfb6b253b0946a7b9e42a11b8348':
Fix radio button flash on hour change.
Chenjie Luo [Mon, 7 Dec 2015 23:06:36 +0000 (23:06 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
am:
e56f7b0d1d
* commit '
e56f7b0d1d92390c3409999ea841525514163f65':
Check NPE beforehand instead of catching it at runtime
Michael Wright [Mon, 7 Dec 2015 21:34:59 +0000 (21:34 +0000)]
Merge "Add support for locking the screen when the lid is closed"
Chenjie Luo [Mon, 7 Dec 2015 21:04:14 +0000 (21:04 +0000)]
Merge "Check NPE beforehand instead of catching it at runtime" into cw-e-dev
Samuel Tan [Mon, 7 Dec 2015 18:56:01 +0000 (18:56 +0000)]
Merge "Add support for reading and writing double array values"
Amit Mahajan [Mon, 7 Dec 2015 18:15:38 +0000 (18:15 +0000)]
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
Julia Reynolds [Mon, 7 Dec 2015 15:06:03 +0000 (15:06 +0000)]
Merge "Fix radio button flash on hour change." into mnc-dr1.5-dev
Julia Reynolds [Thu, 5 Nov 2015 16:08:02 +0000 (11:08 -0500)]
Fix radio button flash on hour change.
Also delete confusing debug variable.
Bug:
25459795
Bug:
25783349
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
Neil Fuller [Tue, 10 Nov 2015 13:14:07 +0000 (13:14 +0000)]
Add ICU4J APIs for Android
Add the planned set of new I18N public APIs for
Android N.
This APIs consists of a whitelisted subset of ICU4J APIs
repackaged under android.icu (not com.ibm.icu).
It includes no deprecated, provisional, internal methods from
ICU 56.
There may be future work to improve the ICU4J JavaDoc text
for Android, but the API surface area should be mostly
stable at this point.
Bug:
22023363
(cherry-picked from commit
d7fa3e79f071696bd62182c01b62fe0ea1cc9587)
Change-Id: I6667acbbf7c5501e12ecfbdd560ea80283c0c831
Paul Duffin [Mon, 7 Dec 2015 13:34:27 +0000 (13:34 +0000)]
Merge "Switch to the latest version of Caliper"
Paul Duffin [Tue, 1 Dec 2015 15:41:36 +0000 (15:41 +0000)]
Switch to the latest version of Caliper
Added an Android.mk file to core/tests/benchmarks to build the
benchmarks against caliper-api-target to ensure that they build
correctly. Changed the implementations to work with the new
version of Caliper.
Bug:
24848946
Change-Id: Ib28026816dbc5c1d54f65974f4a1abfee299c43f
Elliott Hughes [Sat, 5 Dec 2015 01:44:41 +0000 (01:44 +0000)]
Merge "Track rename from base/ to android-base/." am:
9f6a2ae67c
am:
8aa8fe2c64
* commit '
8aa8fe2c64cf4611ba68d90992e54858a35aae58':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:36:53 +0000 (01:36 +0000)]
Merge "Track rename from base/ to android-base/."
am:
9f6a2ae67c
* commit '
9f6a2ae67c70085d550962829e6bfe76706907d8':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:30:46 +0000 (01:30 +0000)]
Merge "Track rename from base/ to android-base/."
Eino-Ville Talvala [Sat, 5 Dec 2015 00:36:06 +0000 (16:36 -0800)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41 am:
7417f70ac6 am:
e2d516fd4b
am:
5794dbb1a5
* commit '
5794dbb1a5f54b116911526c1086efda5dfb63f7':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:28:38 +0000 (00:28 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41 am:
7417f70ac6
am:
e2d516fd4b
* commit '
e2d516fd4b77352919d1c40971678909e3f4a15d':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:20:47 +0000 (16:20 -0800)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d am:
add4b91d41
am:
7417f70ac6
* commit '
7417f70ac6aa6a59ab67bac959ce39aa3372e0ef':
Camera: codegen doc update
Eino-Ville Talvala [Sat, 5 Dec 2015 00:11:43 +0000 (00:11 +0000)]
Merge "Camera: codegen doc update" into mnc-dev am:
69c5e7143d
am:
add4b91d41
* commit '
add4b91d41d3ba810b6b25c14d7c13050394f201':
Camera: codegen doc update
Christopher Wiley [Mon, 23 Nov 2015 01:12:37 +0000 (17:12 -0800)]
Rethrow remote's ServiceSpecificException
Certain system services would like to throw exceptions
with specific error codes, so that the framework can catch
these specific conditions and express them appropriately.
Bug:
25800533
Change-Id: I94b3d30fa131f5e14bba893c971615840085459f
Eino-Ville Talvala [Sat, 5 Dec 2015 00:03:23 +0000 (16:03 -0800)]
Merge "Camera: codegen doc update" into mnc-dev
am:
69c5e7143d
* commit '
69c5e7143dd308e8db9b6055b428b7ad3964c1ff':
Camera: codegen doc update
Eino-Ville Talvala [Fri, 4 Dec 2015 23:54:05 +0000 (23:54 +0000)]
Merge "Camera: codegen doc update" into mnc-dev
Elliott Hughes [Fri, 4 Dec 2015 23:33:35 +0000 (15:33 -0800)]
Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
Edward Savage-Jones [Fri, 13 Nov 2015 12:27:03 +0000 (13:27 +0100)]
Add support for locking the screen when the lid is closed
This commit adds configurable support for lockscreen
behaviour when the user has a device cover/lid. This
is intended for lids with a viewing window so that the
user can see the time and interact with apps via the
window.
Change-Id: Id71883f66d1a180c4732912b3b59cabf9f4d7b6e
Lazar Trsic [Tue, 7 Jul 2015 15:31:20 +0000 (17:31 +0200)]
Replace hard-coded errno values with OsConstants
Errno values have been hard-coded inside java code. On the native side
however, bionic's errno.h is used (through utils/Errors.h). Some of
the numbers are architecture dependent (EOPNOTSUPP, ETIMEDOUT...).
This causes Camera app to crash on MIPS devices. There is a check for
expected errors, in CameraBinderDecorator.throwOnError, but the error
(EOPNOTSUPP) is not recognized and an exception is thrown.
Change-Id: I8bcac8f1ced50c76614f566a6e624967a18a25e1
Phil Burk [Fri, 4 Dec 2015 01:27:36 +0000 (01:27 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections." am:
1c9bdfd029
am:
ec719f1509
* commit '
ec719f1509807765dac661286000c7e411ec9662':
USB MIDI: Fix race condition that causes intermittent connections.
Phil Burk [Fri, 4 Dec 2015 01:18:51 +0000 (01:18 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
am:
1c9bdfd029
* commit '
1c9bdfd0294cd1b13470ae6443bfa2ad425bd7dd':
USB MIDI: Fix race condition that causes intermittent connections.
Phil Burk [Fri, 4 Dec 2015 01:12:01 +0000 (01:12 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
Phil Burk [Fri, 4 Dec 2015 01:00:42 +0000 (17:00 -0800)]
USB MIDI: Fix race condition that causes intermittent connections.
Plugging in a USB MIDI device normally works.
But occasionally the device is not seen due to a race condition.
This code retries until the device is ready.
Change-Id: Ifba9c9678e6be0c3d139f3467f895307096a2ad8
Signed-off-by: Phil Burk <philburk@google.com>
Jeff Sharkey [Thu, 3 Dec 2015 23:19:42 +0000 (23:19 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI" am:
f1b325c1ec
am:
f2a3c341ab
* commit '
f2a3c341ab9061b576ab399e1336e9e45afb8c2e':
Allow customisation of advanced settings in DocumentsUI
Jeff Sharkey [Thu, 3 Dec 2015 23:11:51 +0000 (23:11 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
am:
f1b325c1ec
* commit '
f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
Allow customisation of advanced settings in DocumentsUI
Jeff Sharkey [Thu, 3 Dec 2015 23:04:29 +0000 (23:04 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
Edward Savage-Jones [Tue, 21 Jan 2014 14:45:44 +0000 (15:45 +0100)]
Allow customisation of advanced settings in DocumentsUI
Enables the customisation of the default value of the DocumentsUI
'advanced' setting using overlays.
Change-Id: I240cbb845d15ab2ea6ae7a79a17b4f51905fdb9c
Chenjie Luo [Thu, 3 Dec 2015 20:24:12 +0000 (12:24 -0800)]
Check NPE beforehand instead of catching it at runtime
This will fix the page fault when watch rings during incoming call
Bug:
25904666
Change-Id: Ia7e6db0628108dbf298e3811a846534ba69c0b46
Vineeta Srivastava [Thu, 3 Dec 2015 22:09:58 +0000 (22:09 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev am:
9eacc97d71
am:
360930372f
* commit '
360930372fcab1a093bd1cd7d11bd082255577d8':
Set Tether APN protocol type to IPv4 for Telus
Vineeta Srivastava [Thu, 3 Dec 2015 22:01:30 +0000 (22:01 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
am:
9eacc97d71
* commit '
9eacc97d71166a05ec0eb67025a00cb4e57979c8':
Set Tether APN protocol type to IPv4 for Telus
Vineeta Srivastava [Thu, 3 Dec 2015 21:56:29 +0000 (21:56 +0000)]
Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
Hyejin Kim [Fri, 30 Oct 2015 00:46:53 +0000 (09:46 +0900)]
Set Tether APN protocol type to IPv4 for Telus
BUG=
25356170
Change-Id: I080c354409d263388844543bf7a57ff6c28d760f
Alex Klyubin [Thu, 3 Dec 2015 21:26:05 +0000 (21:26 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests." am:
59c9bfd41b
am:
b1e7f6d287
* commit '
b1e7f6d2870ca59f582671bdacf78efc52028bbc':
Stop using 512 bit RSA keys in keyset unit tests.
Alex Klyubin [Thu, 3 Dec 2015 21:18:38 +0000 (21:18 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
am:
59c9bfd41b
* commit '
59c9bfd41bfe7d897a1a5d2e35d8dd48322c9865':
Stop using 512 bit RSA keys in keyset unit tests.
Alex Klyubin [Thu, 3 Dec 2015 21:10:46 +0000 (21:10 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
Christine Hallstrom [Thu, 3 Dec 2015 20:52:44 +0000 (20:52 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472 am:
67d068b5ec
am:
9355a0420e
* commit '
9355a0420e3324ae42ac1a5ca108730c5990dcbf':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Alex Klyubin [Thu, 3 Dec 2015 20:52:23 +0000 (12:52 -0800)]
Stop using 512 bit RSA keys in keyset unit tests.
This switches keyset unit tests from two unrealistically short 512 bit
RSA keys to a more realistic 2048 bit RSA key and a NIST P-256 EC key.
Change-Id: If615b97dff22a2a4f7f0e6015e410e98b8d395cd
Christine Hallstrom [Thu, 3 Dec 2015 20:42:35 +0000 (20:42 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472
am:
67d068b5ec
* commit '
67d068b5ec7ca3739047f0c5a162f9317171f784':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:35:39 +0000 (20:35 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
am:
7fb263c472
* commit '
7fb263c472c9df98410b2b9dfe72e093e2d594e0':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
Andy Hung [Thu, 3 Dec 2015 19:55:32 +0000 (19:55 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb am:
a30685ef8d
am:
ae4b789619
* commit '
ae4b7896195727dfd8d00b90f25074206bf21775':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:50:25 +0000 (19:50 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb
am:
a30685ef8d
* commit '
a30685ef8dcaa18b2561c17cfbbb48044adb2d27':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:42:45 +0000 (19:42 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7
am:
94cefd6adb
* commit '
94cefd6adb7cf464e4765faaba001071b543517b':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:34:01 +0000 (19:34 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c
am:
7c798c13a7
* commit '
7c798c13a7c36f3c8877f410ecf5552e1b385805':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:24:02 +0000 (19:24 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
am:
0a887bcd5c
* commit '
0a887bcd5c5a8056735d221ad71afcff1f6eb1a6':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Yohei Yukawa [Thu, 3 Dec 2015 19:18:45 +0000 (19:18 +0000)]
Merge "Fix special handling of a fake language code "tl"." am:
9fd2af6b32
am:
30e321b54a
* commit '
30e321b54a589d33dc7f2dd7344bef95faaaf83d':
Fix special handling of a fake language code "tl".
Yohei Yukawa [Thu, 3 Dec 2015 19:10:30 +0000 (19:10 +0000)]
Merge "Fix special handling of a fake language code "tl"."
am:
9fd2af6b32
* commit '
9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
Fix special handling of a fake language code "tl".
Christine Hallstrom [Tue, 17 Nov 2015 20:24:07 +0000 (12:24 -0800)]
Log API calls to createBond(), cancelBondProcess(), removeBond()
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.
Bug:
25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
Yohei Yukawa [Thu, 3 Dec 2015 19:04:24 +0000 (19:04 +0000)]
Merge "Fix special handling of a fake language code "tl"."
Christopher Wiley [Thu, 3 Dec 2015 17:54:08 +0000 (17:54 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am:
0ded0da517
am:
4ff2cc0898
* commit '
4ff2cc0898891488dce3917d105f15264b7742ce':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am:
0ded0da517
* commit '
0ded0da51743a24707bece4b0be05f49db3b9981':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:43:43 +0000 (17:43 +0000)]
Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException"
Jeff Sharkey [Thu, 3 Dec 2015 17:16:30 +0000 (17:16 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider" am:
e8651aed4b
am:
aae0a49c16
* commit '
aae0a49c164e9eeb19d46967c84697cd1a3a6783':
Avoid a double decrease of reference counter for unstable provider
Jeff Sharkey [Thu, 3 Dec 2015 17:15:06 +0000 (17:15 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
am:
67003be3f8
* commit '
67003be3f8a53c1d11d130d53d866255bd04d2c7':