OSDN Git Service
Narayan Kamath [Tue, 3 Jun 2014 13:24:34 +0000 (13:24 +0000)]
am
032c5c05: Merge "Log process abis during start."
* commit '
032c5c054c331b63f2d45ee9c497ac852faec633':
Log process abis during start.
Narayan Kamath [Tue, 3 Jun 2014 09:57:02 +0000 (09:57 +0000)]
Merge "Log process abis during start."
Mike Lockwood [Mon, 2 Jun 2014 18:28:51 +0000 (18:28 +0000)]
am
8868d129: am
1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '
8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Mike Lockwood [Mon, 2 Jun 2014 18:28:42 +0000 (18:28 +0000)]
am
750e78bb: am
27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '
750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
Mike Lockwood [Mon, 2 Jun 2014 18:25:35 +0000 (18:25 +0000)]
am
1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '
1c725866da02c3e1f62fb416ea3450caed406f2a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Mike Lockwood [Mon, 2 Jun 2014 18:25:28 +0000 (18:25 +0000)]
am
27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '
27eb205e21e7715764084085f382d690e0406c63':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
Mike Lockwood [Mon, 2 Jun 2014 18:21:17 +0000 (18:21 +0000)]
Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
Mike Lockwood [Mon, 2 Jun 2014 18:20:39 +0000 (18:20 +0000)]
Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
Andrew Solovay [Mon, 2 Jun 2014 17:02:52 +0000 (17:02 +0000)]
am
164ecfaa: am
be9bf634: am
a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs
* commit '
164ecfaa4106952ab77631353d2a94ae13f3c03a':
docs: Added Sony Mobile Communications to the USB Vendor ID table.
Andrew Solovay [Mon, 2 Jun 2014 16:59:43 +0000 (16:59 +0000)]
am
be9bf634: am
a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs
* commit '
be9bf6344c45f68314e3de9e8712c86bd3d0b1e8':
docs: Added Sony Mobile Communications to the USB Vendor ID table.
Andrew Solovay [Mon, 2 Jun 2014 16:56:30 +0000 (16:56 +0000)]
am
a68757bb: Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs
* commit '
a68757bb3edfa7b55a349e0b00551a22b6ef9be5':
docs: Added Sony Mobile Communications to the USB Vendor ID table.
Andrew Solovay [Mon, 2 Jun 2014 16:53:46 +0000 (16:53 +0000)]
Merge "docs: Added Sony Mobile Communications to the USB Vendor ID table." into klp-docs
Martin Blumenstingl [Sat, 31 May 2014 13:53:00 +0000 (15:53 +0200)]
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
Martin Blumenstingl [Sat, 31 May 2014 13:50:38 +0000 (15:50 +0200)]
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().
Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
Nick Kralevich [Sat, 31 May 2014 08:51:05 +0000 (08:51 +0000)]
am
daa0ee13: am
4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."
* commit '
daa0ee137d43850c834b1ead3f871ceaa49814a7':
SELinuxMMAC additions to perform policy versioning checks.
Nick Kralevich [Sat, 31 May 2014 08:49:50 +0000 (08:49 +0000)]
am
89b88f22: am
3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."
* commit '
89b88f226928e269e84100154bc78c0f8dc2016e':
Allow SELinuxPolicyInstallReceiver to update new policy files.
Nick Kralevich [Sat, 31 May 2014 05:27:46 +0000 (05:27 +0000)]
am
4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."
* commit '
4f8785f28e6305d427cc3e483248828c9b9b06a2':
SELinuxMMAC additions to perform policy versioning checks.
Nick Kralevich [Sat, 31 May 2014 05:25:14 +0000 (05:25 +0000)]
Merge "SELinuxMMAC additions to perform policy versioning checks."
Nick Kralevich [Sat, 31 May 2014 05:09:37 +0000 (05:09 +0000)]
am
3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."
* commit '
3a9835d4914bc959a37eefecf4d5d0d20852e3e7':
Allow SELinuxPolicyInstallReceiver to update new policy files.
Nick Kralevich [Sat, 31 May 2014 05:07:12 +0000 (05:07 +0000)]
Merge "Allow SELinuxPolicyInstallReceiver to update new policy files."
Elliott Hughes [Sat, 31 May 2014 02:29:47 +0000 (02:29 +0000)]
am
79067b3c: am
5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '
79067b3cb2f43e62b9a4d46082fb01cbcc513990':
Move frameworks/base off private libcore.ICU API.
Elliott Hughes [Sat, 31 May 2014 02:26:36 +0000 (02:26 +0000)]
am
5568e0e4: Merge "Move frameworks/base off private libcore.ICU API."
* commit '
5568e0e45fff7ffe5061770cb527b22d09cf5519':
Move frameworks/base off private libcore.ICU API.
Elliott Hughes [Sat, 31 May 2014 02:22:24 +0000 (02:22 +0000)]
Merge "Move frameworks/base off private libcore.ICU API."
Elliott Hughes [Sat, 31 May 2014 02:20:20 +0000 (19:20 -0700)]
Move frameworks/base off private libcore.ICU API.
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
Andrew Solovay [Fri, 30 May 2014 22:43:54 +0000 (22:43 +0000)]
am
305f3e21: am
79d3b623: am
b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs
* commit '
305f3e216a52af44e1296795803afe4ce17797ca':
docs: Removed reference to draft apps.
Andrew Solovay [Fri, 30 May 2014 22:39:35 +0000 (22:39 +0000)]
am
79d3b623: am
b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs
* commit '
79d3b623fdcbac0dd47e526d66688227e4559d11':
docs: Removed reference to draft apps.
Andrew Solovay [Fri, 30 May 2014 22:34:57 +0000 (22:34 +0000)]
am
b9c5af3a: Merge "docs: Removed reference to draft apps." into klp-docs
* commit '
b9c5af3aef8591daef88c780f07b04a2d65ee895':
docs: Removed reference to draft apps.
Andrew Solovay [Fri, 30 May 2014 22:32:11 +0000 (22:32 +0000)]
Merge "docs: Removed reference to draft apps." into klp-docs
Andrew Solovay [Fri, 30 May 2014 22:15:49 +0000 (15:15 -0700)]
docs: Added Sony Mobile Communications to the USB Vendor ID table.
Doc is staged to:
http://asolovay.mtv:9022/tools/device.html#VendorIds
bug:
15001692
Change-Id: I718679e396b076a370d2b7c3ecad2650274cacd1
Andrew Solovay [Thu, 29 May 2014 22:26:58 +0000 (15:26 -0700)]
docs: Removed reference to draft apps.
When appropriate, changed references to "draft" apps to alpha and beta apps.
Left the "draft" info in the deprecated file v2/billing_integrate.jd, but
added a note that draft apps are no longer supported.
Docs are staged to:
in-app billing:
http://asolovay.mtv:9011/google/play/billing/billing_admin.html
http://asolovay.mtv:9011/google/play/billing/billing_testing.html
http://asolovay.mtv:9011/google/play/billing/v2/billing_integrate.html
(deprecated doc; just noted that draft is no longer supported)
LVL:
http://asolovay.mtv:9011/google/play/licensing/overview.html
http://asolovay.mtv:9011/google/play/licensing/licensing-reference.html
OBBs
http://asolovay.mtv:9011/google/play/expansion-files.html
As per a request from Dirk, I added a section to the "Testing In-App
Billing" page noting that draft apps are no longer supported, and
linking to the section on alpha and beta channels; I put in a link
to the new section in each place where we'd previously talked about
draft apps.
Also fixed formatting in a few code samples, where over-long lines were
forcing the code box to use a scroll bar.
bug:
15013770
Change-Id: I1368b9b5ebf2a0c22f84fcbcd5f37401b390c423
Robert Shih [Fri, 30 May 2014 18:05:35 +0000 (18:05 +0000)]
am
a034dac7: android_media_MediaMuxer_setLocation: amended signature.
* commit '
a034dac7be0658e59c73a880e958cab3c723323b':
android_media_MediaMuxer_setLocation: amended signature.
Chris Craik [Fri, 30 May 2014 18:03:32 +0000 (18:03 +0000)]
am
4d31c547: am
ce7fa780: Merge "Fix a resource race bug in PathCache"
* commit '
4d31c5474bcc4bcc6a6d8dfe232360dad701a3fc':
Fix a resource race bug in PathCache
Chris Craik [Fri, 30 May 2014 17:59:51 +0000 (17:59 +0000)]
am
ce7fa780: Merge "Fix a resource race bug in PathCache"
* commit '
ce7fa780cdee2730b570cc34066f15c74d44e6ef':
Fix a resource race bug in PathCache
Chris Craik [Fri, 30 May 2014 17:56:42 +0000 (17:56 +0000)]
Merge "Fix a resource race bug in PathCache"
Robert Shih [Wed, 5 Feb 2014 18:42:01 +0000 (10:42 -0800)]
android_media_MediaMuxer_setLocation: amended signature.
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.
Bug:
15337287
Bug:
12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
(cherry picked from commit
3cb78498d3f664f541ba7d28f4543cf8c12733f1)
Narayan Kamath [Fri, 30 May 2014 10:49:00 +0000 (10:49 +0000)]
am
b9b31f4b: am
bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit '
b9b31f4b8eda123e7b544d1a0fa886576064adca':
Support an ABI flag for instrumentation.
Narayan Kamath [Fri, 30 May 2014 10:41:24 +0000 (10:41 +0000)]
am
bd4d3203: Merge "Support an ABI flag for instrumentation."
* commit '
bd4d320344833ce67dad3a4e10a61d0502a81d0e':
Support an ABI flag for instrumentation.
Narayan Kamath [Fri, 30 May 2014 10:35:27 +0000 (10:35 +0000)]
Merge "Support an ABI flag for instrumentation."
yuyang [Tue, 27 May 2014 08:15:02 +0000 (16:15 +0800)]
Fix a resource race bug in PathCache
When enabled defer rendering, it will do precache for DrawPathOp.
The paint used for creating PathTask in precache just get the address
of mFilteredPaint of OpenGLRenderer. So for the following defer
operation like DrawTextOp has possibility change the mFilteredPaint
by getPaint while another WorkerThread in PathCache is using the paint
which pointed to the same address of mFilteredPaint to generate bitmap.
As a result, it will generate a wrong bitmap for generateTexture in
PathCache. To fix it, do a copy of paint when creating PathTask.
CRs-Fixed: 664244
Change-Id: I5516f5b143458b88d3573d15b7ebb34f688800c7
Jeff Brown [Fri, 30 May 2014 01:01:17 +0000 (01:01 +0000)]
am
aeb4e071: Merge "Add dumpsys to dock observer." into klp-modular-dev
* commit '
aeb4e071abb100d10c39d154b05c2911d399395d':
Add dumpsys to dock observer.
Jeff Brown [Fri, 30 May 2014 00:58:54 +0000 (00:58 +0000)]
Merge "Add dumpsys to dock observer." into klp-modular-dev
Jeff Brown [Fri, 30 May 2014 00:48:33 +0000 (17:48 -0700)]
Add dumpsys to dock observer.
Minor refactoring of dock observer to allow its state to be
inspected and modified via dumpsys for debugging purposes.
eg. View current state.
adb shell dumpsys DockObserver
eg. Simulate being docked.
adb shell dumpsys DockObserver set state 1
eg. Reset back to normal.
adb shell dumpsys DockObserver reset
Change-Id: Ie48db775290ebed9aa4d9d9d5ac5a6fcb6122ac9
Scott Main [Thu, 29 May 2014 22:59:54 +0000 (22:59 +0000)]
am
d897fb53: am
e16e367f: am
5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-
* commit '
d897fb533317655a96aa6b38240a85b2093c90e4':
change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
Scott Main [Thu, 29 May 2014 22:54:03 +0000 (22:54 +0000)]
am
e16e367f: am
5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs
* commit '
e16e367f778b9c3dbdb87ed8ea293f12db97514a':
change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
Scott Main [Thu, 29 May 2014 22:42:14 +0000 (22:42 +0000)]
am
5ca630e8: Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs
* commit '
5ca630e85541b97245d114162772abc4ffd77e97':
change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues.
Scott Main [Thu, 29 May 2014 22:33:23 +0000 (22:33 +0000)]
Merge "change all the H1 tags to H2s and delete all HR tags then delete all clearflots, because they add useless whitespace once the "headerLine" class is obsolete THEN, cleanup some HTML to fix float clearance issues." into klp-docs
Narayan Kamath [Thu, 29 May 2014 17:04:57 +0000 (18:04 +0100)]
Log process abis during start.
Adds to the info log that the activity manager emits
during every app launch.
Change-Id: Icd442334cb0e0e0fd0cc529c6b9c315a47d4aadc
Wink Saville [Thu, 29 May 2014 09:56:24 +0000 (09:56 +0000)]
am
52b41462: am
9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change."
* commit '
52b4146273ea29f6d1ed89e4de79f2d7ff0d71dc':
Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
Griff Hazen [Thu, 29 May 2014 06:34:01 +0000 (06:34 +0000)]
am
339f437d: Additional doc fixes for WearableExtender
* commit '
339f437dc3f7c474d9cf1f963819bab2596e6ad3':
Additional doc fixes for WearableExtender
Wink Saville [Thu, 29 May 2014 04:57:25 +0000 (04:57 +0000)]
am
9cd3ff7d: Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change."
* commit '
9cd3ff7d61ed65e8b815155747e7bbfc99c1e861':
Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
Wink Saville [Thu, 29 May 2014 04:53:52 +0000 (04:53 +0000)]
Merge "Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change."
Zhang Wei-e7976c [Fri, 31 Jan 2014 23:18:42 +0000 (15:18 -0800)]
Introduce a new event: EVENT_DATA_RAT_CHANGED which is used to indicate data rat change.
Change-Id: Ibe9e68295661f2f2ffaca3057d696df6a1db3f0c
Brian Carlstrom [Wed, 28 May 2014 23:10:53 +0000 (16:10 -0700)]
resolved conflicts for merge of
452c5921 to klp-modular-dev-plus-aosp
Change-Id: I6044604b431eed0319579a1a3b9213c9a0aaf678
Brian Carlstrom [Wed, 28 May 2014 22:31:39 +0000 (22:31 +0000)]
am
197565e0: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
197565e0e800be3c731e679914f40afa1aab98fd':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:39 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry-picked from commit
2ef5abb8d534f016582d6023054cbe69d8114b6b)
Change-Id: Icd91982c09076e87092906106cbff4a81589e8de
Elliott Hughes [Wed, 28 May 2014 21:48:46 +0000 (21:48 +0000)]
am
df0e9ed5: am
862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
* commit '
df0e9ed5536e2cab860f3ecf9dab0030a471766e':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Wed, 28 May 2014 21:41:30 +0000 (21:41 +0000)]
am
862be912: Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
* commit '
862be91276ec9532b3ed00d43fc7a750f1e6adb0':
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
Elliott Hughes [Wed, 28 May 2014 21:36:32 +0000 (21:36 +0000)]
Merge "Updated Trace.h to recognize ATRACE_TAG_BIONIC."
Brigid Smith [Wed, 28 May 2014 21:13:41 +0000 (14:13 -0700)]
Updated Trace.h to recognize ATRACE_TAG_BIONIC.
Bug:
15116468
Change-Id: I6aef941c6b6bd59347855f7265e701a3aaa08edc
Griff Hazen [Wed, 28 May 2014 16:13:05 +0000 (09:13 -0700)]
Additional doc fixes for WearableExtender
Change-Id: I3764e4d97c0007b905ff0f3eb553234668fd50e1
Narayan Kamath [Wed, 28 May 2014 09:23:21 +0000 (09:23 +0000)]
am
98993813: am
b75b3aaa: Merge "Build PacProcessor for 64 bit."
* commit '
98993813b31f20c27f2c0a91daebdaedc382bb5b':
Build PacProcessor for 64 bit.
Narayan Kamath [Wed, 28 May 2014 08:48:23 +0000 (08:48 +0000)]
am
b75b3aaa: Merge "Build PacProcessor for 64 bit."
* commit '
b75b3aaac4f0282a99bb4486b5dce51a87bc0dd7':
Build PacProcessor for 64 bit.
Narayan Kamath [Wed, 28 May 2014 08:44:36 +0000 (08:44 +0000)]
Merge "Build PacProcessor for 64 bit."
Griff Hazen [Wed, 28 May 2014 00:18:03 +0000 (00:18 +0000)]
am
a9cb1e66: Add full screen size preset to WearableExtender
* commit '
a9cb1e66737f816d643bca03832af719cbdd0f20':
Add full screen size preset to WearableExtender
Griff Hazen [Tue, 27 May 2014 22:44:28 +0000 (22:44 +0000)]
am
6f72ac5d: Doc fixes for Notification.WearableExtender
* commit '
6f72ac5d5f4b7bae34bb3dab7821f3dbcbf02bcd':
Doc fixes for Notification.WearableExtender
Griff Hazen [Tue, 27 May 2014 22:40:09 +0000 (15:40 -0700)]
Add full screen size preset to WearableExtender
For custom display notifications.
Bug:
14838838
Change-Id: Id038d994d61d3c89dba08232a424a5b1b934e5db
Griff Hazen [Mon, 26 May 2014 16:07:14 +0000 (09:07 -0700)]
Doc fixes for Notification.WearableExtender
Change-Id: I22947e30d329e667079555ac4ac5f9b25d6bd3fa
Etienne Le Grand [Tue, 27 May 2014 18:06:13 +0000 (18:06 +0000)]
am
d7439d8c: Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
* commit '
d7439d8c59e4c5a82ad94a5080436cc94f72e0be':
Add confidence to the heart rate monitor definition and clarify onAccuracyChange
Etienne Le Grand [Tue, 27 May 2014 18:03:13 +0000 (18:03 +0000)]
Merge "Add confidence to the heart rate monitor definition and clarify onAccuracyChange" into klp-modular-dev
Craig Mautner [Tue, 27 May 2014 16:22:39 +0000 (16:22 +0000)]
am
1b4bf857: Do not start tasks on ActivityViews unless explicit
* commit '
1b4bf857d34dc58a4ef84f5f0761bb7685051fbb':
Do not start tasks on ActivityViews unless explicit
Craig Mautner [Mon, 26 May 2014 22:06:32 +0000 (15:06 -0700)]
Do not start tasks on ActivityViews unless explicit
New tasks were being started on ActivityViews because they
matched packages. This fix enforces a rule that new tasks
can only be started on ActivityViews if they are explicitly
targeted for that ActivityView.
Fixes bug
15162447.
Change-Id: I9ccb72171b5cda0897a0b9ffe4cbebfbb0d92c2c
Narayan Kamath [Tue, 27 May 2014 16:06:18 +0000 (17:06 +0100)]
Build PacProcessor for 64 bit.
external/chromium-libpac can now build for 64 bit.
Change-Id: I0bfd068ef4ea7d57686f11b79c32803e38bab719
Narayan Kamath [Tue, 27 May 2014 11:06:03 +0000 (11:06 +0000)]
am
34c6cb4c: am
6b5beb31: Merge "PacProccesor: Only build for 32-bit"
* commit '
34c6cb4c1af7a7dd8f8658dd401c74076943ffb8':
PacProccesor: Only build for 32-bit
Narayan Kamath [Tue, 27 May 2014 11:00:48 +0000 (11:00 +0000)]
am
6b5beb31: Merge "PacProccesor: Only build for 32-bit"
* commit '
6b5beb318b439b0b3aeabf42401bfed63bfbe2e2':
PacProccesor: Only build for 32-bit
Narayan Kamath [Tue, 27 May 2014 10:57:20 +0000 (10:57 +0000)]
Merge "PacProccesor: Only build for 32-bit"
Andreas Gampe [Fri, 18 Apr 2014 23:10:25 +0000 (16:10 -0700)]
PacProccesor: Only build for 32-bit
PacProcessor relies on libpac from chromium, which is not built
for 64b right now.
(cherry picked from commit
f8749200c06a8714ffd46f5e2ec81be57ad4f7f4)
Change-Id: Ic128e17b7437c130df29eeab3293b9c01f01d70b
Etienne Le Grand [Fri, 16 May 2014 19:21:41 +0000 (12:21 -0700)]
Add confidence to the heart rate monitor definition and clarify onAccuracyChange
Change-Id: I686d07dcd603bf3c3be3c1471de8be3b4e240855
Scott Main [Fri, 23 May 2014 21:57:57 +0000 (21:57 +0000)]
am
e5c9c92c: am
a4c95869: am
1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs
* commit '
e5c9c92c23196269ccf50024f76f84779b821c32':
add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
Scott Main [Fri, 23 May 2014 21:52:43 +0000 (21:52 +0000)]
am
a4c95869: am
1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs
* commit '
a4c95869ed2727ecc471e218b204657b7eaf8b5c':
add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
Scott Main [Fri, 23 May 2014 21:49:15 +0000 (21:49 +0000)]
am
1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs
* commit '
1f1bb9d06830552269c68bf3bd1e7184f1a7bb9d':
add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
Scott Main [Fri, 23 May 2014 21:45:32 +0000 (21:45 +0000)]
Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs
Eric Laurent [Fri, 23 May 2014 21:41:47 +0000 (21:41 +0000)]
am
b928b7c2: am
ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit '
b928b7c2bf12a5dbd31b08d244b0ff8d2a9851c1':
AudioService: fix cross deadlock in VolumeStreamState
Eric Laurent [Fri, 23 May 2014 21:37:54 +0000 (21:37 +0000)]
am
ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
* commit '
ba64d298bee228b8e27ea17fb31fbff4b4188304':
AudioService: fix cross deadlock in VolumeStreamState
Eric Laurent [Fri, 23 May 2014 21:34:25 +0000 (21:34 +0000)]
Merge "AudioService: fix cross deadlock in VolumeStreamState"
Eric Laurent [Mon, 12 May 2014 22:26:12 +0000 (15:26 -0700)]
AudioService: fix cross deadlock in VolumeStreamState
Synchronize modifications of volume index by VolumeStreamState
class mutex instead of using synchronized methods.
This avoids possible cross deadlock when modifying volume on
two stream types simultaneously and one is slave to the other.
Bug:
13730145.
Change-Id: I13406c71010ce0c2e2f08f660b6101f310396c98
Griff Hazen [Fri, 23 May 2014 08:37:01 +0000 (08:37 +0000)]
am
00389a46: Fix build: CheckBuild line for removed wearable package
* commit '
00389a46ea6c9d1a9557fe648ffec64aaf5e95e0':
Fix build: CheckBuild line for removed wearable package
Griff Hazen [Fri, 23 May 2014 04:51:06 +0000 (21:51 -0700)]
Fix build: CheckBuild line for removed wearable package
Change-Id: I26e39dc11add182e07bcc13456a166c86c911210
Dmitriy Ivanov [Fri, 23 May 2014 02:40:42 +0000 (02:40 +0000)]
am
2137d6a8: am
d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '
2137d6a843b82996e08f0e03376e48860919d8bc':
Increase start timeout for wrapped process
Dmitriy Ivanov [Fri, 23 May 2014 02:35:42 +0000 (02:35 +0000)]
am
d5ee4144: Merge "Increase start timeout for wrapped process"
* commit '
d5ee4144c4beae54219e1b8eb10418b02dd4a63b':
Increase start timeout for wrapped process
Dmitriy Ivanov [Fri, 23 May 2014 02:31:37 +0000 (02:31 +0000)]
Merge "Increase start timeout for wrapped process"
Christopher Tate [Fri, 23 May 2014 02:27:17 +0000 (02:27 +0000)]
am
d6d7587a: am
a0166b58: Merge "Activity chooser "Always" button is not working"
* commit '
d6d7587ab09e4a0eae9252e11ab59ad27af68823':
Activity chooser "Always" button is not working
Christopher Tate [Fri, 23 May 2014 02:22:40 +0000 (02:22 +0000)]
am
a0166b58: Merge "Activity chooser "Always" button is not working"
* commit '
a0166b58de38e0d2d67f9d847d307cf3ce7bf633':
Activity chooser "Always" button is not working
Christopher Tate [Fri, 23 May 2014 02:17:32 +0000 (02:17 +0000)]
Merge "Activity chooser "Always" button is not working"
Andrew Solovay [Thu, 22 May 2014 22:50:45 +0000 (22:50 +0000)]
am
768a899f: am
b5960898: am
9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '
768a899f214dd2fcf4bf3857549fee81b22debc4':
doc: Updated branding guidelines per request from @deniseamling.
Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
Andrew Solovay [Thu, 22 May 2014 22:45:06 +0000 (22:45 +0000)]
am
b5960898: am
9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '
b59608981ff464b85a26987b8822913e41e72291':
doc: Updated branding guidelines per request from @deniseamling.
Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener.
Vinod Krishnan [Thu, 22 May 2014 22:44:53 +0000 (22:44 +0000)]
am
810ed89c: Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev
* commit '
810ed89c244060beefa91470e0fa3d50d679caba':
Adding activity enter/exit animations for wearables
Aravind Akella [Thu, 22 May 2014 22:44:49 +0000 (22:44 +0000)]
am
73da981f: Merge "Remove getRequiredPermission from NDK." into klp-modular-dev
* commit '
73da981fd60f9dc855a04ea53e9fff59a011577e':
Remove getRequiredPermission from NDK.
Nick Vaccaro [Thu, 22 May 2014 22:44:44 +0000 (22:44 +0000)]
am
117df282: Don\'t grab wakelock if Wifi feature not supported on device
* commit '
117df282017945f3b3f05dc43a6f436d19d3f071':
Don't grab wakelock if Wifi feature not supported on device
Griff Hazen [Thu, 22 May 2014 22:44:35 +0000 (22:44 +0000)]
am
c3104157: Api updates for wearable extensions to notifications
* commit '
c3104157d8f12238b0ac8cf6c6f963dadb44167c':
Api updates for wearable extensions to notifications