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

153294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ronghua Wu
99cd62f8c4 am 5817765c: am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit '5817765c034d41881ebfe72d7d6d0c81a2ed8e10':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 16:38:30 +00:00
Sukanya Rajkhowa
9465446f6a am 5699372f: am 14cb7b8a: Add config to control phone switch 
* commit '5699372fe72f36e3020464a687f1346f5f325ae6':
  Add config to control phone switch
 2014-09-25 16:38:26 +00:00
Lajos Molnar
1f146f40d0 am a3608e7a: am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit 'a3608e7a5ea4a489830336cfb37ffefb77e89e6d':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 16:38:23 +00:00
Andre Eisenbach
b3e68eb21c am 630f9671: am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit '630f9671beae6a09e8a1fa315b632d292a83c4f0':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 16:38:19 +00:00
Vinit Deshpande
5fc770d2a0 am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '0604f9b7eaf51920c177f5af845bb254c3695074':
  Introduce config setting for scanning mac OUI
 2014-09-25 16:38:15 +00:00
Lajos Molnar
4867c6bff2 am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit '7c993e8c16de0322ee231979b798cc40cd5b1576':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 16:38:12 +00:00
Jeff Sharkey
c1411a4253 am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'b8bbeff0796847bbe98deb2d84989b656356873c':
  Include reason when wiping data.
 2014-09-25 16:38:08 +00:00
ztenghui
39b5e7a88f am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit '64816d534c0bc42f5e83bd24bb6c452f61e61fdc':
  Add one more test and update old tests
 2014-09-25 16:38:05 +00:00
ztenghui
e44af7d3a7 am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit '7ac0a907051287a9cb01b3b54332a7ba865102e6':
  Fix AVD for CTS failure.
 2014-09-25 16:38:00 +00:00
Ronghua Wu
2a7667de96 am ca7f391e: Merge "MediaCodecList: fix findEncoderForFormat." into lmp-dev 
* commit 'ca7f391e2b04a9efc4beb5f5b769653a983ff424':
  MediaCodecList: fix findEncoderForFormat.
 2014-09-25 16:23:16 +00:00
Sukanya Rajkhowa
7d695dd8d8 am 14cb7b8a: Add config to control phone switch 
* commit '14cb7b8aeb99d3337b191a49ab11eb8642cde5fa':
  Add config to control phone switch
 2014-09-25 16:23:11 +00:00
Lajos Molnar
d9298cfc2f am 4e43a27a: Merge "MediaCodec: revalidate cached queued input buffers if queue fails (2)" into lmp-dev 
* commit '4e43a27a9884e24ba47599597091176b772ddb24':
  MediaCodec: revalidate cached queued input buffers if queue fails (2)
 2014-09-25 16:23:07 +00:00
Andre Eisenbach
9bb34605ce am fe99f9f4: Merge "Remove remanents of onConnectionCongested in framwork" into lmp-dev 
* commit 'fe99f9f42ad1a45922c906bacd5ea56d58667245':
  Remove remanents of onConnectionCongested in framwork
 2014-09-25 16:22:45 +00:00
Vinit Deshpande
76d2183725 am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit 'f9b8c88c6529daebe9676d7c440fcd3e478ec034':
  Introduce config setting for scanning mac OUI
 2014-09-25 16:22:40 +00:00
Lajos Molnar
7f2ce4cdcf am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit 'aa1f0856a144f2f2ba14c6358d633887e7e8b936':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 16:22:31 +00:00
Jeff Sharkey
2649756975 am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '45ef18b63e78fd853865f42d9369a5c9b4dd4ba0':
  Include reason when wiping data.
 2014-09-25 16:22:22 +00:00
ztenghui
958614be0b am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit 'a00457a60160f27e15c9d75824057f7d914b7b7d':
  Add one more test and update old tests
 2014-09-25 16:22:10 +00:00
ztenghui
acd80709e1 am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit 'c793e67ca93a1550fa68c887ef00d207ac1e1d84':
  Fix AVD for CTS failure.
 2014-09-25 16:22:06 +00:00
Evan Charlton
5fa8fe6671 Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev 2014-09-25 15:58:35 +00:00
Ruben Brunk
fb444ce6f8 am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '6a7dcedf4f3a3af8ccbaebc9ec9dd02796d4e93e':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:03:40 +00:00
Joe Fernandez
825896adf8 am a4f4bd40: 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 'a4f4bd40cad463e6faeebec6694dd78ce7456f20':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-25 10:03:37 +00:00
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
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
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