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

160308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sungsoo Lim
1f35568d07 am 5a7445b0: Merge "Missing Javadoc update while API review" into lmp-mr1-dev 
* commit '5a7445b00d267db966cc72cd905aaf2379e64b6b':
  Missing Javadoc update while API review
 2014-12-02 03:33:22 +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
d11e2b7cdd am 498c84e7: Merge "Don\'t wipe out explicit Toolbar nav icon when calling setSupportActionBar" into lmp-mr1-dev 
* commit '498c84e7366cc0b4355f034bd03534a14beaf166':
  Don't wipe out explicit Toolbar nav icon when calling setSupportActionBar
 2014-12-02 02:12:06 +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
cc636f0824 am 4515f785: Merge "Only send haptic events from time picker when time changes" into lmp-mr1-dev 
* commit '4515f785878cb150bef467d40abc9d5b172570fe':
  Only send haptic events from time picker when time changes
 2014-12-02 02:03:49 +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
c8d1b107b0 am 217814bf: Merge "ImageReader: free direct byte buffers once Image is returned" into lmp-mr1-dev 
* commit '217814bf2bef703be8b24cd4f1ea454ca6638111':
  ImageReader: free direct byte buffers once Image is returned
 2014-12-02 01:48:45 +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
75371fd7ee am 73f10473: Merge "MSIM IMS: convert to phone ID based selection." into lmp-mr1-dev 
* commit '73f1047318fdbfddce7edaa387725563890b5c73':
  MSIM IMS: convert to phone ID based selection.
 2014-12-02 01:33:34 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
f93c82ae36 am f90404ca: (-s ours) am ff26f10f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'f90404ca7b47234437b3f8f418fca313825de02c':
  Import translations. DO NOT MERGE
 2014-12-01 19:50:17 +00:00
Joe Fernandez
2cbfc8455d am 353da3f9: am 88e04fcb: am e9a816c5: am 1f5acf84: docs: December 2014 Dashboard update 
* commit '353da3f98d86eb750b756335892c768f76cc4616':
  docs: December 2014 Dashboard update
 2014-12-01 19:50:12 +00:00
smain@google.com
e979e259d2 am 77e889ed: am 446bab79: am 7512a46e: am fdff66ee: change Trulia context image 
* commit '77e889ed84ea0f626a9164fad50299d131a1cac1':
  change Trulia context image
 2014-12-01 19:50:07 +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