OSDN Git Service
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
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
Andrew Solovay [Thu, 22 May 2014 22:41:55 +0000 (22:41 +0000)]
am
9562863c: doc: Updated branding guidelines per request from @deniseamling.
* commit '
9562863cf184fe99be223aff9700b3ceb8559e1a':
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:39:42 +0000 (22:39 +0000)]
Merge "Adding activity enter/exit animations for wearables" into klp-modular-dev
Aravind Akella [Thu, 22 May 2014 22:01:23 +0000 (22:01 +0000)]
Merge "Remove getRequiredPermission from NDK." into klp-modular-dev
Andrew Solovay [Mon, 19 May 2014 23:45:19 +0000 (16:45 -0700)]
doc: Updated branding guidelines per request from @deniseamling.
Per her team's request, I also removed the AI version of the Google
Play Store icon, and replaced it with a high-rez PNG version.
Current version of doc is staged at:
http://asolovay.mtv:9010/distribute/tools/promote/brand.html
(Denise gave me a LGTM via email.)
Bug:
14621461
Change-Id: Id44a0dc73c7ef2f2bde595a1e98b75083d126176
Nick Vaccaro [Thu, 22 May 2014 00:19:30 +0000 (17:19 -0700)]
Don't grab wakelock if Wifi feature not supported on device
Only grab the suspend wakelock when handling screen on/off
transitions if the device actually supports Wifi.
Bug:
14250726
Change-Id: Ic332cf84e40622ab6bbe60a2288ee478f1cabb2a
Griff Hazen [Thu, 22 May 2014 21:38:36 +0000 (14:38 -0700)]
Api updates for wearable extensions to notifications
1. Move Extender outside of Builder
2. Rename apply/applyTo to extend
3. Move Wearable extenders into Notification.java
4. Collapse Builder model into single classes
5. Use Bundle for storage: no new parcelable types.
Minor fix to RemoteInput to use flags int for boolean options.
Change-Id: I40012fd0458ec103eabf75ed4c91f636e02f4c8f
Aravind Akella [Thu, 22 May 2014 20:33:52 +0000 (13:33 -0700)]
Remove getRequiredPermission from NDK.
Change-Id: Ieb1e97e44ef335e6087ba9164058fe3535e9998a
Andrew Solovay [Thu, 22 May 2014 20:23:49 +0000 (20:23 +0000)]
Merge "Noted that OnSharedPreferenceChangeListener does not store a strong reference to the listener." into klp-docs
Dmitriy Ivanov [Thu, 22 May 2014 19:40:25 +0000 (12:40 -0700)]
Increase start timeout for wrapped process
* apparently 300*1000 for valgrind is not enough
(hammerhead aosp tot).
Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
Vinod Krishnan [Tue, 20 May 2014 22:00:13 +0000 (15:00 -0700)]
Adding activity enter/exit animations for wearables
Bug:
14939877
Bug:
15022424
Change-Id: Id230066c675254a63c5222719a05f86c6b897fa5
Sebastien Hertz [Thu, 22 May 2014 14:57:28 +0000 (14:57 +0000)]
am
b2db356d: am
fc1ffe89: Merge "Report runtime information to DDMS"
* commit '
b2db356dc8514e8b7546a04907217f02cd8b19e1':
Report runtime information to DDMS
Sebastien Hertz [Thu, 22 May 2014 14:53:22 +0000 (14:53 +0000)]
am
fc1ffe89: Merge "Report runtime information to DDMS"
* commit '
fc1ffe89db4bfe51856dadead2ed9c856a96ca65':
Report runtime information to DDMS
Sebastien Hertz [Thu, 22 May 2014 14:47:13 +0000 (14:47 +0000)]
Merge "Report runtime information to DDMS"
Xiong Li [Thu, 10 Apr 2014 07:25:45 +0000 (15:25 +0800)]
Activity chooser "Always" button is not working
When ResolverActivity is created with a custom list of matching
applications (rList) as in NFC case, and the alwaysUseOption is
set to true, the prferredActivity is not saved even if the user
presses the "always" button.
When a list is provided the variable mBaseResolveList will be
!= null. This will set mOrigResolveList = null.
When an activity is choosen and one of the buttons are pressed
onIntentSelected is called. The first thing this method does
is to check mAdapter.mOrigResolveList != null, however in this
case mOrigResolveList is always null, and the value is not
saved as PreferredActivity.
This problem was introduced in
6d8dfbd8149942f25f2b9643a12f1fb38f3be834.
Change-Id: I9eac41b7861b5e68ad3978af0dc0285f2a34eb88
Sebastien Hertz [Fri, 16 May 2014 14:54:16 +0000 (16:54 +0200)]
Report runtime information to DDMS
Reports runtime's ABI and internal flags to be displayed by DDMS.
Bug:
14888999
Bug:
14888124
Change-Id: I8a2d3f22f84a093be2fbc74464af6aa7b2a2bebb
Baligh Uddin [Thu, 22 May 2014 03:11:14 +0000 (03:11 +0000)]
am
adb0a906: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
adb0a906dc71a0133b9345031dd88682e49a519a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:11 +0000 (03:11 +0000)]
am
b9c1e5a8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
b9c1e5a82947e13a10b407a1d4f81967c9af99b4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:08 +0000 (03:11 +0000)]
am
74e7e2d8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
74e7e2d844c8f3d8d8e102ad5f05cddc94b230ca':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:04 +0000 (03:11 +0000)]
am
5938757f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
5938757f5154b956f119042ee97b3ac8417a1ac2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:11:00 +0000 (03:11 +0000)]
am
675b4871: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
675b48712ecd0de46d6d3828890b8ca25f1df2bf':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 22 May 2014 03:06:13 +0000 (03:06 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:52 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:49 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:46 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Baligh Uddin [Thu, 22 May 2014 03:04:44 +0000 (03:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev
Quddus Chong [Wed, 21 May 2014 23:43:25 +0000 (23:43 +0000)]
am
b11a52cb: am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
b11a52cb6f7db5e1b78582649801632b8d32b978':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Quddus Chong [Wed, 21 May 2014 23:39:46 +0000 (23:39 +0000)]
am
a3c773e8: am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
a3c773e836dcb97c7f1045c8347dc7267bd21936':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Quddus Chong [Wed, 21 May 2014 23:23:33 +0000 (23:23 +0000)]
am
539f9e31: docs: Update the sample Gradle dependency declaration to reflect GMS K version.
* commit '
539f9e31726dc780f26901de06c35a4b2446c37a':
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Mindy Pereira [Wed, 21 May 2014 22:38:06 +0000 (22:38 +0000)]
am
a718943d: Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
* commit '
a718943d422876488f8723bfe6f35f352ffcb586':
Make a smaller cliff for dismissing cards
Mindy Pereira [Wed, 21 May 2014 21:54:37 +0000 (21:54 +0000)]
Merge "Make a smaller cliff for dismissing cards" into klp-modular-dev
Quddus Chong [Wed, 21 May 2014 21:34:56 +0000 (14:34 -0700)]
docs: Update the sample Gradle dependency declaration to reflect GMS K version.
Change-Id: I5e5c40974b2fbaf61256d320d24acf5e0e9178d6
Baligh Uddin [Wed, 21 May 2014 21:07:31 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39fc3fb7096c632d5856dca116fdacb51ca1701d
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 May 2014 20:57:22 +0000 (13:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb49ad5c4d9a81d64086f05d71e0ff769af3177e
Auto-generated-cl: translation import
Baligh Uddin [Wed, 21 May 2014 20:56:23 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d1bfc06ee6a3f8a0f75eaa37a055f0b6f887076
Auto-generated-cl: translation import
Jim Miller [Wed, 21 May 2014 20:43:18 +0000 (20:43 +0000)]
am
af103dd3: am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
af103dd39346d1bae3566cafbfcd1008bc6cef5c':
Fix crash in widget pager - DO NOT MERGE
Jim Miller [Wed, 21 May 2014 20:39:41 +0000 (20:39 +0000)]
am
911176d7: am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
911176d7e6c8ba28ed7f7be63edcb17456f615fe':
Fix crash in widget pager - DO NOT MERGE
Jim Miller [Wed, 21 May 2014 20:35:51 +0000 (20:35 +0000)]
am
607d5998: Fix crash in widget pager - DO NOT MERGE
* commit '
607d59982a046d23770a7289be6272ad5983d6ae':
Fix crash in widget pager - DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 20:24:07 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I49ddd704e0123b75945312b78c3754e112c0308d
Auto-generated-cl: translation import
narayan [Wed, 21 May 2014 20:22:03 +0000 (20:22 +0000)]
am
ab3d85ab: am
838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '
ab3d85ab1a0ae58add5df6efc30607624475405b':
Fix NPE in PackageManagerService.
Baligh Uddin [Wed, 21 May 2014 20:21:04 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6387f104f7761afe32026d821f927c15729ee76
Auto-generated-cl: translation import
narayan [Wed, 21 May 2014 20:17:52 +0000 (20:17 +0000)]
am
838b1e22: Merge "Fix NPE in PackageManagerService."
* commit '
838b1e2215cbc27e77530f4c79124c088353e0e7':
Fix NPE in PackageManagerService.
narayan [Wed, 21 May 2014 20:14:56 +0000 (20:14 +0000)]
Merge "Fix NPE in PackageManagerService."
narayan [Wed, 21 May 2014 19:54:50 +0000 (20:54 +0100)]
Fix NPE in PackageManagerService.
Check that each package from the setting has
a parsed pkg before we attempt to perform dex-opt
on it. If it doesn't have a parsed package, adjust
the ABI in the settings, but don't perform dexopt.
It will be dexopted later if it's still active
based on the setting.
bug:
15081286
Change-Id: Ifb6d1d5efdc9c59b251731972afa951ad930d05c
Vinod Krishnan [Wed, 21 May 2014 17:46:16 +0000 (17:46 +0000)]
am
4f65a545: Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
* commit '
4f65a5456159b64185bb99c193bcff93b07770f8':
Adding more DeviceDefault for CTS tests
Vinod Krishnan [Wed, 21 May 2014 17:40:06 +0000 (17:40 +0000)]
Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev
Vinod Krishnan [Wed, 21 May 2014 17:28:57 +0000 (10:28 -0700)]
Adding more DeviceDefault for CTS tests
Bug:
15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
Dan Sandler [Wed, 21 May 2014 16:26:29 +0000 (16:26 +0000)]
am
7509733c: Elide extras strings from noman dumpsys output.
* commit '
7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
Elide extras strings from noman dumpsys output.
Jeff Sharkey [Wed, 21 May 2014 16:13:18 +0000 (16:13 +0000)]
am
9ef2117f: am
bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '
9ef2117f0e65db60cb3f9708174bcaca4db813b2':
Check for null in LocalSocketImpl.SocketInputStream.available()
Jeff Sharkey [Wed, 21 May 2014 16:05:34 +0000 (16:05 +0000)]
am
bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
* commit '
bc06158a78297747605981702c8e41956ea1aa2d':
Check for null in LocalSocketImpl.SocketInputStream.available()
Jeff Sharkey [Wed, 21 May 2014 16:03:08 +0000 (16:03 +0000)]
Merge "Check for null in LocalSocketImpl.SocketInputStream.available()"
Dan Sandler [Fri, 16 May 2014 02:22:10 +0000 (22:22 -0400)]
Elide extras strings from noman dumpsys output.
Bug:
14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit
44de3cfc08428378b93172a2b03f9785a3638678)
Baligh Uddin [Wed, 21 May 2014 15:38:26 +0000 (15:38 +0000)]
am
ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
ef2b35cc2e87058ead622bd1858d358690c201fd':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 21 May 2014 15:34:11 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-modular-dev