drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169,803 Commits 1 Branch 0 Tags
Commit Graph

169803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
a22ab0da6f am 9a04480e: am ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev 
* commit '9a04480e36c42eb63d1d727221ba3ce6a6d533ef':
  Clip outline to View clip bounds for shadow computation
 2014-12-02 01:39:20 +00:00
Chris Craik
9a04480e36 am ef124887: Merge "Clip outline to View clip bounds for shadow computation" into lmp-mr1-dev 
* commit 'ef124887c616d03cf0a689d2b7d5b1894405d12e':
  Clip outline to View clip bounds for shadow computation
 2014-12-02 01:33:28 +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
3380f49618 am 8ea0d19f: am 93b42924: Merge "Fix immutability bug in http://ag/587241" into lmp-mr1-dev 
* commit '8ea0d19fe2522ceaf5f09808b7835deb9e53c88a':
  Fix immutability bug in http://ag/587241
 2014-12-02 01:19:31 +00:00
Ihab Awad
8ea0d19fe2 am 93b42924: Merge "Fix immutability bug in http://ag/587241" into lmp-mr1-dev 
* commit '93b429247673bb8e019fe9d39b46700fc86c3313':
  Fix immutability bug in http://ag/587241
 2014-12-02 01:11:32 +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
35bed6fd4e am 920c27b2: am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev 
* commit '920c27b24aada088aae0b9644fcf5519575e0433':
  Make work profile apps easier to pick in ResolverActivity
 2014-12-02 00:56:48 +00:00
Jeff Sharkey
db6753cf2d am a8d0a3ae: am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev 
* commit 'a8d0a3ae602bb455e290ca1ee6f18184c30f8dc7':
  Include splits in dumpsys package output.
 2014-12-02 00:51:28 +00:00
Adam Powell
920c27b24a am 4cd577f0: Merge "Make work profile apps easier to pick in ResolverActivity" into lmp-mr1-dev 
* commit '4cd577f0ac1df92ffbf196d1fb31a7124bbe2f51':
  Make work profile apps easier to pick in ResolverActivity
 2014-12-02 00:50:39 +00:00
Jesse Hall
954b325bc3 am 9dec9e9d: am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 
* commit '9dec9e9d65c9f70b7a45fb3ad8f3f752b7b35fdf':
  Avoid overwriting EGL14.EGL_NO_SURFACE
 2014-12-02 00:48:33 +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
Jeff Sharkey
a8d0a3ae60 am 2705387d: Merge "Include splits in dumpsys package output." into lmp-mr1-dev 
* commit '2705387df6f3ffe87b2a3a71a48eea7e2be44fb1':
  Include splits in dumpsys package output.
 2014-12-02 00:45:44 +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
Jesse Hall
9dec9e9d65 am 1ee37776: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 
* commit '1ee377764a59d0e2c245dd037006fa8c086f5683':
  Avoid overwriting EGL14.EGL_NO_SURFACE
 2014-12-02 00:42:23 +00: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
Jesse Hall
1ee377764a Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 2014-12-02 00:35:12 +00:00
Christopher Tate
dac93ba27e am 4bdf266c: am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev 
* commit '4bdf266c03d92448ae65ec31355588d17d179a98':
  Don't crash if a system restore fails before constructing the PMBA
 2014-12-02 00:30:40 +00:00
Christopher Tate
4bdf266c03 am c70fc4a3: Merge "Don\'t crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev 
* commit 'c70fc4a32016f3f06aa80596a7d9b4e9614e78bc':
  Don't crash if a system restore fails before constructing the PMBA
 2014-12-02 00:24:03 +00: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
dcashman
6ec2cbd8d2 am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager." 
* commit 'c25cfc57e0d863b002620f5e7dd14822418c678f':
  Prevent EntropyMixer from registering with service manager.
 2014-12-01 23:59:50 +00:00
Michael Wright
7dedb12425 am 6b35af89: am c859b85c: Merge "Added Razer USA, Ltd serval" 
* commit '6b35af89f0ce612307d89a45c7fadab3e6e269f3':
  Added Razer USA, Ltd serval
 2014-12-01 23:59:44 +00:00
dcashman
c25cfc57e0 am 24d02652: Merge "Prevent EntropyMixer from registering with service manager." 
* commit '24d02652bf8df12a41acf500d958109ef3d99b9a':
  Prevent EntropyMixer from registering with service manager.
 2014-12-01 23:54:11 +00:00
Michael Wright
6b35af89f0 am c859b85c: Merge "Added Razer USA, Ltd serval" 
* commit 'c859b85cb530e608da775bb18744a996483a0311':
  Added Razer USA, Ltd serval
 2014-12-01 23:54:04 +00:00
dcashman
24d02652bf Merge "Prevent EntropyMixer from registering with service manager." 2014-12-01 23:49:26 +00:00
Michael Wright
c859b85cb5 Merge "Added Razer USA, Ltd serval" 2014-12-01 23:47:37 +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
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
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
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
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
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: f76d36f96bf221672e98e440c9df7cbf0e02e84e

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
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
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
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