Greg Hackmann
0f13ddfdff
Merge "Trace SQLite operations"
...
am: 6fe06606c4
* commit '6fe06606c4df39487d240cc1fa4ac6d944b33137':
Trace SQLite operations
2015-12-14 13:37:30 -08:00
Greg Hackmann
6fe06606c4
Merge "Trace SQLite operations"
2015-12-14 21:12:52 +00:00
Greg Hackmann
e12350faf7
Trace SQLite operations
...
Inefficient SQLite use can have non-obvious effects on performance. For
example, insert and update operations can trigger a surprising number of
fsync() calls, especially if they're not grouped together into
transactions.
Add tracepoints around SQLite operations, to make it easier to pinpoint
their effects on the rest of the system.
Change-Id: I30cc3d02eca264e46dcc09ca7512a32519543834
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2015-12-14 12:32:26 -08:00
Chad Brubaker
a1c0bea895
Merge "Use the application\'s usesCleartextTraffic flag"
...
am: d16f5f121e
* commit 'd16f5f121e560d9f18411cbdd3fa4fb48681c0c2':
Use the application's usesCleartextTraffic flag
2015-12-14 11:57:29 -08:00
Chad Brubaker
15ea45c848
Merge "Check for null hostnames in RootTrustManager"
...
am: 49ce7dc2ba
* commit '49ce7dc2baa9ee867fc7b78301c65fab2168a9b2':
Check for null hostnames in RootTrustManager
2015-12-14 11:55:05 -08:00
Chad Brubaker
d16f5f121e
Merge "Use the application's usesCleartextTraffic flag"
2015-12-14 19:31:08 +00:00
Chad Brubaker
49ce7dc2ba
Merge "Check for null hostnames in RootTrustManager"
2015-12-14 19:30:44 +00:00
Ian Pedowitz
19937f924e
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev am: cf07154e71
...
am: 911dfe8861
* commit '911dfe8861c7d67aab738cf42455837c8a9aefa7':
DO NOT MERGE Remove more extras during notification lightening.
2015-12-11 17:18:51 -08:00
Ian Pedowitz
911dfe8861
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
...
am: cf07154e71
* commit 'cf07154e7102de304f1d887c8c2a2ef61b4880d7':
DO NOT MERGE Remove more extras during notification lightening.
2015-12-11 17:12:35 -08:00
Ian Pedowitz
cf07154e71
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
2015-12-12 01:06:43 +00:00
Dan Sandler
ddb52fb1f5
DO NOT MERGE Remove more extras during notification lightening.
...
Basically anything Parcelable needs to go since it might be
quite large. Note that this includes additional extras such as
those contributed by WearableExtender.
Cherry-picked from 5012853de2
Bug: 26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
2015-12-12 01:05:25 +00:00
Dimitry Ivanov
e3ca5ac40d
Merge "Use nativeloader to load NativeActivity"
...
am: 317456bc52
* commit '317456bc520549cbc1ac4ad102df8b0d22b22a99':
Use nativeloader to load NativeActivity
2015-12-11 12:41:22 -08:00
Chad Brubaker
8d28e4f07f
Use the application's usesCleartextTraffic flag
...
When no config is specified use the application's usesCleartextTraffic
flag when building the default config.
Change-Id: I07378f88da47b49f63e9089fca7f1e99efede272
2015-12-11 12:35:11 -08:00
Dimitry Ivanov
317456bc52
Merge "Use nativeloader to load NativeActivity"
2015-12-11 20:30:32 +00:00
Dmitriy Ivanov
6f06ad7df1
Use nativeloader to load NativeActivity
...
System apps are the exception and they can
access internal platform libraries (this
is needed for bundled apps to work correctly).
Also fix the way NativeActivity loads the native
library to correspond to the way BaseDexClassloader
does it.
Bug: http://b/22548808
Bub: http://b/25777936
Change-Id: Idc94cdded182ea2cb1cbebc76c336cc3394c7ebe
2015-12-11 10:44:16 -08:00
Chad Brubaker
14cf68c284
Merge "Add null check to getConfigForHostname"
...
am: fe1eac7a19
* commit 'fe1eac7a19b827af71c503df6aefc59076a30928':
Add null check to getConfigForHostname
2015-12-11 10:16:26 -08:00
Chad Brubaker
fe1eac7a19
Merge "Add null check to getConfigForHostname"
2015-12-11 18:02:34 +00:00
Chad Brubaker
dd586a46c9
Check for null hostnames in RootTrustManager
...
Even if the hostname aware method is called if the hostname is null then
the destination is unknown and the configuration can be ambiguous.
Change-Id: I7cacbd57a42604933fdc882371f143dc0a20902d
2015-12-10 18:32:40 -08:00
Chad Brubaker
9613157d5e
Add null check to getConfigForHostname
...
bug: 26144676
Change-Id: I18f50940846f1ce8109560c63ce2a87ce084d9e5
2015-12-10 18:12:59 -08:00
Adam Lesinski
0b754d122c
Prevent DivideByZero error in BatteryStatsImpl am: ba88e68fe4
...
am: 4e4ff058c1
* commit '4e4ff058c1a0b4b77f468a206a790bb6f084f616':
Prevent DivideByZero error in BatteryStatsImpl
2015-12-10 14:54:38 -08:00
Adam Lesinski
4e4ff058c1
Prevent DivideByZero error in BatteryStatsImpl
...
am: ba88e68fe4
* commit 'ba88e68fe47b66f1fc5d10c15f04f20fe662399e':
Prevent DivideByZero error in BatteryStatsImpl
2015-12-10 14:47:09 -08:00
Adam Lesinski
ba88e68fe4
Prevent DivideByZero error in BatteryStatsImpl
...
It was assumed that when a UID had either rx or tx bytes/packets that it would
have the other as well.
Bug:25706750
Change-Id: Iefac59a6bd02876aed9a0bac218d187b81807a95
2015-12-10 00:48:24 +00:00
Bryce Lee
0a8c81a204
Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a am: 180dd72a9b
...
am: a83d518689
* commit 'a83d5186898c49888f9b3c1d2ef2333d297d8449':
Improve logging in BluetoothHeadsetClientCall.
2015-12-09 15:07:23 -08:00
Bryce Lee
a83d518689
Improve logging in BluetoothHeadsetClientCall. am: 3c67873f0a
...
am: 180dd72a9b
* commit '180dd72a9b36ca6f74e5ad255347d815a0c8729a':
Improve logging in BluetoothHeadsetClientCall.
2015-12-09 15:01:13 -08:00
Bryce Lee
180dd72a9b
Improve logging in BluetoothHeadsetClientCall.
...
am: 3c67873f0a
* commit '3c67873f0a20a958f6cf1ccccb472fa050bf55b7':
Improve logging in BluetoothHeadsetClientCall.
2015-12-09 22:54:19 +00:00
Eino-Ville Talvala
6fa9cc1bd3
Merge "Replace hard-coded errno values with OsConstants"
...
am: cb299b858f
* commit 'cb299b858f4f073e2abd4ad45aa944dc0dfd0aa2':
Replace hard-coded errno values with OsConstants
2015-12-09 21:25:15 +00:00
Eino-Ville Talvala
cb299b858f
Merge "Replace hard-coded errno values with OsConstants"
2015-12-09 21:14:21 +00:00
Chad Brubaker
5a12cf5cb7
Merge "Use a custom TrustedCertificateStore"
...
am: 95f15495a2
* commit '95f15495a2e3d8591fe4eeb25ae55e88da783274':
Use a custom TrustedCertificateStore
2015-12-09 21:07:18 +00:00
Chad Brubaker
f1870eee34
Merge "Expose findByIssuerAndSignature"
...
am: b27d820920
* commit 'b27d8209206e0aad76a257636417341c6f69fbb5':
Expose findByIssuerAndSignature
2015-12-09 21:05:50 +00:00
Chad Brubaker
95f15495a2
Merge "Use a custom TrustedCertificateStore"
2015-12-09 20:53:01 +00:00
Chad Brubaker
b27d820920
Merge "Expose findByIssuerAndSignature"
2015-12-09 20:52:50 +00:00
Chad Brubaker
cea1cf0185
Merge "Refactor NetworkSecurityPolicy to be pluggable"
...
am: 224318aa13
* commit '224318aa13ad5b78d19087cc42dcbe2ae0bd0c3f':
Refactor NetworkSecurityPolicy to be pluggable
2015-12-09 18:54:06 +00:00
Chad Brubaker
224318aa13
Merge "Refactor NetworkSecurityPolicy to be pluggable"
2015-12-09 18:40:55 +00:00
Christopher Wiley
b7b3415899
Merge "Rethrow remote\'s ServiceSpecificException"
...
am: 85eaca25fe
* commit '85eaca25fe2a89f883e9a87d8f411cfb315f3e03':
Rethrow remote's ServiceSpecificException
2015-12-08 23:26:40 +00:00
Christopher Wiley
85eaca25fe
Merge "Rethrow remote's ServiceSpecificException"
2015-12-08 23:15:52 +00:00
Chad Brubaker
6568cf185d
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
2015-12-08 13:38:43 -08:00
Bryce Lee
3c67873f0a
Improve logging in BluetoothHeadsetClientCall.
...
Bug: 26032099
Change-Id: I497edc9aa4c19cc7159993a899071e7b0c26db63
2015-12-08 11:22:31 -08:00
Michael Wright
37c8bcbcc9
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
2015-12-08 10:55:07 +00:00
Prashant Malani
54909b8e6b
Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15 am: 6344cb8144
...
am: 3ebd5ceb90
* commit '3ebd5ceb90137572262efeda12cdce4b503ddded':
Add rotary encoder input source
2015-12-08 01:43:27 +00:00
Prashant Malani
3ebd5ceb90
Merge "Add rotary encoder input source" into cw-e-dev am: 487f0d3d15
...
am: 6344cb8144
* commit '6344cb8144647e4e49bc69cbf34a084ca7712115':
Add rotary encoder input source
2015-12-08 01:37:05 +00:00
Prashant Malani
6344cb8144
Merge "Add rotary encoder input source" into cw-e-dev
...
am: 487f0d3d15
* commit '487f0d3d1556296ef53c449d7ec5de5a0dac1f83':
Add rotary encoder input source
2015-12-08 01:31:31 +00:00
Prashant Malani
487f0d3d15
Merge "Add rotary encoder input source" into cw-e-dev
2015-12-08 01:27:18 +00:00
Samuel Tan
e769f25fa4
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
2015-12-07 23:38:14 +00:00
Amit Mahajan
0dfeda60c0
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev am: cd2cc9aa9b
...
am: d515b124f7
* commit 'd515b124f7f966a3e4725dc6f6179ade869df636':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
2015-12-07 23:32:22 +00:00
Michael Wright
4d9e6190b1
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
2015-12-07 23:19:53 +00:00
Samuel Tan
ff8ef28e73
Merge "Add support for reading and writing double array values"
...
am: 61c0b7cd4d
* commit '61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
Add support for reading and writing double array values
2015-12-07 23:15:15 +00:00
Amit Mahajan
d515b124f7
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
...
am: cd2cc9aa9b
* commit 'cd2cc9aa9bfdc21a06ffd7049a4b4ad07bbf6886':
Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()
2015-12-07 23:10:55 +00:00
Michael Wright
9dc3c36c9c
Merge "Add support for locking the screen when the lid is closed"
2015-12-07 21:34:59 +00:00
Samuel Tan
61c0b7cd4d
Merge "Add support for reading and writing double array values"
2015-12-07 18:56:01 +00:00
Amit Mahajan
cd2cc9aa9b
Merge "Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages()" into mnc-dr1.5-dev
2015-12-07 18:15:38 +00:00