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

160041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Deshpande
14abc8744c am 574e57da: am 31103492: am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '574e57da1851f1375c5526b6b0b35fe56dc16fb6':
  Introduce config setting for scanning mac OUI
 2014-09-25 17:05:55 +00:00
Lajos Molnar
94831b82be am 36dbe967: am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit '36dbe967a0027842abe9051ddc4a87704785f84c':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 17:05:47 +00:00
Jeff Sharkey
52e40aaa8a am 1eb1a4fa: am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit '1eb1a4fa28d74312b329daaecd8a81fcf367eea4':
  Include reason when wiping data.
 2014-09-25 17:05:42 +00:00
ztenghui
32b6756bfe am 72e1f678: am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit '72e1f678dfd8adc69f60507495b9275bd098714e':
  Add one more test and update old tests
 2014-09-25 17:05:38 +00:00
ztenghui
134fe8ef66 am 4706b24e: am 6bdc2e08: am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit '4706b24e3d15b5b593a48658eab4af60df782a2e':
  Fix AVD for CTS failure.
 2014-09-25 17:05:34 +00:00
Vinit Deshpande
1dfe930a56 am 31103492: am 0604f9b7: am f9b8c88c: Merge "Introduce config setting for scanning mac OUI" into lmp-dev 
* commit '311034922d795ec7807ff3f29f399568a6600bf7':
  Introduce config setting for scanning mac OUI
 2014-09-25 16:52:07 +00:00
Lajos Molnar
ce27c23591 am c8d99e5c: am 7c993e8c: am aa1f0856: Merge "MediaCodec: revalidate cached queued input buffers if queue fails" into lmp-dev 
* commit 'c8d99e5ca8b0c7d3e2e83023a6930fbf8664ce78':
  MediaCodec: revalidate cached queued input buffers if queue fails
 2014-09-25 16:52:03 +00:00
Jeff Sharkey
8d22be098e am b47a75f2: am b8bbeff0: am 45ef18b6: Merge "Include reason when wiping data." into lmp-dev 
* commit 'b47a75f227bd43f90c2f437ea991d5fa42603d04':
  Include reason when wiping data.
 2014-09-25 16:51:59 +00:00
ztenghui
c35ca01939 am 0ecbcd00: am 64816d53: am a00457a6: Merge "Add one more test and update old tests" into lmp-dev 
* commit '0ecbcd0043a6fb065b86de6da6edc8e967420a24':
  Add one more test and update old tests
 2014-09-25 16:51:54 +00:00
ztenghui
c30fe2ccad am 6bdc2e08: am 7ac0a907: am c793e67c: Merge "Fix AVD for CTS failure." into lmp-dev 
* commit '6bdc2e08b712f147e5aeec39afded3d723b8426c':
  Fix AVD for CTS failure.
 2014-09-25 16:51:50 +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
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
3c64f6c0be am 11316e1c: am 8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev 
* commit '11316e1c174ca781bea357b558a8d291fe7c18ba':
  Revert "@hide ConnectionService APIs."
 2014-09-25 16:17:44 +00:00
Evan Charlton
d7f6d178be am 8bc6212e: Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev 
* commit '8bc6212eeb926b1f00e73af924e1f072f99160b3':
  Revert "@hide ConnectionService APIs."
 2014-09-25 16:06:48 +00:00
Evan Charlton
5fa8fe6671 Merge "Revert "@hide ConnectionService APIs."" into lmp-mr1-dev 2014-09-25 15:58:35 +00:00
Ruben Brunk
ea06d48527 am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit '01105feea74a4d0a063774509efa21ae95d50a3a':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:24:12 +00:00
Joe Fernandez
86da7d1cb0 am 4a6095c5: am 3386946d: 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 '4a6095c5ef87eb6c10b99829efd6a84fe9fc0c70':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-25 10:24:07 +00:00
Ruben Brunk
a7c17bedbe am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 
* commit 'ae7ff48d3aaf2459d7f146e1a80a55334664dd16':
  camera2: Hide JPEGs in RGBA gralloc buffers.
 2014-09-25 10:14:07 +00:00
Joe Fernandez
3e80a239a9 am 3386946d: 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 '3386946d60245a5b5777bfb4e79d175e72ff2481':
  docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
 2014-09-25 10:14:03 +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
Vinit Deshpande
7486328d6c Merge "Introduce config setting for scanning mac OUI" into lmp-dev 2014-09-24 23:50:05 +00: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
RoboErik
68d6478e6a am 3f872752: am e73770ce: am 0cbc26db: am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev 
* commit '3f87275212b04b1c7aed91a81a92315b0791a235':
  Clear the volume cache for all inactive state transitions
 2014-09-24 22:54:38 +00:00
Amith Yamasani
6ea243e87e am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev 
* commit 'bc1ec524ec5b91864547fb06af2132145b296c0a':
  Return masked location mode for managed profiles
 2014-09-24 22:54:33 +00:00
Dianne Hackborn
f4d6e2482a am e8fd0cf9: am a5fd257a: am 98b7584e: am 2a857c63: Merge "Work on issue #17624121: Settings crash while launching on wiped device" into lmp-dev 
* commit 'e8fd0cf9afa97eba8e9009b77ab1fe6d49aed02d':
  Work on issue #17624121: Settings crash while launching on wiped device
 2014-09-24 22:54:29 +00:00
Igor Murashkin
41882cd269 am c819ec1b: am e6339fe4: am ee0b9782: am 7ddc2313: Merge "camera2: Increase preview frame timeout" into lmp-dev 
* commit 'c819ec1beee0d69ee956e77a57523596d17e3eb3':
  camera2: Increase preview frame timeout
 2014-09-24 22:54:24 +00:00
Dianne Hackborn
b7e71538e8 am 68212ccd: am 2ef7a650: am d5a4e173: am 5576641a: Merge "Fix issue #17614141: Add protection for accessing images" into lmp-dev 
* commit '68212ccd04e322070a2857fa029ce8771caec3c6':
  Fix issue #17614141: Add protection for accessing images
 2014-09-24 22:54:19 +00:00
Svetoslav
067f3fbfdf am 0804f1f5: am d32e5cc8: am 737fa54b: am 299a89b5: Merge "Print spooler should not crash if fed non-PDF content." into lmp-dev 
* commit '0804f1f543686026febf980614b4d98254c86b8f':
  Print spooler should not crash if fed non-PDF content.
 2014-09-24 22:54:15 +00:00
Derek Sollenberger
13e659cc55 am 869939a1: am 946c697a: am 07f751ba: am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev 
* commit '869939a186c610de90d247bc27f26260a26c3daa':
  Fix memory leak where we close the descriptor instead of the file.
 2014-09-24 22:54:10 +00:00
Mathieu Chartier
4084fe72bb am 890ef765: am 025b8203: am 443c7647: am a061388d: Merge "Fix dalvik map names" into lmp-dev 
* commit '890ef76560d34e325b82e1bf72336de8de838844':
  Fix dalvik map names
 2014-09-24 22:54:05 +00:00
Chet Haase
4999b789a7 am a37758c8: am 62a7327e: am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev 
* commit 'a37758c8c96b472ee09c67638f518c124be1bf75':
  Avoid drawing the starting window twice
 2014-09-24 22:54:00 +00:00
Selim Cinek
40f6384b64 am c23d37aa: am 31dc5801: Only show FAB for the frontmost task 
* commit 'c23d37aae690001d7f5fd82c9db80fd01876e079':
  Only show FAB for the frontmost task
 2014-09-24 22:53:56 +00:00
Ruben Brunk
81ba98619b Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev 2014-09-24 22:51:55 +00:00
Andreas Gampe
a2945aabd9 resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp 
Change-Id: I3e9adb5fa67f8ca7ce8151c2dbf5c8fe5b40cb86
 2014-09-24 15:47:36 -07: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