OSDN Git Service
Jeff Sharkey [Mon, 27 Oct 2014 22:14:44 +0000 (22:14 +0000)]
Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev
automerge:
49c1527
* commit '
49c1527cd530d880b37c2f0becf57043740b491c':
Drop DEV network stats to save RAM.
Jeff Sharkey [Mon, 27 Oct 2014 20:38:05 +0000 (20:38 +0000)]
Merge "Drop DEV network stats to save RAM." into lmp-mr1-dev
Dake Gu [Mon, 27 Oct 2014 20:37:03 +0000 (20:37 +0000)]
am
4c2e3491: Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
* commit '
4c2e3491ec6cf20bcf95a922f396473e33bc4e98':
ActivityTransition: Encode scaleType and matrix in snapshot view
Jeff Sharkey [Mon, 27 Oct 2014 20:36:59 +0000 (20:36 +0000)]
am
e67b8d28: Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
* commit '
e67b8d28294d9af440d2ea23f1b2c68dfcba8b1b':
Reduce PackageManager RAM usage: ArrayMap/Set.
Eric Laurent [Mon, 27 Oct 2014 20:36:54 +0000 (20:36 +0000)]
am
670a82cb: Merge "audioservice: fix default stream volume" into lmp-mr1-dev
* commit '
670a82cbb1b62e69fa7ef7387eed545a76c96f76':
audioservice: fix default stream volume
Jeff Hao [Mon, 27 Oct 2014 20:36:49 +0000 (20:36 +0000)]
am
e8d9810c: Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev
* commit '
e8d9810cdef5b3e288f54f42adc3205532343406':
Get UsageStats if no PackageUsage is available for boot dexopt filtering.
Wink Saville [Mon, 27 Oct 2014 20:36:44 +0000 (20:36 +0000)]
am
4dec130c: Merge "Change subId to int from long" into lmp-mr1-dev
* commit '
4dec130c396b95c888b52693796f790205d374e7':
Change subId to int from long
Evan Charlton [Mon, 27 Oct 2014 20:36:39 +0000 (20:36 +0000)]
am
2ad5eb53: Merge "Move telecom permission to the public API" into lmp-mr1-dev
* commit '
2ad5eb538ddddb56fe96482a644c0519156bf2bd':
Move telecom permission to the public API
Geoff Mendal [Mon, 27 Oct 2014 20:36:35 +0000 (20:36 +0000)]
am
649fee03: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge:
5a1a14a -s ours
* commit '
649fee03263decf9df12db01f02cf77779a388ce':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 20:36:30 +0000 (20:36 +0000)]
am
496f0ea6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
496f0ea68ae043dd8fd26b8a9577c496e25083c0':
Import translations. DO NOT MERGE
Adrian Roos [Mon, 27 Oct 2014 20:36:25 +0000 (20:36 +0000)]
am
4bc3c8bd: Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev
* commit '
4bc3c8bd643ca6840bf5b3fe01d8221f3a389d96':
SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState
Jorim Jaggi [Mon, 27 Oct 2014 20:36:20 +0000 (20:36 +0000)]
am
f129ee37: Merge "Fix padding between battery and system icons" into lmp-mr1-dev
* commit '
f129ee377ab2771a5159fde9208da8c26207d41b':
Fix padding between battery and system icons
Jorim Jaggi [Mon, 27 Oct 2014 20:36:16 +0000 (20:36 +0000)]
am
9016d8fa: Merge "Fix system icon widths" into lmp-mr1-dev
* commit '
9016d8fa80d1f3d17c612fdc7edcfabb70b1c29e':
Fix system icon widths
Jorim Jaggi [Mon, 27 Oct 2014 20:36:10 +0000 (20:36 +0000)]
am
312c1e79: Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev
* commit '
312c1e79d49a1ce7f7202f3bedb3a8d1fa110e4d':
Add padding when both data icon and wifi icon is visible
George Mount [Mon, 27 Oct 2014 20:36:05 +0000 (20:36 +0000)]
am
e0f76e9a: Merge "Fix transition being canceled improperly." into lmp-mr1-dev
* commit '
e0f76e9a6d352c45a1729b99ea0df59bd4359423':
Fix transition being canceled improperly.
George Mount [Mon, 27 Oct 2014 20:35:59 +0000 (20:35 +0000)]
am
03d5c6f5: Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev
* commit '
03d5c6f55b316a5b0e1aae405077d1083df60b36':
Add resizeClip attribute to ChangeBounds.
Dake Gu [Mon, 27 Oct 2014 20:23:26 +0000 (20:23 +0000)]
Merge "ActivityTransition: Encode scaleType and matrix in snapshot view" into lmp-mr1-dev
Jeff Sharkey [Mon, 27 Oct 2014 19:56:59 +0000 (19:56 +0000)]
Merge "Reduce PackageManager RAM usage: ArrayMap/Set." into lmp-mr1-dev
Eric Laurent [Mon, 27 Oct 2014 19:40:29 +0000 (19:40 +0000)]
Merge "audioservice: fix default stream volume" into lmp-mr1-dev
Jeff Hao [Mon, 27 Oct 2014 17:46:22 +0000 (17:46 +0000)]
Merge "Get UsageStats if no PackageUsage is available for boot dexopt filtering." into lmp-mr1-dev
Wink Saville [Mon, 27 Oct 2014 17:34:46 +0000 (17:34 +0000)]
Merge "Change subId to int from long" into lmp-mr1-dev
Eric Laurent [Fri, 10 Oct 2014 22:24:04 +0000 (15:24 -0700)]
audioservice: fix default stream volume
When the max stream volume is configurable by
a system property, the default stream volume should
be set accordingly.
Bug:
17507571.
Change-Id: I9d9378292fc7b9c9e32acc55a275cc0ae5b203d4
Evan Charlton [Mon, 27 Oct 2014 17:08:31 +0000 (17:08 +0000)]
Merge "Move telecom permission to the public API" into lmp-mr1-dev
Geoff Mendal [Mon, 27 Oct 2014 16:42:51 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
automerge:
5a1a14a -s ours
* commit '
5a1a14a8174213edcd5f1d7f8fbc427122b25f99':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 15:55:18 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 27 Oct 2014 15:53:05 +0000 (08:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4fc460aa64d5ea79e6ac16ce7b700b9a316819d1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Oct 2014 15:51:28 +0000 (15:51 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 27 Oct 2014 15:50:37 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 27 Oct 2014 15:48:48 +0000 (08:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iff4ddd0201aae07d5a847087ba53cd50aa1ba5c3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Oct 2014 15:47:13 +0000 (08:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05a75d27b0c7752e6afc0d51169e82f7547607df
Auto-generated-cl: translation import
Adrian Roos [Mon, 27 Oct 2014 14:32:19 +0000 (14:32 +0000)]
Merge "SampleTrustAgent: Exercise KeyguardManager.isKeyguardInTrustedState" into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 14:32:13 +0000 (14:32 +0000)]
Merge "Fix padding between battery and system icons" into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 14:31:53 +0000 (14:31 +0000)]
Merge "Fix system icon widths" into lmp-mr1-dev
Jorim Jaggi [Mon, 27 Oct 2014 14:31:32 +0000 (14:31 +0000)]
Merge "Add padding when both data icon and wifi icon is visible" into lmp-mr1-dev
George Mount [Mon, 27 Oct 2014 14:31:26 +0000 (14:31 +0000)]
Merge "Fix transition being canceled improperly." into lmp-mr1-dev
George Mount [Mon, 27 Oct 2014 14:30:32 +0000 (14:30 +0000)]
Merge "Add resizeClip attribute to ChangeBounds." into lmp-mr1-dev
Geoff Mendal [Mon, 27 Oct 2014 13:54:12 +0000 (13:54 +0000)]
am
088260d3: (-s ours) am
b3a33967: (-s ours) Import translations. DO NOT MERGE
* commit '
088260d3a7548489c497628585c94077b934f789':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 13:47:56 +0000 (13:47 +0000)]
am
b3a33967: (-s ours) Import translations. DO NOT MERGE
* commit '
b3a33967d2496e8cb9e4174392ff8ffa44d41c8f':
Import translations. DO NOT MERGE
John Spurlock [Mon, 27 Oct 2014 13:35:52 +0000 (13:35 +0000)]
am
e828b6c0: Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev
* commit '
e828b6c034f7330ee70d72d1af979b0a35f883d9':
AudioService: Restore ringer-mode validation check.
Geoff Mendal [Mon, 27 Oct 2014 13:33:49 +0000 (06:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6bbba14271ba04f3e4b4836f3e81a22d1c53938f
Auto-generated-cl: translation import
John Spurlock [Mon, 27 Oct 2014 13:31:18 +0000 (13:31 +0000)]
Merge "AudioService: Restore ringer-mode validation check." into lmp-mr1-dev
Geoff Mendal [Mon, 27 Oct 2014 13:31:12 +0000 (13:31 +0000)]
am
9162890f: (-s ours) Import translations. DO NOT MERGE
* commit '
9162890f056c895d68975baf1665f4d60bd6b0c9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Oct 2014 13:23:02 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I93babd2bb45e9ad743f0a06154a55d2809b6f12a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 27 Oct 2014 13:17:58 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39fda7f92c545242da499b8bb93a044820e17560
Auto-generated-cl: translation import
Wonsik Kim [Mon, 27 Oct 2014 02:46:22 +0000 (02:46 +0000)]
Wonsik Kim [Mon, 27 Oct 2014 02:02:10 +0000 (11:02 +0900)]
Fix build
Bug:
17648994
Change-Id: I35e1c89c707c4e9809cc3e4b6cf5b57dae898ba0
Wonsik Kim [Mon, 27 Oct 2014 01:34:21 +0000 (01:34 +0000)]
am
470b77b8: Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev
* commit '
470b77b8cf185f75ef38e8757be72d46b504cf9f':
TIF: change input state based on the number of available streams
Wonsik Kim [Mon, 27 Oct 2014 00:59:41 +0000 (00:59 +0000)]
Merge "TIF: change input state based on the number of available streams" into lmp-mr1-dev
Joe Fernandez [Sat, 25 Oct 2014 09:35:54 +0000 (09:35 +0000)]
am
f0d7cdbd: am
956ee53b: am
4fee8c89: docs: Home page - fix card images that are showing up on the home page
* commit '
f0d7cdbda58683d7af87eda1deb64f2969704a1b':
docs: Home page - fix card images that are showing up on the home page
Joe Fernandez [Sat, 25 Oct 2014 09:23:54 +0000 (09:23 +0000)]
am
956ee53b: am
4fee8c89: docs: Home page - fix card images that are showing up on the home page
* commit '
956ee53b07f649b83d4c1eeda718c1bfbb3b19e1':
docs: Home page - fix card images that are showing up on the home page
Joe Fernandez [Sat, 25 Oct 2014 09:15:06 +0000 (09:15 +0000)]
am
4fee8c89: docs: Home page - fix card images that are showing up on the home page
* commit '
4fee8c89eb49d4935b4a2725f82d3a08f6a938d3':
docs: Home page - fix card images that are showing up on the home page
Joe Fernandez [Sat, 25 Oct 2014 08:46:20 +0000 (01:46 -0700)]
docs: Home page - fix card images that are showing up on the home page
Change-Id: I943b9b819f91069f961c5f93b14f01499f587e19
Svet Ganov [Sat, 25 Oct 2014 00:22:57 +0000 (00:22 +0000)]
am
b32f04b7: Merge "Printing from two apps at the same time not working." into lmp-mr1-dev
* commit '
b32f04b785306f06d7d07b824fb8dcc1b4a61aa6':
Printing from two apps at the same time not working.
Svet Ganov [Sat, 25 Oct 2014 00:16:57 +0000 (00:16 +0000)]
Merge "Printing from two apps at the same time not working." into lmp-mr1-dev
Svet Ganov [Fri, 24 Oct 2014 23:27:38 +0000 (16:27 -0700)]
Printing from two apps at the same time not working.
When printing from two apps at the same time the second print UI is
getting stuck. There were a couple of issues here:
AdapterView was not notifying for item selection if the data changes
after scheduling a dalayed selection notification and the notification
execution. The code assumed that a layout pass will occur and posponed
the notification after the layout pass but it is not guaranteed that
such a layout pass will occur. Now we delay only if a layout pass is
being scheduled.
Also when binding to the PDF rendering service the print spooler was
using the same intent and as a result two print activites were getting
the same renderer instance while they should get separate ones. Now
we use different data in the intent to ensure we get separate renderer
instances.
Change-Id: I6aa7c7b041957804b4273549dd837a6d70064efc
Luan Nguyen [Fri, 24 Oct 2014 23:45:59 +0000 (23:45 +0000)]
am
9167652e: am
fba8fddf: am
781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
* commit '
9167652e442ae979d1af24ccb3d786d0c96298ab':
docs: Fix metadata description. Add new gesture test. Split layout test.
Luan Nguyen [Fri, 24 Oct 2014 23:39:53 +0000 (23:39 +0000)]
am
fba8fddf: am
781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
* commit '
fba8fddfdc12c5e18db07737c73096c9457b3d08':
docs: Fix metadata description. Add new gesture test. Split layout test.
Luan Nguyen [Fri, 24 Oct 2014 23:31:39 +0000 (23:31 +0000)]
am
584ec1f6: am
03b74e19: am
bfcc2e1a: am
aec7c974: am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
584ec1f6a9f6cbc80ba9206c880fe55e92fe3fe2':
docs: fixed typo/grammar issues.
Joe Fernandez [Fri, 24 Oct 2014 23:31:34 +0000 (23:31 +0000)]
am
3ef1c95b: am
65dca4ec: am
abb8ea3d: am
90f734eb: am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
3ef1c95b8644e6774204897dac77ad8d1031cba3':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 23:31:29 +0000 (23:31 +0000)]
Luan Nguyen [Fri, 24 Oct 2014 23:30:37 +0000 (23:30 +0000)]
am
781fe92c: Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
* commit '
781fe92cfdb96cb8f67d06b4d2500d11a3310550':
docs: Fix metadata description. Add new gesture test. Split layout test.
George Mount [Thu, 23 Oct 2014 23:39:18 +0000 (16:39 -0700)]
Add resizeClip attribute to ChangeBounds.
Bug
17765948
Added the XML attribute for the resizeClip property of
ChangeBounds. Also updated support for resizing a view
using its clip bounds and position to fix the TODO.
Change-Id: I358d07d6a28fed4b7f39f9ccb9d89b9325f64239
Luan Nguyen [Fri, 24 Oct 2014 23:17:42 +0000 (23:17 +0000)]
am
03b74e19: am
bfcc2e1a: am
aec7c974: am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
03b74e194767f5b02303e2c0f548144763e976ae':
docs: fixed typo/grammar issues.
Joe Fernandez [Fri, 24 Oct 2014 23:17:39 +0000 (23:17 +0000)]
am
65dca4ec: am
abb8ea3d: am
90f734eb: am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
65dca4ec32ccd71d40c3ba6e777bb1ef708e9f2a':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 23:17:34 +0000 (23:17 +0000)]
am
0fbbed83: am
60144a7a: am
bcf9ced4: am
1e5bb861: Link and typo fixed
* commit '
0fbbed83a681099b7ce9a98fe6cd3cf52a250338':
Link and typo fixed
Luan Nguyen [Fri, 24 Oct 2014 23:17:23 +0000 (23:17 +0000)]
Merge "docs: Fix metadata description. Add new gesture test. Split layout test." into lmp-dev
Luan Nguyen [Fri, 24 Oct 2014 23:04:53 +0000 (23:04 +0000)]
am
bfcc2e1a: am
aec7c974: am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
bfcc2e1a88e45027d2ba17302cb2fb35fbce3506':
docs: fixed typo/grammar issues.
Joe Fernandez [Fri, 24 Oct 2014 23:04:49 +0000 (23:04 +0000)]
am
abb8ea3d: am
90f734eb: am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
abb8ea3d4be376b0816b791c1afd3cc78300e9d4':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 23:04:46 +0000 (23:04 +0000)]
am
60144a7a: am
bcf9ced4: am
1e5bb861: Link and typo fixed
* commit '
60144a7a06d818e7ef22d08722be67c602aeb088':
Link and typo fixed
George Mount [Fri, 24 Oct 2014 23:03:42 +0000 (23:03 +0000)]
am
b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
* commit '
b71580c34efcc12bf7221c57eccaf80f36cb23bc':
Fix NPE when rejected snapshots are null.
George Mount [Fri, 24 Oct 2014 22:43:45 +0000 (22:43 +0000)]
Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev
Evan Charlton [Fri, 24 Oct 2014 22:09:00 +0000 (15:09 -0700)]
Move telecom permission to the public API
Make REGISTER_PROVIDER_OR_SUBSCRIPTION and REGISTER_CONNECTION_MANAGER
part of the public API so that they can be used by third-party apps.
Bug:
18114695
Change-Id: I1b8578cbc82e95ea78b4a2166f4a23650a0c375f
Luan Nguyen [Fri, 24 Oct 2014 22:37:25 +0000 (22:37 +0000)]
am
aec7c974: am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs
* commit '
aec7c974eb223b5608bbd2bb06e11fc397e6ffb2':
docs: fixed typo/grammar issues.
Joe Fernandez [Fri, 24 Oct 2014 22:37:16 +0000 (22:37 +0000)]
am
90f734eb: am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs
* commit '
90f734eb180619eb8ffd2e30580f72b500184f8b':
docs:Added 64-bit image note from Preview page
Natalie Masse [Fri, 24 Oct 2014 22:36:54 +0000 (22:36 +0000)]
am
bcf9ced4: am
1e5bb861: Link and typo fixed
* commit '
bcf9ced47a123220271fcca70f71c2adf69ad100':
Link and typo fixed
George Mount [Thu, 23 Oct 2014 18:11:17 +0000 (11:11 -0700)]
Fix NPE when rejected snapshots are null.
Bug
18055705
Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
Winson Chung [Fri, 24 Oct 2014 22:25:31 +0000 (22:25 +0000)]
Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug
18057321)" into lmp-mr1-dev
automerge:
0841cf7
* commit '
0841cf7f37d7b20a08fa894c366f32fde55ea7e9':
Preloading task metadata to improve Recents startup time after reboot. (Bug
18057321)
Svetoslav [Fri, 24 Oct 2014 22:24:10 +0000 (22:24 +0000)]
Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev
automerge:
74a4a8d
* commit '
74a4a8d6162dde06297ff6c3ef264e7f9066b88f':
Enhance computation of click point for accessibility.
Luan Nguyen [Fri, 24 Oct 2014 16:02:16 +0000 (09:02 -0700)]
docs: Fix metadata description. Add new gesture test. Split layout test.
Change-Id: I5a8948594af94fa1e7548fc49a0c3946f03d7fc8
Winson Chung [Fri, 24 Oct 2014 22:08:11 +0000 (22:08 +0000)]
Merge "Preloading task metadata to improve Recents startup time after reboot. (Bug
18057321)" into lmp-mr1-dev
Svetoslav [Fri, 24 Oct 2014 21:57:37 +0000 (21:57 +0000)]
Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev
Jeff Sharkey [Fri, 24 Oct 2014 21:41:19 +0000 (21:41 +0000)]
Merge "Use default volume description when missing label." into lmp-mr1-dev
automerge:
cc66a23
* commit '
cc66a236f90cbef7f9562b4179c3aec517f4f082':
Use default volume description when missing label.
Alan Viverette [Fri, 24 Oct 2014 21:40:04 +0000 (21:40 +0000)]
Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev
automerge:
91a1a72
* commit '
91a1a7296b776400b9c863ec094cd135614c6fbb':
Clean up GradientDrawable styled attributes, fix useLevelForShape
Tyler Gunn [Fri, 24 Oct 2014 21:38:40 +0000 (21:38 +0000)]
Merge "IMS call merge call-back changes." into lmp-mr1-dev
automerge:
cf96936
* commit '
cf96936966ae9506ce4151bf5bee276b5c7ea96b':
IMS call merge call-back changes.
Jeff Sharkey [Fri, 24 Oct 2014 21:32:59 +0000 (21:32 +0000)]
Merge "Use default volume description when missing label." into lmp-mr1-dev
Alan Viverette [Fri, 24 Oct 2014 21:17:42 +0000 (21:17 +0000)]
Merge "Clean up GradientDrawable styled attributes, fix useLevelForShape" into lmp-mr1-dev
Tyler Gunn [Fri, 24 Oct 2014 21:10:40 +0000 (21:10 +0000)]
Merge "IMS call merge call-back changes." into lmp-mr1-dev
Paul Lawrence [Fri, 24 Oct 2014 21:10:27 +0000 (21:10 +0000)]
am
c220d8e5: Stop crypto UI from crashing during encryption automerge:
0e6178b
automerge:
e20dd30
* commit '
e20dd304b74c7479e1471780e985416902a9b9e9':
Stop crypto UI from crashing during encryption
Tyler Gunn [Fri, 24 Oct 2014 21:06:40 +0000 (14:06 -0700)]
IMS call merge call-back changes.
Renaming callSessionMerged to callSessionMergeStarted.
Adding callSessionMergeComplete callback for when merge successfully
completes.
Bug:
18056632
Change-Id: I8fc73b6c9db5e7970de81d8c3e09abc80f1a262f
Jeff Sharkey [Fri, 24 Oct 2014 20:57:28 +0000 (13:57 -0700)]
Use default volume description when missing label.
Some mounted storage volumes may not have a user-defined label. In
those cases, use the default description for the volume.
Bug:
17781505
Change-Id: I8558ba2615c2ff2647a5d44afaec83249df466ab
Paul Lawrence [Fri, 24 Oct 2014 20:56:22 +0000 (20:56 +0000)]
am
c220d8e5: Stop crypto UI from crashing during encryption
automerge:
0e6178b
* commit '
0e6178b81eb5a09253acbb6e28ee863ffbf8a5a5':
Stop crypto UI from crashing during encryption
Alan Viverette [Fri, 24 Oct 2014 20:48:05 +0000 (20:48 +0000)]
Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev
automerge:
1ac5266
* commit '
1ac52667ee03af090bb13d1ccf45ee6f38ddee3c':
Add support for Explore by Touch to RadialTimePickerView
Svet Ganov [Fri, 24 Oct 2014 20:46:17 +0000 (20:46 +0000)]
Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev
automerge:
7cf7c36
* commit '
7cf7c364386d18b94d212d98072e97c1c3d87e26':
Crash in print spooler if printing app killed from recents.
John Spurlock [Fri, 24 Oct 2014 20:27:36 +0000 (16:27 -0400)]
AudioService: Restore ringer-mode validation check.
Ensure the ringer-mode is valid when set, and forward client calls
to service method to centralize validation.
Bug:
17884168
Change-Id: I500f9beefbce5b7a8bc01ca9eb7b4a7a16114160
Jeff Sharkey [Fri, 24 Oct 2014 20:44:53 +0000 (20:44 +0000)]
Merge "Recent directories can\'t show file size." into lmp-mr1-dev
automerge:
379551e
* commit '
379551ebd54947cdff5600af52940f9c283aac1f':
Recent directories can't show file size.
Tim Kilbourn [Fri, 24 Oct 2014 20:43:15 +0000 (20:43 +0000)]
Merge "aapt updates for Android TV" into lmp-mr1-dev
automerge:
6af7d76
* commit '
6af7d76eff60220c5ab3678d8d1fb74ede242ace':
aapt updates for Android TV
Alan Viverette [Fri, 24 Oct 2014 20:36:32 +0000 (20:36 +0000)]
Merge "Add support for Explore by Touch to RadialTimePickerView" into lmp-mr1-dev
Svet Ganov [Fri, 24 Oct 2014 20:32:18 +0000 (20:32 +0000)]
Merge "Crash in print spooler if printing app killed from recents." into lmp-mr1-dev
Jeff Sharkey [Fri, 24 Oct 2014 20:29:58 +0000 (20:29 +0000)]
Merge "Recent directories can't show file size." into lmp-mr1-dev
Jeff Sharkey [Fri, 24 Oct 2014 20:15:15 +0000 (13:15 -0700)]
Drop DEV network stats to save RAM.
We migrated to pure XT stats a long time ago, so we no longer need
to keep the DEV stats cached in RAM. This saves ~250KB on a typical
device.
Bug:
18118003
Change-Id: I3d84ba47073fa3500454784afc956c8e53404492
OSDN Git Service
