kmccormick
20dfe399a6
am 63ee1976: am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '63ee197682bf7cf831950087028b2a81902f92c9':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:48:53 +00:00
kmccormick
63ee197682
am 2b20b9d2: am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '2b20b9d23a0cd5a70db95bc70bae832a6d1f356d':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:19:46 +00:00
kmccormick
2b20b9d23a
am 3e92c4a2: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '3e92c4a20f413a800c168ee8ff7fe3b687f234a7':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:12:52 +00:00
Adam Lesinski
720a5c51be
Merge "Add dumpsys output to UsageStatsService, along with --checkin support" into lmp-mr1-dev
2014-10-29 23:11:54 +00:00
kmccormick
3e92c4a20f
am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
...
* commit '1867f2cfdd477cb12c167fc47c79e2e5d6332e24':
Doc update: deliv receipt, rate exceeded, bug fixes.
2014-10-29 23:09:23 +00:00
Wale Ogunwale
a232953ea3
Merge "Fix issue 6455374: Bad recent image on camera launch from lockscreen." into lmp-mr1-dev
2014-10-29 23:08:21 +00:00
Eric Laurent
c0c1255a93
Merge "SoundTrigger JNI: fix local reference leak." into lmp-mr1-dev
2014-10-29 23:07:33 +00:00
kmccormick
1867f2cfdd
Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs
2014-10-29 23:04:29 +00:00
Eric Laurent
8f89feba39
SoundTrigger JNI: fix local reference leak.
...
Bug: 17935275.
Change-Id: Ibc6f22b868dda2ed1a07dc371ee00e85c99c1e53
2014-10-29 15:52:43 -07:00
kmccormick
2022db08ab
Doc update: deliv receipt, rate exceeded, bug fixes.
...
Fix for:
b/17936796
Change-Id: I17d9604da9a894501c7701174e4f7c61dfa9e80e
2014-10-29 15:49:36 -07:00
Alan Viverette
4e7c562c43
Merge "Update drawable state after updating tint list" into lmp-mr1-dev
2014-10-29 22:20:18 +00:00
Svetoslav
d3786a5931
Merge "Print preview disappearing if printer is changed." into lmp-mr1-dev
2014-10-29 22:17:57 +00:00
Alan Viverette
2d3443fc5a
Merge "Add setters for window elevation and clipToOutline properties" into lmp-mr1-dev
2014-10-29 22:05:11 +00:00
Alan Viverette
66c0adcfd4
Merge "Ensure accessibility focus rect is drawn correctly" into lmp-mr1-dev
2014-10-29 22:05:05 +00:00
Alan Viverette
8785a56c8f
Merge "Create translucent hardware renderer if surface insets are non-zero" into lmp-mr1-dev
2014-10-29 22:05:01 +00:00
Dianne Hackborn
7ef463168c
Merge "Condense AndroidRuntime init log, include uid running under." into lmp-mr1-dev
2014-10-29 21:55:50 +00:00
Tom Taylor
de48e8809e
Merge "Add a missing mms_config constant to SmsManager" into lmp-mr1-dev
2014-10-29 21:55:33 +00:00
Jeff Hao
b1346d7829
Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
2014-10-29 21:47:30 +00:00
Jeff Hao
9f60c08a44
Change boot screen title to "Android is starting" when not upgrading.
...
Bug: 17565501
Change-Id: Id5741e6e7a40750feee1cd7306e79f7baeec67de
2014-10-29 14:42:39 -07:00
Tyler Gunn
167230987b
Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
2014-10-29 21:32:53 +00:00
Tom Taylor
4aa3684017
Add a missing mms_config constant to SmsManager
...
Bug 18079788
Change-Id: Ifb2040fb8f9e2a7390da74161539afcf3d6b03af
2014-10-29 14:30:37 -07:00
Alan Viverette
79c067c54a
Add setters for window elevation and clipToOutline properties
...
These are available as XML attributes but were lacking setters. None
of the Window properties have getters, so just adding setters here.
BUG: 16847753
Change-Id: I9c032903e94b7f12125210bd73c911243612df69
2014-10-29 14:27:47 -07:00
Alan Viverette
d86d7bce78
Merge "Use action mode context for ActionMode menu inflater" into lmp-mr1-dev
2014-10-29 21:14:56 +00:00
Vladimir Marko
85d6f29994
Merge "Fix android_media_AudioSystem_getMasterMute return type." into lmp-mr1-dev
2014-10-29 21:12:08 +00:00
Svetoslav
7c053c1e41
Print preview disappearing if printer is changed.
...
This is a regression caused by my previous patch.
Change-Id: I80a0b4d880fd4e48e6a44fac303a4c8204e8ec0d
2014-10-29 13:50:42 -07:00
Chris Wren
755f4021ae
fix build break from mis-named DEBUG flag in SystemUI
...
Change-Id: I55459fe090ae4c159ebdad8b60658b25db29271e
2014-10-29 16:43:51 -04:00
Vladimir Marko
c1bcdbb758
Fix android_media_AudioSystem_getMasterMute return type.
...
Caused FPU stack overflow on x86.
Bug: 18023418
Change-Id: I0b8102cad5f5a883f615fa5dfa3017f56258a192
2014-10-29 20:34:15 +00:00
Chris Wren
b7efa04d52
Merge "Add logging to diagnose notification click issue." into lmp-mr1-dev
2014-10-29 19:54:52 +00:00
Alan Viverette
d513379239
Update drawable state after updating tint list
...
BUG: 18155988
Change-Id: Ic536027a54c10b2082fbc22476530165b76e2c59
2014-10-29 19:46:54 +00:00
Andre Eisenbach
e2502eb9ad
Merge "Fix crash during Bluetooth on/off stress test" into lmp-mr1-dev
2014-10-29 19:35:19 +00:00
Andre Eisenbach
178d3b54cd
Fix crash during Bluetooth on/off stress test
...
Bug: 18106938
Change-Id: Icdeb736d89d5926264f2043455ccbc3760fd5d29
2014-10-29 12:13:38 -07:00
David Friedman
543a82edd5
am 51209aa3: am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '51209aa38ee9895c639fbbb6f469f926f3c66b7f':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-29 18:52:29 +00:00
Deepanshu Gupta
5456230d3b
am 03b100e1: am 617e8097: Add missing delegate for AnimatorInflater.
...
* commit '03b100e11dad5bef34e71ccfd45b6c7adc9bfee4':
Add missing delegate for AnimatorInflater.
2014-10-29 18:52:21 +00:00
Geoff Mendal
9bff44bdc4
am 39ae5dd7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit '39ae5dd786aff204888457a648ed291926e33334':
Import translations. DO NOT MERGE
2014-10-29 18:52:13 +00:00
Geoff Mendal
2c5e5ef50c
am c88fbd3c: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c88fbd3cce87f67aad17c636b9e23b4e29afac6a':
Import translations. DO NOT MERGE
2014-10-29 18:52:00 +00:00
Wink Saville
0d1356c4f1
am f7543b40: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'f7543b40d25db5cc089a4cadea6c1444a56d3b25':
Import translations. DO NOT MERGE
2014-10-29 18:51:49 +00:00
Deepanshu Gupta
bf59e8974d
am de4ee0f1: am 75bf1b1c: Merge "Skip loading animations." into lmp-dev
...
* commit 'de4ee0f1be350a52d642a447269a91f6d28e73fc':
Skip loading animations.
2014-10-29 18:51:32 +00:00
Deepanshu Gupta
122ccfb08f
am 916d7796: am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev
...
* commit '916d779650352059b08b7257f71a7aab8b333eba':
Fix multiple styles case in resource resolution.
2014-10-29 18:51:28 +00:00
Deepanshu Gupta
62cf56cf99
am 6fb2fda8: am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev
...
* commit '6fb2fda85c410e23a1b9366c025fe288447bf027':
Use right theme for drawable inflation.
2014-10-29 18:51:23 +00:00
Chris Wren
79ac09e439
Add logging to diagnose notification click issue.
...
Bug: 18102199
Change-Id: Id022faa7b75f28f446155f15ab4a8373869c163c
2014-10-29 14:38:01 -04:00
David Friedman
51209aa38e
am 43582423: am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '43582423ee64b4d1e8f0186e34494cc7f7519488':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-29 18:20:19 +00:00
David Friedman
43582423ee
am 0fa6edce: Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
* commit '0fa6edced7496b898d31ff7dab7255a1e0dffa9b':
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
2014-10-29 18:15:31 +00:00
Alan Viverette
2b12b58f94
Create translucent hardware renderer if surface insets are non-zero
...
BUG: 18160604
Change-Id: Ie4483b9841bd91778659d83b154f69e777fa1dfc
2014-10-29 11:11:40 -07:00
Alan Viverette
3abf5c4bd1
Use action mode context for ActionMode menu inflater
...
BUG: 18078900
Change-Id: Iff837e741dde79a565f1e8c83846ee6155da179e
2014-10-29 11:03:35 -07:00
Alan Viverette
7a0ae7ed31
Merge "Add content description to Toolbar collapse button" into lmp-mr1-dev
2014-10-29 18:00:12 +00:00
Deepanshu Gupta
03b100e11d
am 617e8097: Add missing delegate for AnimatorInflater.
...
* commit '617e809731d775d9e05758689bab024e34c9afbf':
Add missing delegate for AnimatorInflater.
2014-10-29 17:52:04 +00:00
Dianne Hackborn
8e5aafe57d
Condense AndroidRuntime init log, include uid running under.
...
Change-Id: Ifda3001fdc25d759f07a93b8569c59da89a8bcfc
2014-10-29 10:45:25 -07:00
Andre Eisenbach
db41880dd3
Merge "Fix exception in AudioService when no BT Headset is connected." into lmp-mr1-dev
2014-10-29 17:24:05 +00:00
Geoff Mendal
39ae5dd786
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-29 17:23:52 +00:00
Andre Eisenbach
570cc5302a
Fix exception in AudioService when no BT Headset is connected.
...
If AudioManager.startBluetoothSco() is invoked with no Bluetooth Headset
connected, a NullPointerException will ensue.
Added check to make sure mBluetoothHeadsetDevice is set before accessing
it.
Bug: 17601845
Change-Id: Ia00bfffbea5484230b11a74787fe3309c18f824d
2014-10-29 09:56:41 -07:00