Commit Graph

176611 Commits

Author SHA1 Message Date
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
Yuncheol Heo
96af2bd77a am 1d22f99d: am f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit '1d22f99da94f131c8047870a8c090b39630f5069':
  CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:45:07 +00:00
Yuncheol Heo
1d22f99da9 am f1702487: CEC: make it sure to send vendor commands when changing a setting.
* commit 'f17024873b10dabed069e502030dd85d6257c0c4':
  CEC: make it sure to send vendor commands when changing a setting.
2014-12-01 23:39:17 +00:00
David Friedman
55eda3c691 Fixes a typo, in which the word "give" is repeated.
Bug 18553334

Change-Id: Ie21fd8d0b6951a28bc547d08b2777a2c80fdbc1f
2014-12-01 15:38:09 -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
John Reck
816fa6bf57 am b3d75303: am 2bec5766: am 76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
* commit 'b3d75303e81ce7496bf82c74424471c670d496a2':
  Prevent calling GL functions with an invalid surface
2014-12-01 22:56:35 +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
b3d75303e8 am 2bec5766: am 76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
* commit '2bec576627c1df95b7dae1bc65d250215218f175':
  Prevent calling GL functions with an invalid surface
2014-12-01 22:49:09 +00:00
John Reck
2bec576627 am 76de8982: Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev
* commit '76de89820c51c4bc288b440a82374b9d6c806244':
  Prevent calling GL functions with an invalid surface
2014-12-01 22:44:32 +00:00
Andrew Lee
80fff3c0a5 Rename VoLTE capability to HD audio.
This is a more specific and less technology-specific title for
communicating this to Dialer/InCall.

Bug: 18103173
Change-Id: I70ad50bb09eb807a621259976bb9fb7953a9a8aa
2014-12-01 14:42:16 -08: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
c883153d64 am b08a028d: am 23dc0563: am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
* commit 'b08a028da62895ae646f129c15c61e8dda955175':
  Fix visible rect computation for views with padding
2014-12-01 22:24:15 +00:00
Alan Viverette
b08a028da6 am 23dc0563: am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
* commit '23dc05634d7bc4a1d436b27dc4cd8bc518834e49':
  Fix visible rect computation for views with padding
2014-12-01 22:18:58 +00:00
Alan Viverette
23dc05634d am e6bd61d5: Merge "Fix visible rect computation for views with padding" into lmp-mr1-dev
* commit 'e6bd61d5bbea012b6b80c8bff915042f615630bc':
  Fix visible rect computation for views with padding
2014-12-01 22:12:44 +00: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
Ihab Awad
0fe87f68d1 am 97f65689: am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
* commit '97f656899924d5494497b5e88d854f0657e4d54d':
  Fix to a compatibility patch that was missed in ag/587241
2014-12-01 21:52:47 +00:00
John Reck
c5cf471758 am d7af6eaa: am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit 'd7af6eaace4ffdd3635a1cdeff65e9dc1af39f67':
  Prevent calling GL functions with an invalid surface
2014-12-01 21:47:03 +00:00
Ihab Awad
97f6568999 am 1503623c: am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
* commit '1503623c73935e71ff7c2e4d6bbdf546e7f0b37d':
  Fix to a compatibility patch that was missed in ag/587241
2014-12-01 21:46:04 +00:00
John Reck
d7af6eaace am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit 'd51205fda7351ca32e54ef34b32e72f6c7c79847':
  Prevent calling GL functions with an invalid surface
2014-12-01 21:40:32 +00:00
Ihab Awad
1503623c73 am ac70c647: Merge "Fix to a compatibility patch that was missed in ag/587241" into lmp-mr1-dev
* commit 'ac70c6473160d96aa8adf4677e3dde320256ef8d':
  Fix to a compatibility patch that was missed in ag/587241
2014-12-01 21:40:12 +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: f76d36f96b

Change-Id: Ie6f6ea081ec931fc9df30b2c3ed066ec1ae9d294
2014-12-01 21:38:34 +00:00
John Reck
d51205fda7 am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"
* commit '6afc5cf3d9e1a0c0eb6ecd6eea258f1ccd37bef3':
  Prevent calling GL functions with an invalid surface
2014-12-01 21:35:40 +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
John Reck
6afc5cf3d9 Merge "Prevent calling GL functions with an invalid surface" 2014-12-01 21:28:27 +00:00
Mike Lockwood
6e8fea14cc Merge "ParcelFileDescriptor: add support for non-stream socket pairs." 2014-12-01 21:17:36 +00:00
Craig Mautner
4844f939b6 am b62b1b03: am 94dab3ae: am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev
* commit 'b62b1b03792e7c583ec1a51a3d621deb51663414':
  Force additional layout pass after drawing
2014-12-01 21:12:25 +00:00
Craig Mautner
b62b1b0379 am 94dab3ae: am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev
* commit '94dab3ae5468e2c6325b47aa633d08dc7727198b':
  Force additional layout pass after drawing
2014-12-01 21:06:36 +00:00
Craig Mautner
94dab3ae54 am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev
* commit '9dba10732802bf162c0098d2591aa284e55b7b5e':
  Force additional layout pass after drawing
2014-12-01 21:00:51 +00:00
Craig Mautner
9dba107328 Merge "Force additional layout pass after drawing" into lmp-mr1-dev 2014-12-01 20:56:09 +00:00
Wale Ogunwale
0ea8edef69 am ea64d0be: am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
* commit 'ea64d0beea59e3350bea0c6fe8d7cef807f82601':
  Added unique id to display devices and their settings.
2014-12-01 20:44:06 +00:00
Wale Ogunwale
ea64d0beea am e05fbd69: am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
* commit 'e05fbd6901eb8c89ea18fe90c15d69e7c17596ae':
  Added unique id to display devices and their settings.
2014-12-01 20:37:01 +00:00
Shishir Agrawal
688b107330 am 7158dfb1: am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
* commit '7158dfb1be1689282e0014bd779b7510e85022c8':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
2014-12-01 20:36:12 +00:00
Mike Lockwood
ced0c25a40 ParcelFileDescriptor: add support for non-stream socket pairs.
For example, we can use this to create SOCK_SEQPACKET socket pairs.

Change-Id: Ief5c1dab3cbbe40a756d37e77968b41511297bec
2014-12-01 12:36:11 -08:00
Wale Ogunwale
e05fbd6901 am 997e632f: Merge "Added unique id to display devices and their settings." into lmp-mr1-dev
* commit '997e632f59b070dabf71d9e807847c0643da92ac':
  Added unique id to display devices and their settings.
2014-12-01 20:30:33 +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
Shishir Agrawal
7158dfb1be am 592707c5: am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
* commit '592707c5250655cbed2b48848701b288605c01ac':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
2014-12-01 20:29:07 +00:00
Chris Craik
fafd173088 am d1428730: am 1fd78e92: am 659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
* commit 'd14287301e6c8b82d3554d0dfe0f3958f0966545':
  Enable stencil clipping within clearLayerRegions
2014-12-01 20:28:21 +00: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
Mike Lockwood
bcf4fec94c Merge "Remove polling for ALSA device files in USB audio device detection." 2014-12-01 20:25:20 +00:00
Shishir Agrawal
592707c525 am 089f95f4: Merge "TelephonyManager.setLine1NumberForDisplay should return a boolean." into lmp-mr1-dev
* commit '089f95f4483c95873cf0084c11cb23a0f5b32c3c':
  TelephonyManager.setLine1NumberForDisplay should return a boolean.
2014-12-01 20:22:36 +00:00
Mike Lockwood
fb0a22eb62 Remove polling for ALSA device files in USB audio device detection.
Change-Id: I993fe41707fc02c9449800c7325aaf7270fb892e
2014-12-01 12:21:41 -08:00
Chris Craik
d14287301e am 1fd78e92: am 659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
* commit '1fd78e9268a5c884cfcfec2133b62a11a74dbc00':
  Enable stencil clipping within clearLayerRegions
2014-12-01 20:21:07 +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
1fd78e9268 am 659de832: Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev
* commit '659de832b9796e14de44b6411980a65e33283a93':
  Enable stencil clipping within clearLayerRegions
2014-12-01 20:13:06 +00:00
Chris Craik
659de832b9 Merge "Enable stencil clipping within clearLayerRegions" into lmp-mr1-dev 2014-12-01 20:08:29 +00:00
Geoff Mendal
5af2dd5c99 am 9259ad72: (-s ours) am f93c82ae: (-s ours) am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '9259ad7282c428dcdefb8f00af40529b4cbe1a95':
  Import translations. DO NOT MERGE
2014-12-01 20:07:45 +00:00
Joe Fernandez
a097085f0f am 00ba894b: am 2cbfc845: am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update
* commit '00ba894b49d2040ca5d4478c76f4f10f4f9759f5':
  docs: December 2014 Dashboard update
2014-12-01 20:07:41 +00:00
smain@google.com
dab3382a6d am 230df257: am e979e259: am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image
* commit '230df25726bcb130c4ce0f742c9935da0ad5e793':
  change Trulia context image
2014-12-01 20:07:36 +00:00
Jeremy Joslin
88eab40f86 am b81134f2: am 33783a96: am 500f7811: Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev
* commit 'b81134f21187aed11f591526a4f478d411b7f54a':
  Fix the ordering of extra values in the PI.
2014-12-01 20:07:32 +00:00