Christoph Studer
ff02faf8f3
Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev
2014-12-02 15:40:10 +00:00
Paul Crowley
fbeeac8266
Merge "Add a tag to separate paragraphs in Javadoc" into lmp-mr1-dev
2014-12-02 14:44:27 +00:00
Adrian Roos
c3056190ae
Prevent LIGHTS_OUT_TRANSPARENT in vertical nav bar
...
Bug: 18518939
Bug: 17691219
Change-Id: I90b9afbbb1a550b5328a581b4fb6aadfa3ff2559
2014-12-02 12:52:07 +00:00
Paul Crowley
2934b266e5
Add a tag to separate paragraphs in Javadoc
...
Bug: 18571794
Change-Id: Icb9bdb87415d85cdbf790224e40abbf99a441456
2014-12-02 11:21:13 +00:00
Kenny Guy
8f52135f2c
Merge "Allow apps from managed profles to close notification shade." into lmp-mr1-dev
2014-12-02 10:17:21 +00:00
Andre Eisenbach
a1a6c300af
Merge "Add server-side callback for change in MTU (4/4)" into lmp-mr1-dev
2014-12-02 08:02:02 +00:00
Jinsuk Kim
b4355ec3d0
Merge "audioservice: system audio control in master volume mode" into lmp-mr1-dev
2014-12-02 07:26:41 +00:00
Dongwon Kang
7cfe00f693
Merge "TIF: fix a race condition when TvInputManager is initialized" into lmp-mr1-dev
2014-12-02 07:26:07 +00:00
Erik Kline
f27b52aaa7
Merge "Revert some verbose logging from ag/489226" into lmp-mr1-dev
2014-12-02 07:22:33 +00:00
Lorenzo Colitti
32f3518dcc
Merge "Only use mDefaultDns if the network claims to offer Internet" into lmp-mr1-dev
2014-12-02 06:47:52 +00:00
Sungsoo Lim
5a7445b00d
Merge "Missing Javadoc update while API review" into lmp-mr1-dev
2014-12-02 03:29:10 +00:00
Yigit Boyar
498c84e736
Merge "Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev
2014-12-02 02:07:26 +00:00
Alan Viverette
4515f78587
Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev
2014-12-02 01:58:31 +00:00
Zhijun He
217814bf2b
Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev
2014-12-02 01:44:44 +00:00
Pavel Zhamaitsiak
73f1047318
Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev
2014-12-02 01:27:56 +00:00
Chris Craik
ef124887c6
Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev
2014-12-02 01:27:26 +00:00
Ihab Awad
93b4292476
Merge "Fix immutability bug in http://ag/587241 " into lmp-mr1-dev
2014-12-02 01:00:09 +00:00
Ihab Awad
90e34e324c
Fix immutability bug in http://ag/587241
...
Bug: 18292176
Change-Id: Icf1f717d76f042d9950a1d8cca9def061de1c1b8
2014-12-02 00:59:09 +00:00
Adam Powell
4cd577f0ac
Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev
2014-12-02 00:46:01 +00:00
Adam Powell
88831a2a6f
Make work profile apps easier to pick in ResolverActivity
...
Pull the "Work" profile item up out of the main list and into the
header of the resolver drawer, making it easier to discover and access
without disrupting the sort order of the list.
Bug 17935301
Change-Id: Id2d081b61828352c998e517127132f883a20b7ef
2014-12-01 16:43:31 -08:00
Jeff Sharkey
2705387df6
Merge "Include splits in dumpsys package output." into lmp-mr1-dev
2014-12-02 00:39:48 +00:00
Jeff Sharkey
c4d05fc0db
Include splits in dumpsys package output.
...
Describe the currently installed splits, both in normal dumpsys
output and in checkin output. Also include revisionCode of those
splits when defined (non-zero).
Bug: 18576300
Change-Id: Ie8140961fb7b9e0ed23fd6bc267157aab075dd78
2014-12-01 16:35:20 -08:00
Dongwon Kang
993f81e238
TIF: fix a race condition when TvInputManager is initialized
...
Currently, TvInputManagerService notifies the initial state of each
input via TvInputManagetCallback#onInputStateChanged after TvInputManager
is created. However, this is racy because the client may call methods
like getTvInputState() before the initialization.
This patch makes sure that the client gets the control when the initialization
finishes completely.
Bug: 18419452
Change-Id: I5d8141c20984013e68f2809120710c670557c9ad
2014-12-02 09:30:57 +09:00
Christopher Tate
c70fc4a320
Merge "Don't crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev
2014-12-02 00:18:44 +00:00
Alan Viverette
002f918cea
Only send haptic events from time picker when time changes
...
BUG: 18572841
Change-Id: Iaa26e2f0804e301f8754e19a1d03dbd2142bf044
2014-12-01 16:13:32 -08:00
Zhijun He
e09dcdba71
ImageReader: free direct byte buffers once Image is returned
...
This can prevent apps from accessing an image byte buffer when it is closed.
Bug: 12528089
Change-Id: I04dccf1832204be2ae3aeb3bbe04f616886447e6
2014-12-01 23:57:11 +00:00
Chris Craik
faa79ff9d9
Clip outline to View clip bounds for shadow computation
...
bug:18509823
This allows animations of View clipBounds (and other callers of
setClipBounds) to affect shadows, instead of leaving them floating.
Change-Id: I249fa4b371a170cb0c54001f5b0e0097e109b8b8
2014-12-01 15:47:10 -08:00
Etan Cohen
fbedecc099
MSIM IMS: convert to phone ID based selection.
...
Bug: 18576822
Change-Id: I2a756782ccdab5e4d10193c593cf89a7aa4fcda4
2014-12-01 23:30:58 +00:00
Yuncheol Heo
f17024873b
CEC: make it sure to send vendor commands when changing a setting.
...
- Remove 'oneway' from IHdmiVendorCommandListener.
- Add flush() method to HdmiCecController.
- Use IoThread for HdmiCecController.
Bug: 18495592
Change-Id: I497f7b49e94dd4402058ecc89cb5b7a3d58bf1e1
2014-12-02 07:52:16 +09:00
John Reck
76de89820c
Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
2014-12-01 22:39:31 +00:00
Christopher Tate
a7e47d5d34
Don't crash if a system restore fails before constructing the PMBA
...
If a whole-system restore operation failed at just the wrong point,
we'd wind up in the teardown code without a certain vital bit of it
having been initialized, and crash on the null pointer. Now we
recognize this failure mode and make sure not to do that.
Bug 18574450
Change-Id: Ifa2c10ce16bb3c6bc916ed7151c5fd51b7225691
2014-12-01 14:37:28 -08:00
Alan Viverette
e6bd61d5bb
Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
2014-12-01 22:06:13 +00:00
Sangkyu Lee
a12b2405df
Prevent calling GL functions with an invalid surface
...
Bug: 18518580
When destroying CanvasContext, the surface can be invalid
state. So the surface should be updated to null prior to
destroying GL resources to ensure that GL functions
are not called with an invalid surface.
Some GL implementation makes an error if GL functions
are called with an invalid surface. (Adreno 3xx)
Cherry picked from AOSP: f76d36f96bf221672e98e440c9df7cbf0e02e84e
Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
2014-12-01 21:38:34 +00:00
Ihab Awad
ac70c64731
Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
2014-12-01 21:35:30 +00:00
Craig Mautner
9dba107328
Merge "Force additional layout pass after drawing" into lmp-mr1-dev
2014-12-01 20:56:09 +00:00
Ihab Awad
de06133569
Fix to a compatibility patch that was missed in ag/587241
...
Change-Id: I2339085a9a2cc0d6a3f4b5e07130b5178a62c729
2014-12-01 12:30:00 -08:00
Wale Ogunwale
997e632f59
Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
2014-12-01 20:26:06 +00:00
Shishir Agrawal
089f95f448
Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
2014-12-01 20:17:26 +00:00
Chris Craik
659de832b9
Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
2014-12-01 20:08:29 +00:00
Shishir Agrawal
0201a6f6f1
TelephonyManager.setLine1NumberForDisplay should return a boolean.
...
The call can fail and should return the success status of the call.
Bug: 18571337
Change-Id: I5f4a0bd65c807a018d2f2df9e39cf9125252257f
2014-12-01 11:48:53 -08:00
Geoff Mendal
f90404ca7b
am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'ff26f10fab3e79d535001b8e1c9155d7844375c4':
Import translations. DO NOT MERGE
2014-12-01 19:44:10 +00:00
Joe Fernandez
353da3f98d
am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update
...
* commit '88e04fcbc679ae85043d5db4f7f17bbb7fc3f2d3':
docs: December 2014 Dashboard update
2014-12-01 19:44:04 +00:00
smain@google.com
77e889ed84
am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image
...
* commit '446bab79564e50c497e6ce5cf75a30ddd94855fe':
change Trulia context image
2014-12-01 19:43:58 +00:00
Jeremy Joslin
500f781110
Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
2014-12-01 19:36:04 +00:00
Alan Viverette
015b9e56d4
Merge "Cancel dialog when TimePickerDialog's BUTTON_NEGATIVE is clicked" into lmp-mr1-dev
2014-12-01 19:12:49 +00:00
Geoff Mendal
ff26f10fab
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-12-01 19:11:04 +00:00
Geoff Mendal
5ba33370d8
Import translations. DO NOT MERGE
...
Change-Id: I48e6cd1b92557727fbd8ee2d803f0121538831d9
Auto-generated-cl: translation import
2014-12-01 11:09:20 -08:00
Joe Fernandez
88e04fcbc6
am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update
...
* commit 'e9a816c5934e4c12a865fdab4994ea286c01009d':
docs: December 2014 Dashboard update
2014-12-01 18:58:36 +00:00
Jeff Sharkey
b9ccc047ca
Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev
2014-12-01 18:57:09 +00:00
Jeff Sharkey
e4a5faa61e
Merge "APK still has privileged flag after being moved from "/system/priv-app"" into lmp-mr1-dev
2014-12-01 18:56:57 +00:00