OSDN Git Service
Geoff Mendal [Wed, 16 Dec 2015 04:54:40 +0000 (20:54 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours am:
7babe8de9e -s ours
am:
0750798334 -s ours
* commit '
07507983347a3b0ff9cdd60eb408839e1ed4895f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:53:02 +0000 (20:53 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours am:
d8004c03d2 -s ours
am:
b295f8112c -s ours
* commit '
b295f8112c82efc1d9d162855dbcbde32ddb839d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:45:33 +0000 (20:45 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours
am:
7babe8de9e -s ours
* commit '
7babe8de9eb51c5c23c9d3257314aa374112d550':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:43:18 +0000 (20:43 -0800)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours
am:
d8004c03d2 -s ours
* commit '
d8004c03d2c05d84e38ce3a5da88fd4b2c4e9681':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:35:34 +0000 (20:35 -0800)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
327d917865 -s ours
* commit '
327d917865331d1b6823495e1e4ba43930caaacb':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:33:27 +0000 (20:33 -0800)]
Import translations. DO NOT MERGE
am:
22dea4e16f -s ours
* commit '
22dea4e16f9a32eb4693829b59462c32dda3f45c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 04:26:04 +0000 (04:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Wed, 16 Dec 2015 04:21:26 +0000 (20:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I28f308a8339779f14ccf90581665624317afb4d3
Auto-generated-cl: translation import
Geoff Mendal [Wed, 16 Dec 2015 04:18:32 +0000 (20:18 -0800)]
Import translations. DO NOT MERGE
Change-Id: I72a2242dff4a0d0c661bcdbc2ed2cca8dc38a89e
Auto-generated-cl: translation import
Adam Lesinski [Wed, 16 Dec 2015 00:05:41 +0000 (00:05 +0000)]
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev am:
1d6d4c5a69
am:
d5808d0d35
* commit '
d5808d0d356c5c7263f1ad0982a221c7a0f1df07':
DO NOT MERGE: Fix batterystats battery level int packing
Adam Lesinski [Tue, 15 Dec 2015 23:57:13 +0000 (23:57 +0000)]
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
am:
1d6d4c5a69
* commit '
1d6d4c5a695051ccb9b455306b155bad5d6f136a':
DO NOT MERGE: Fix batterystats battery level int packing
Adam Lesinski [Tue, 15 Dec 2015 23:52:43 +0000 (23:52 +0000)]
Merge "DO NOT MERGE: Fix batterystats battery level int packing" into mnc-dr1.5-dev
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
DO NOT MERGE: Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
(cherry picked from commit
6902052c77bbcb9078b4ced243874f67542f64f9)
Adam Lesinski [Tue, 15 Dec 2015 22:07:53 +0000 (22:07 +0000)]
Use wakeup reason when FingerPrint sensor wakes up the device am:
9289560aa0
am:
7197bb49a7
* commit '
7197bb49a73248798dd7d825927e6c849cb1255c':
Use wakeup reason when FingerPrint sensor wakes up the device
Adam Lesinski [Tue, 15 Dec 2015 22:01:03 +0000 (22:01 +0000)]
Use wakeup reason when FingerPrint sensor wakes up the device
am:
9289560aa0
* commit '
9289560aa0d195dfed67dab05811114bc7bc88a9':
Use wakeup reason when FingerPrint sensor wakes up the device
Adam Lesinski [Wed, 4 Nov 2015 00:31:25 +0000 (16:31 -0800)]
Use wakeup reason when FingerPrint sensor wakes up the device
PowerManager can log into BatteryStats the reason for the device being
woken up. This change has the Fingerprint controller report the reason
instead of a default non-descriptive 'wakeUp' reason.
Bug:
26209577
Change-Id: I12d80682dad888add139cca586d4b948e9d546e5
(cherry picked from commit
5bcb8bb31ab6688dff432cb7bd20fe69016c7003)
Bryce Lee [Tue, 15 Dec 2015 00:11:06 +0000 (00:11 +0000)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag. am:
4614596a39 am:
36393a5674
am:
4ab8b0696a
* commit '
4ab8b0696a4383b7dec2fc2dc4f17596bcd9216a':
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
Bryce Lee [Mon, 14 Dec 2015 23:57:38 +0000 (23:57 +0000)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag. am:
4614596a39
am:
36393a5674
* commit '
36393a5674bf50b351b5961a194ce2814ca00140':
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
Bryce Lee [Mon, 14 Dec 2015 23:43:54 +0000 (23:43 +0000)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
am:
4614596a39
* commit '
4614596a395b6c86fff3f35a07edda2e848d743c':
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
Bryce Lee [Mon, 14 Dec 2015 22:39:10 +0000 (14:39 -0800)]
Allow access to deprecated LOCK_PATTERN_ENABLED flag.
It is possible that older platforms may have not cleared the lock pattern,
but instead only checked this flag to determine the lock pattern enabled
state. In such cases, upgrading to a platform with that only checks the
lock pattern can lead to the lock screen being re-enabled by accident.
These new methods allow this condition to be identified and resolved.
Bug:
26029690
Change-Id: I8f7ebc0e1915049afe49c219c87010aa38a16244
Greg Hackmann [Mon, 14 Dec 2015 21:37:30 +0000 (13:37 -0800)]
Merge "Trace SQLite operations"
am:
6fe06606c4
* commit '
6fe06606c4df39487d240cc1fa4ac6d944b33137':
Trace SQLite operations
Greg Hackmann [Mon, 14 Dec 2015 21:12:52 +0000 (21:12 +0000)]
Merge "Trace SQLite operations"
Greg Hackmann [Mon, 1 Dec 2014 22:31:21 +0000 (14:31 -0800)]
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>
Chad Brubaker [Mon, 14 Dec 2015 19:57:29 +0000 (11:57 -0800)]
Merge "Use the application\'s usesCleartextTraffic flag"
am:
d16f5f121e
* commit '
d16f5f121e560d9f18411cbdd3fa4fb48681c0c2':
Use the application's usesCleartextTraffic flag
Chad Brubaker [Mon, 14 Dec 2015 19:55:05 +0000 (11:55 -0800)]
Merge "Check for null hostnames in RootTrustManager"
am:
49ce7dc2ba
* commit '
49ce7dc2baa9ee867fc7b78301c65fab2168a9b2':
Check for null hostnames in RootTrustManager
Chad Brubaker [Mon, 14 Dec 2015 19:31:08 +0000 (19:31 +0000)]
Merge "Use the application's usesCleartextTraffic flag"
Chad Brubaker [Mon, 14 Dec 2015 19:30:44 +0000 (19:30 +0000)]
Merge "Check for null hostnames in RootTrustManager"
Svetoslav Ganov [Mon, 14 Dec 2015 18:08:07 +0000 (10:08 -0800)]
Merge "Change signature|system permissions to signature|privileged"
am:
cfed01af4b
* commit '
cfed01af4bea6ff9025c31fbe3ed973f47529484':
Change signature|system permissions to signature|privileged
Michael Wright [Mon, 14 Dec 2015 17:54:02 +0000 (09:54 -0800)]
Merge "Customize auto-brightness parameters"
am:
a3931897fd
* commit '
a3931897fd4f8196288e37c712ab5490d846cb38':
Customize auto-brightness parameters
Svetoslav Ganov [Mon, 14 Dec 2015 17:53:15 +0000 (17:53 +0000)]
Merge "Change signature|system permissions to signature|privileged"
Michael Wright [Mon, 14 Dec 2015 17:38:58 +0000 (17:38 +0000)]
Merge "Customize auto-brightness parameters"
Julia Reynolds [Mon, 14 Dec 2015 17:13:56 +0000 (09:13 -0800)]
Merge "Fix volume expand arrow to be displayed correctly"
am:
caf1972dee
* commit '
caf1972dee1a63dcab130f9af1d066d6af9c38c2':
Fix volume expand arrow to be displayed correctly
Zoran Jovanovic [Thu, 10 Dec 2015 16:01:16 +0000 (17:01 +0100)]
Customize auto-brightness parameters
Auto-brightness parameters are device dependent so they should be
configurable.
The common issue with original values manifests as the screen being
perceived as too bright in dark rooms with minimum brightness and
also laginess on backlight change.
Change-Id: I2b040608bca73a3397c65c24d3b28a1514499ae6
Julia Reynolds [Mon, 14 Dec 2015 16:39:49 +0000 (16:39 +0000)]
Merge "Fix volume expand arrow to be displayed correctly"
Alexander Toresson [Mon, 14 Dec 2015 15:10:04 +0000 (16:10 +0100)]
Fix volume expand arrow to be displayed correctly
Sometimes, the volume control expand arrow would be displayed
incorrectly. When different apps use different volume controls and
force different orientations, the position of the arrow (expand button)
will not be updated correctly. When this happens the arrow cannot be
pressed and the volume settings cannot be expanded.
The underlying reason is that onLayoutChange only compares the old
dimensions of a view with the new dimensions, which doesn't take into
account that the last time onLayoutChange was run it may have been run
for a different view (a different volume control), in which case the
dimensions of the new view may not have changed, but the arrow needs to
be repositioned anyway as it needs to be positioned in relation to
another view.
Fix this problem by storing the last stream (volume control) that the
arrow was positioned in relation to, and checking if we're positioning
in relation to the same stream the next time the position of the arrow
is updated.
Change-Id: Id23e7605d50857292e09c1909b3e27f01bdf5e22
Yury Zhauniarovich [Sun, 13 Dec 2015 17:01:03 +0000 (20:01 +0300)]
Change signature|system permissions to signature|privileged
Permission protection level changed from signature|system,
which is deprecated to signature|privileged.
Change-Id: I697723221617f8c12255d6911d34cd1bf96eff8b
Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
Ian Pedowitz [Sat, 12 Dec 2015 01:18:51 +0000 (17:18 -0800)]
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.
Ian Pedowitz [Sat, 12 Dec 2015 01:12:35 +0000 (17:12 -0800)]
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.
Ian Pedowitz [Sat, 12 Dec 2015 01:06:43 +0000 (01:06 +0000)]
Merge "DO NOT MERGE Remove more extras during notification lightening." into mnc-dr1.5-dev
Dan Sandler [Tue, 8 Dec 2015 20:42:41 +0000 (15:42 -0500)]
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
5012853de26eac023deda82d138a35677fe6117b
Bug:
26038546
Change-Id: I00eadd2b23dfc4fccf42332df658373bb05b8a45
John Reck [Fri, 11 Dec 2015 20:48:28 +0000 (12:48 -0800)]
Merge "Fix memory leak in HWUI"
am:
85b010b826
* commit '
85b010b826129cd1a2090daa533e843b5573aea4':
Fix memory leak in HWUI
Dimitry Ivanov [Fri, 11 Dec 2015 20:41:22 +0000 (12:41 -0800)]
Merge "Use nativeloader to load NativeActivity"
am:
317456bc52
* commit '
317456bc520549cbc1ac4ad102df8b0d22b22a99':
Use nativeloader to load NativeActivity
John Reck [Fri, 11 Dec 2015 20:37:36 +0000 (20:37 +0000)]
Merge "Fix memory leak in HWUI"
Chad Brubaker [Fri, 11 Dec 2015 20:35:11 +0000 (12:35 -0800)]
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
Dimitry Ivanov [Fri, 11 Dec 2015 20:30:32 +0000 (20:30 +0000)]
Merge "Use nativeloader to load NativeActivity"
Christopher Tate [Fri, 11 Dec 2015 19:50:22 +0000 (11:50 -0800)]
Don\'t back up / restore EAP network definitions am:
a89f9d93cb
am:
d735fbb3af
* commit '
d735fbb3af31f43a5bc99c52b61b20b7218b076f':
Don't back up / restore EAP network definitions
Christopher Tate [Fri, 11 Dec 2015 19:37:19 +0000 (11:37 -0800)]
Don\'t back up / restore EAP network definitions
am:
a89f9d93cb
* commit '
a89f9d93cbda665259812e990bca1045bd8abf9f':
Don't back up / restore EAP network definitions
Dmitriy Ivanov [Sun, 15 Nov 2015 22:58:36 +0000 (14:58 -0800)]
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
Chad Brubaker [Fri, 11 Dec 2015 18:16:26 +0000 (10:16 -0800)]
Merge "Add null check to getConfigForHostname"
am:
fe1eac7a19
* commit '
fe1eac7a19b827af71c503df6aefc59076a30928':
Add null check to getConfigForHostname
Chad Brubaker [Fri, 11 Dec 2015 18:02:34 +0000 (18:02 +0000)]
Merge "Add null check to getConfigForHostname"
Sangkyu Lee [Fri, 11 Dec 2015 07:05:10 +0000 (16:05 +0900)]
Fix memory leak in HWUI
std::unique_ptr::release just releases the ownership of the
managed object. To delete the object, std::unique_ptr::reset
function should be called.
Change-Id: If65f74085b1fc2be3a9fffc433326e0bcdb40ff3
Chad Brubaker [Fri, 11 Dec 2015 02:32:40 +0000 (18:32 -0800)]
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
Christopher Tate [Wed, 18 Nov 2015 02:01:52 +0000 (18:01 -0800)]
Don't back up / restore EAP network definitions
Bug
25725016
Cherrypick from AOSP.
Change-Id: I6aa11a76e7724a0aaad05a1aa074afa2c429370c
Chad Brubaker [Fri, 11 Dec 2015 02:12:59 +0000 (18:12 -0800)]
Add null check to getConfigForHostname
bug:
26144676
Change-Id: I18f50940846f1ce8109560c63ce2a87ce084d9e5
Dianne Hackborn [Fri, 11 Dec 2015 00:33:14 +0000 (16:33 -0800)]
Work on issue #
25467052: System lagged out am:
022c748f54
am:
9ba6eb9989
* commit '
9ba6eb9989b90691c45017be08b1ee453c370424':
Work on issue #
25467052: System lagged out
Dianne Hackborn [Fri, 11 Dec 2015 00:26:55 +0000 (16:26 -0800)]
Work on issue #
25467052: System lagged out
am:
022c748f54
* commit '
022c748f54626f77f01079595a0100d1d145f383':
Work on issue #
25467052: System lagged out
Dianne Hackborn [Wed, 4 Nov 2015 20:32:45 +0000 (12:32 -0800)]
Work on issue #
25467052: System lagged out
Add a new mechanism where we retain previously used provided
processes in the "last activity" oom adj state for 20 seconds,
before allowing them to fall down to a regular cached process.
This should help reduce thrashing when something is acquiring
and releasing a provider repeatedly.
Change-Id: I889472de7bb4da574b46f07e36a99978813643cb
Adam Lesinski [Thu, 10 Dec 2015 22:54:38 +0000 (14:54 -0800)]
Prevent DivideByZero error in BatteryStatsImpl am:
ba88e68fe4
am:
4e4ff058c1
* commit '
4e4ff058c1a0b4b77f468a206a790bb6f084f616':
Prevent DivideByZero error in BatteryStatsImpl
Adam Lesinski [Thu, 10 Dec 2015 22:47:09 +0000 (14:47 -0800)]
Prevent DivideByZero error in BatteryStatsImpl
am:
ba88e68fe4
* commit '
ba88e68fe47b66f1fc5d10c15f04f20fe662399e':
Prevent DivideByZero error in BatteryStatsImpl
Matthew Williams [Thu, 10 Dec 2015 18:16:19 +0000 (10:16 -0800)]
Merge "ConcurrentModificationException in SyncManager"
am:
7e4d92fbc7
* commit '
7e4d92fbc7761d561c1bc61dc5cf55b69d3a54f3':
ConcurrentModificationException in SyncManager
Matthew Williams [Thu, 10 Dec 2015 18:04:44 +0000 (18:04 +0000)]
Merge "ConcurrentModificationException in SyncManager"
Adam Lesinski [Tue, 8 Dec 2015 20:06:55 +0000 (12:06 -0800)]
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
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
振淦王 [Tue, 1 Dec 2015 08:37:31 +0000 (16:37 +0800)]
ConcurrentModificationException in SyncManager
updateRunningAccounts and dispatchSyncOperation is running in different thread,
and mActiveSyncContexts not synchronization.
If methods occur together,
mActiveSyncContexts change may occur when cycle is running.
Sample:
https://code.google.com/p/android/issues/detail?id=195341
Solution:
Offboard the traversal from the main thread to the handler thread.
Change-Id: Ifb9fbb466a5087186be31f7877c50b8c8b6737e4
Signed-off-by: wangzhengan <wangzglx@gmail.com>
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