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

153903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
1ac7646e8b am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 09:51:33 +00:00
Ronghua Wu
7e1d525b47 Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 2014-09-25 00:23:03 +00:00
Sukanya Rajkhowa
db96682537 Add config to control phone switch 
When UNSOL_RADIO_TECH_CHANGED is received, PhoneProxy
calls updatePhoneObject to decide whether to do a phone
switch. This config determines whether to also do a
phone switch when VOICE_REGISTRATION_STATE changes. Default
value is true

Bug: 17394282
Change-Id: Iae6c35992b932923d74c405d443b1e7e98f750c8
 2014-09-25 00:20:52 +00:00
Lajos Molnar
17ffc40362 Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 2014-09-25 00:19:44 +00:00
Ronghua Wu
e19a80def2 MediaCodecList: fix findEncoderForFormat. 
Bug: 17460057
Bug: 17637188
Change-Id: I618ff1a4dbbecf64786207ccb5208b0a67d80ddd
 2014-09-25 00:17:15 +00:00
Andre Eisenbach
77e7054176 Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 2014-09-24 23:57:02 +00:00
Vinit Deshpande
7486328d6c Merge "Introduce config setting for scanning mac OUI" into lmp-dev 2014-09-24 23:50:05 +00:00
Lajos Molnar
b15ed6337c MediaCodec: revalidate cached queued input buffers if queue fails (2) 
Handle the other ways queueBuffer can fail.  Revalidate the buffers
properly, e.g. without clearing them.

Bug: 17630446
Change-Id: I22e0e89c2835eb6a461046a8cf3be03635088302
 2014-09-24 16:44:47 -07:00
Lajos Molnar
7e28fc7370 Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 2014-09-24 23:40:56 +00:00
Jeff Sharkey
0a285b4462 Merge "Include reason when wiping data." into lmp-dev 2014-09-24 23:27:25 +00:00
ztenghui
9d23862bfd Merge "Add one more test and update old tests" into lmp-dev 2014-09-24 23:07:35 +00:00
ztenghui
dde353394c Merge "Fix AVD for CTS failure." into lmp-dev 2014-09-24 23:07:18 +00:00
Ruben Brunk
81ba98619b Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 2014-09-24 22:51:55 +00:00
RoboErik
e697d19d17 am e73770ce: am 0cbc26db: am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit 'e73770ce807a9ed235eaaf4de951645407de6bc4':
  Clear the volume cache for all inactive state transitions
 2014-09-24 22:44:40 +00:00
Amith Yamasani
fb1d260716 am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit '57924e406c3ca224a9e0d2fcba6db213caa1a54b':
  Return masked location mode for managed profiles
 2014-09-24 22:44:36 +00:00
Dianne Hackborn
4e6eb134a2 am a5fd257a: am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 
* commit 'a5fd257acb22a8cdb170327856dd7145afc93b5b':
  Work on issue #17624121: Settings crash while launching on wiped device
 2014-09-24 22:44:32 +00:00
Igor Murashkin
e8aae2152b am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'e6339fe4a71951dd6bff91a54a289137ff691f1a':
  camera2: Increase preview frame timeout
 2014-09-24 22:44:28 +00:00
Dianne Hackborn
a886377db6 am 2ef7a650: am d5a4e173: am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 
* commit '2ef7a650d6bb2764b2c3c566f99a1ac1b7f19372':
  Fix issue #17614141: Add protection for accessing images
 2014-09-24 22:44:24 +00:00
Svetoslav
48ca1cbdde am d32e5cc8: am 737fa54b: am 299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev 
* commit 'd32e5cc8d56d8b8a5638417ae86bd16661304466':
  Print spooler should not crash if fed non-PDF content.
 2014-09-24 22:44:20 +00:00
Derek Sollenberger
102a9826b0 am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '946c697abc160fc49446fa68976aff45efcd9005':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:44:15 +00:00
Mathieu Chartier
23f88f2ff1 am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '025b8203ffa22a7f6fc9aa3f054ab5f903735233':
  Fix dalvik map names
 2014-09-24 22:44:11 +00:00
Chet Haase
b4c610199e am 62a7327e: am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit '62a7327e74f1915d0fdb9b45b3e4f17e3967e1a4':
  Avoid drawing the starting window twice
 2014-09-24 22:44:06 +00:00
Selim Cinek
959d2c4066 am 31dc5801: Only show FAB for the frontmost task 
* commit '31dc5801f9da5acd8a250abc5c12d5e2bcf5da5d':
  Only show FAB for the frontmost task
 2014-09-24 22:44:01 +00:00
RoboErik
eda01ee7ed am 0cbc26db: am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit '0cbc26dbee49058a8f2da8a4659943b3ee928b7d':
  Clear the volume cache for all inactive state transitions
 2014-09-24 22:28:12 +00:00
Amith Yamasani
a347c47183 am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'de20862808bcbd379b30d51271b2389f04b1924e':
  Return masked location mode for managed profiles
 2014-09-24 22:28:06 +00:00
Dianne Hackborn
581112831f am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 
* commit '98b7584e1c45b9963a59de1625594c704065c575':
  Work on issue #17624121: Settings crash while launching on wiped device
 2014-09-24 22:27:41 +00:00
Igor Murashkin
fc4cba3619 am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'ee0b9782a7ac2844f2942ba44bad4c36f235169c':
  camera2: Increase preview frame timeout
 2014-09-24 22:27:36 +00:00
Dianne Hackborn
30a28affe1 am d5a4e173: am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 
* commit 'd5a4e17395b62867945f0bd1c7df59fbe9dfba3c':
  Fix issue #17614141: Add protection for accessing images
 2014-09-24 22:27:23 +00:00
Svetoslav
0b71057e2d am 737fa54b: am 299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev 
* commit '737fa54b1a5fc50fdcacdbad95ad2309bd40340c':
  Print spooler should not crash if fed non-PDF content.
 2014-09-24 22:27:07 +00:00
Derek Sollenberger
b468bba92a am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '07f751baac5be1184fa8868176fc7e8b4791c3f9':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:27:00 +00:00
Mathieu Chartier
f5ced0a9ed am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '443c76479684c6aecf132b415aa7052c6bd9d174':
  Fix dalvik map names
 2014-09-24 22:26:56 +00:00
Chet Haase
5dfd08882c am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit '326c443e1bed7d0bd711ebfeb7f5c0003d534281':
  Avoid drawing the starting window twice
 2014-09-24 22:25:58 +00:00
Chris Wren
957ed70273 getCurrentInterruptionFilter should return the filter value, not the hints. 
Bug: 17641218
Change-Id: I4a6ff073c04a3d3624916293824faba40f6226aa
 2014-09-24 18:17:36 -04:00
Prerepa Viswanadham
f0b56a5a7f Remove remanents of onConnectionCongested in framwork 
Bug:17289507
Change-Id: Ia28c39822141edd0e4dc3f623b8c2f280fc5f943
 2014-09-24 22:15:08 +00:00
Selim Cinek
104aae1dcc Only show FAB for the frontmost task 
Bug: 17522143
Change-Id: I882185f27a4e9da57007818f678451a7e6e1ef81
 2014-09-24 22:05:59 +00:00
Joe Fernandez
d2f5f47f96 am a73fa92c: am 2c1ef532: am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit 'a73fa92c2e0bada989b9196425e179fcc5b8b0de':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 22:04:15 +00:00
Joe Fernandez
a8f4252d2a am 2c1ef532: am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs 
* commit '2c1ef5328cee7059b1ab0d8de849c2fa474f88dd':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-24 21:54:08 +00:00
RoboErik
6bd2c57cd5 am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit '2a638f08dc4c750bfd0e358768ddde98c7f23b09':
  Clear the volume cache for all inactive state transitions
 2014-09-24 21:47:48 +00:00
RoboErik
143dc769ef Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 2014-09-24 21:35:56 +00:00
Amith Yamasani
b1920e2d1c am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'eb5fb0236f3ed0c8068d5e65f2396047ae69f78b':
  Return masked location mode for managed profiles
 2014-09-24 21:34:44 +00:00
Amith Yamasani
d9cb5a7344 Merge "Return masked location mode for managed profiles" into lmp-dev 2014-09-24 21:28:43 +00:00
Dianne Hackborn
459a55975e am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 
* commit '2a857c633ddf2cdb02c768f9340ecb5abe468c48':
  Work on issue #17624121: Settings crash while launching on wiped device
 2014-09-24 21:12:58 +00:00
Lajos Molnar
00bbc7d9fa MediaCodec: revalidate cached queued input buffers if queue fails 
For legacy behavior (using getInputBuffers) input buffer needs to
be made valid if queue fails.  Otherwise, it becomes unusable,
and the buffer still belongs to the user.

In the new model, buffers obtained by getIn/OutputBuffer will
become invalid even if queue/release fails.

We do not do the same logic for output buffers, as these should
not be accessed even if releaseBuffer fails (which really should not
happen anyway unless codec is in bad state).

Bug: 17630446
Change-Id: Ica72a168d8aea97a0ee3f3ef49c60d0ca5a9fa06
 2014-09-24 14:12:08 -07:00
Igor Murashkin
c4b7919882 am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit '7ddc2313a35637f087b68fea385df9d56b7f3f6d':
  camera2: Increase preview frame timeout
 2014-09-24 21:07:24 +00:00
Dianne Hackborn
fae2aabc30 Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 2014-09-24 21:06:47 +00:00
Evan Charlton
8635c578f0 Revert "@hide ConnectionService APIs." 
This reverts commit 86935c406e4a8bb0e2ad871b51009f3603df9e87.
 2014-09-24 14:06:12 -07:00
Igor Murashkin
1dbf7248ea Merge "camera2: Increase preview frame timeout" into lmp-dev 2014-09-24 20:58:18 +00:00
Jeff Sharkey
004a4b20f8 Include reason when wiping data. 
This will help us track down who requested a data wipe.

Bug: 17412160
Change-Id: If8413e5d6377773f37e8b34ae3d26347226a027c
 2014-09-24 13:58:09 -07:00
Igor Murashkin
3e2c14f3d6 camera2: Increase preview frame timeout 
Some devices, especially those with HAL2/HAL3 frames will have a large
delay between the first preview frame and and the camera open. This is
because the streams are configured lazily so it adds extra latency.

Increase the timeout to make it significantly less likely to get frame drops.

Bug: 17628866
Change-Id: I48dcda8507fb7eb31c3f426f833418126171c204
 2014-09-24 13:53:40 -07:00
Dianne Hackborn
b266728cce am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 
* commit '5576641a9709a03df5f4e45ac91ff94fa5b1bb18':
  Fix issue #17614141: Add protection for accessing images
 2014-09-24 20:51:16 +00:00