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

152509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
8e28c9c315 Merge "Guard against EOF when reading in FileBridge." into lmp-dev 2014-08-22 00:58:02 +00:00
Jeff Sharkey
5f1ed727e2 Guard against EOF when reading in FileBridge. 
Bug: 17183379
Change-Id: I8856fc149915281093f83f46bad64f211d134322
 2014-08-21 17:54:29 -07:00
Eino-Ville Talvala
2610f5fcf0 am 4e6326e7: Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 
* commit '4e6326e7e774bc6ebb9f0cd3a4d3c6e1f67fc289':
  Camera2: Fix return type of CaptureFailure#getFrameNumber
 2014-08-22 00:52:52 +00:00
Yin-Chia Yeh
5d2a37b1e4 am e1e8c63b: am 173871c9: am 671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev 
* commit 'e1e8c63b9ebebb49c6016e213d8e0981113ab783':
  Camera2: add toString for two params classes
 2014-08-22 00:47:14 +00:00
Eino-Ville Talvala
2d9a18e02e Merge "Camera2: Fix return type of CaptureFailure#getFrameNumber" into lmp-dev 2014-08-22 00:46:41 +00:00
Jinsuk Kim
d530719b16 CEC: Skip routing control/internal source selection conditionally 
This is necessary for TV woken up by <Text/Image View On> to override
initial TV source selection/routing control, since the input change
will immediately come from external device.

Bug: 17189114
Change-Id: I4aa1ac31bc7f6ab554e29a9e6065e534e15abd58
 2014-08-22 09:46:37 +09:00
Yin-Chia Yeh
c33f32db54 am 173871c9: am 671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev 
* commit '173871c9cecf3a72907e73a214523a93a8b0d82c':
  Camera2: add toString for two params classes
 2014-08-22 00:38:04 +00:00
Jing Zhao
0f487c40ca am 87998345: am 98ddde7e: am 7b2ea97b: Make mAutoAttachOnCreation in DcTracker configuable 
* commit '879983456d0e77779e10b3eaa19bc2e8f0952a66':
  Make mAutoAttachOnCreation in DcTracker configuable
 2014-08-22 00:34:27 +00:00
Jorim Jaggi
4b2ac17397 am 0f660f1f: am b8ef516c: am 4f952625: Merge "Content description for next alarm" into lmp-dev 
* commit '0f660f1f079d46f82407d9b08ad08e3e7e511d89':
  Content description for next alarm
 2014-08-22 00:34:20 +00:00
Yin-Chia Yeh
503caf2ed4 am 671ab7d9: Merge "Camera2: add toString for two params classes" into lmp-dev 
* commit '671ab7d9658449e15315dd84a3a01072462f7e93':
  Camera2: add toString for two params classes
 2014-08-22 00:27:20 +00:00
Jing Zhao
afc16e4488 am 98ddde7e: am 7b2ea97b: Make mAutoAttachOnCreation in DcTracker configuable 
* commit '98ddde7ec599136f70d580ad4ebaecd9b53bc5f6':
  Make mAutoAttachOnCreation in DcTracker configuable
 2014-08-22 00:22:56 +00:00
Jorim Jaggi
96caa7ce9e am b8ef516c: am 4f952625: Merge "Content description for next alarm" into lmp-dev 
* commit 'b8ef516cadb926799e7a825c69e057b80c3c280a':
  Content description for next alarm
 2014-08-22 00:22:51 +00:00
Yin-Chia Yeh
6fc6748ffb Merge "Camera2: add toString for two params classes" into lmp-dev 2014-08-22 00:20:06 +00:00
Jing Zhao
570fc122f4 am 7b2ea97b: Make mAutoAttachOnCreation in DcTracker configuable 
* commit '7b2ea97b618804903e323fbd5538b21ba5ef3fbc':
  Make mAutoAttachOnCreation in DcTracker configuable
 2014-08-22 00:13:22 +00:00
Jorim Jaggi
908fdcceac am 4f952625: Merge "Content description for next alarm" into lmp-dev 
* commit '4f952625b83b77b85db3e3dc6d3f9dc26ccf7c67':
  Content description for next alarm
 2014-08-22 00:13:18 +00:00
Santos Cordon
a3bb016e78 am 41be2ecc: am 2c2c1e07: am b3e396c2: Additional changes for Conference. 
* commit '41be2eccfe606d890ab6d8ad5e336bef6969089a':
  Additional changes for Conference.
 2014-08-22 00:13:13 +00:00
Jing Zhao
1b4771d7c5 Make mAutoAttachOnCreation in DcTracker configuable 
Bug: 17131842
Change-Id: Iba63cff2f8f5b3ed28bde2aca42e91d3693cad54
 2014-08-22 00:07:15 +00:00
Jorim Jaggi
048f0cf01c Merge "Content description for next alarm" into lmp-dev 2014-08-22 00:05:46 +00:00
Santos Cordon
cb28fffc36 am 2c2c1e07: am b3e396c2: Additional changes for Conference. 
* commit '2c2c1e07c1e9bbaa93a33a0f969707d27a4398c7':
  Additional changes for Conference.
 2014-08-22 00:01:26 +00:00
Santos Cordon
7117d47130 am b3e396c2: Additional changes for Conference. 
* commit 'b3e396c26fe39ad765109090f56adcd51e3dd738':
  Additional changes for Conference.
 2014-08-21 23:54:43 +00:00
Santos Cordon
0159ac0cfe Additional changes for Conference. 
1) Connection.setConference() checked to see if the conference was valid
before setting it.  This prevented us from populating child connections
on a new conference until it was added.  Now we allow it but dont sent
the update unless the conference has already been sent.
2) removed unnecessary ArrayList<>() wrappers on CopyOnWriteLists.
3) Updated disconnect/hold/unhold so that they are sent to Conference
objects as well as Connection objects.
4) Added support for separating a child conference call.
5) Additional Logging

Bug: 15621105
Bug: 17136172
Change-Id: I939c36bc9694b9d81f0ff582e2fbe335006aa485
 2014-08-21 23:40:35 +00:00
Tyler Gunn
27d1e257f3 Hiding Video telephony related APIs. 
Bug: 17188135
Change-Id: I2d4111dbad2430968a458f8f3bf4f2ca1becbbdd
 2014-08-21 16:38:40 -07:00
Stephen Hines
dabae759ce Clean up RsFountainFbo_intermediates. 
Change-Id: I5c041bac357466d918d3dd209f36b505fd000852
 2014-08-21 23:36:29 +00:00
Jorim Jaggi
321583d540 Content description for next alarm 
Also fixes a bug where "status" was read out with TalkBack for no
good reason.

Bug: 15694080
Change-Id: Id295eb70af880d93ff928ebc337b09a8d679120d
 2014-08-22 01:33:33 +02:00
Lajos Molnar
830964636e am 2f5d9946: am dec5e4be: am b5935c4c: Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 
* commit '2f5d9946587b1012fdf5a865846512a0036cda36':
  MediaCodec: expand documentation on flush/EOS handling and adaptive playback
 2014-08-21 23:30:12 +00:00
George Mount
049af94426 am d4f01e22: am 7f09ecc5: am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit 'd4f01e22a4c25e9b7b5a004d226a8fc635bf4eed':
  Add Parent Change to ChangeTransform
 2014-08-21 23:30:08 +00:00
Jeff Davidson
6f91390f1a Allow NetworkRequest release from the system process. 
Otherwise attempts to release that are triggered by the binder death
receipient will be rejected.

Bug: 17187437
Change-Id: If3924d82dba69c572708e04c11d17ed25ae6870d
 2014-08-21 16:21:29 -07:00
Lajos Molnar
db1d85577a am dec5e4be: am b5935c4c: Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 
* commit 'dec5e4bec824cd0b7bedab542a5aadb337ea7bcc':
  MediaCodec: expand documentation on flush/EOS handling and adaptive playback
 2014-08-21 23:19:28 +00:00
George Mount
15da35abec am 7f09ecc5: am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit '7f09ecc574a079a6c0b2b7010f78caf61b1ced05':
  Add Parent Change to ChangeTransform
 2014-08-21 23:19:23 +00:00
Lajos Molnar
a8d413af33 am b5935c4c: Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 
* commit 'b5935c4c85b17edc4c04943376973d8978181176':
  MediaCodec: expand documentation on flush/EOS handling and adaptive playback
 2014-08-21 23:08:04 +00:00
George Mount
4b88c6fb0c am c559e14d: Merge "Add Parent Change to ChangeTransform" into lmp-dev 
* commit 'c559e14dc1be802bcfe15c989e2c66c9df0e327a':
  Add Parent Change to ChangeTransform
 2014-08-21 23:07:59 +00:00
Lajos Molnar
c54a76cbcd Merge "MediaCodec: expand documentation on flush/EOS handling and adaptive playback" into lmp-dev 2014-08-21 23:05:28 +00:00
George Mount
99db6030e1 Merge "Add Parent Change to ChangeTransform" into lmp-dev 2014-08-21 23:00:05 +00:00
Jorim Jaggi
baef32faa5 Content description for padlock icon depending on state 
Bug: 15694090
Change-Id: I340b67f2036bd4b29388f437ab5bac1f1aabb93e
 2014-08-22 00:58:22 +02:00
Igor Murashkin
4e346bd375 am 07bad9d0: am f66338c2: am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit '07bad9d0dd74d93efc67138b694808cd41d134b5':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:55:29 +00:00
George Mount
04ff14035e am fec07efc: am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'fec07efcb3bd69b24c43a6a80bad4edb45671022':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:55:24 +00:00
Ronghua Wu
14b032f71b am 45ed03a4: am 6ec862ea: am 60eb4e9c: Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 
* commit '45ed03a47798d6c9fa88006f4265b26ce02254d7':
  MediaHTTPConnection: handles cross protocol redirects.
 2014-08-21 22:55:20 +00:00
Dake Gu
c94e2b393f Add Parent Change to ChangeTransform 
Bug 16460123

Modified ChangeTransform to support any pivot changes.
Modified ChangeTransform to support changes between parents.

Change-Id: I6374890dab9f3d795f334b951bdb9d51d434b8ee
 2014-08-21 15:50:17 -07:00
Igor Murashkin
996020efa9 am f66338c2: am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit 'f66338c214b4f74467b3600a3fa3a5254fd9319d':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:45:59 +00:00
George Mount
cd965c6dcf am ef21ecd5: am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit 'ef21ecd5701dec9d7f40036b51bff42528075304':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:45:55 +00:00
Ronghua Wu
aed4a25f6c am 6ec862ea: am 60eb4e9c: Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 
* commit '6ec862ea17fe87847308b995aa851f78b960b1ab':
  MediaHTTPConnection: handles cross protocol redirects.
 2014-08-21 22:45:48 +00:00
Igor Murashkin
8d8954b71c am 54be067e: Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 
* commit '54be067e47c30a69232a3402cdd7cd115c915b77':
  camera2: Enable configuration failure to call #onConfigureFailed
 2014-08-21 22:43:25 +00:00
George Mount
d5e97d6ce2 am 3061f12a: Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 
* commit '3061f12affddaa50ac16ea14a727f35b8ba23337':
  Allow Activities to opt into using Overlay for shared elements.
 2014-08-21 22:34:52 +00:00
Ronghua Wu
2a35dbac8e am 60eb4e9c: Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 
* commit '60eb4e9c5ae5d7ffa1adb75de8d3726066cfe84e':
  MediaHTTPConnection: handles cross protocol redirects.
 2014-08-21 22:34:48 +00:00
Igor Murashkin
b68654ce84 Merge "camera2: Enable configuration failure to call #onConfigureFailed" into lmp-dev 2014-08-21 22:33:29 +00:00
Jing Zhao
2ad10b4323 am f60e4691: am f4ed5465: am d37bacd8: VoLTE incoming call number 
* commit 'f60e4691bb6dea70afbed7ccb800ffca7fd692e3':
  VoLTE incoming call number
 2014-08-21 22:31:16 +00:00
George Mount
7762e8e798 Merge "Allow Activities to opt into using Overlay for shared elements." into lmp-dev 2014-08-21 22:26:57 +00:00
Ronghua Wu
c90c7d257c Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-dev 2014-08-21 22:24:16 +00:00
Jing Zhao
5ba801c541 am f4ed5465: am d37bacd8: VoLTE incoming call number 
* commit 'f4ed54653a4a698c923ecb217eda1d3ddb15f023':
  VoLTE incoming call number
 2014-08-21 22:22:57 +00:00
Adam Lesinski
dacbaca1e4 am f425ba28: am 420a3801: am 247d27d1: Merge "Add better error message for AAPT file conflicts" into lmp-dev 
* commit 'f425ba2835b6e865e4dd1d4dfc2407d52f34ebde':
  Add better error message for AAPT file conflicts
 2014-08-21 22:18:05 +00:00