summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Allow camera to be disabled via Device Policy ManagerWu-cheng Li2011-05-301-0/+8
* Merge "SurfaceFlinger: unfreeze windows for fixed size buffers."Jamie Gennis2011-05-171-2/+3
|\
| * SurfaceFlinger: unfreeze windows for fixed size buffers.Jamie Gennis2011-05-161-2/+3
* | Merge "First pass at NetworkPolicy and activity tracking."Jeff Sharkey2011-05-173-36/+257
|\ \
| * | First pass at NetworkPolicy and activity tracking.Jeff Sharkey2011-05-133-36/+257
* | | am b68c768d: am 41744836: am 7916ac65: Add new command line option to change ...Dianne Hackborn2011-05-163-95/+308
|\ \ \ | |_|/ |/| |
| * | am 41744836: am 7916ac65: Add new command line option to change global screen...Dianne Hackborn2011-05-163-95/+308
| |\ \
| | * \ am 7916ac65: Add new command line option to change global screen size.Dianne Hackborn2011-05-163-95/+308
| | |\ \
| | | * | Add new command line option to change global screen size.Dianne Hackborn2011-05-163-95/+308
| * | | | am 1d340a3c: am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on si...Dianne Hackborn2011-05-161-62/+134
| |\ \ \ \ | | |/ / /
| | * | | am 0eac0927: Merge "DO NOT MERGE. From main -- Start work on simulating land...Dianne Hackborn2011-05-161-62/+134
| | |\ \ \ | | | |/ /
| | | * | Merge "DO NOT MERGE. From main -- Start work on simulating landscape/portrai...Dianne Hackborn2011-05-161-62/+134
| | | |\ \
| | | | * | DO NOT MERGE. From main -- Start work on simulating landscape/portrait when ...Dianne Hackborn2011-05-161-62/+134
| * | | | | am fddd927f: am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deci...Dianne Hackborn2011-05-162-7/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which ro...Dianne Hackborn2011-05-162-7/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use...Dianne Hackborn2011-05-162-7/+8
| | | |\ \ \ | | | | |/ /
| | | | * | DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an...Dianne Hackborn2011-05-162-7/+8
| * | | | | am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework...Dianne Hackborn2011-05-164-23/+57
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size...Dianne Hackborn2011-05-164-23/+57
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "DO NOT MERGE. Integrate from master: Rework display size access." int...Dianne Hackborn2011-05-164-23/+57
| | | |\ \ \ | | | | |/ /
| | | | * | DO NOT MERGE. Integrate from master: Rework display size access.Dianne Hackborn2011-05-164-23/+57
* | | | | | resolved conflicts for merge of fc4a3d37 to masterMike Lockwood2011-05-161-13/+96
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize sto...Mike Lockwood2011-05-161-13/+96
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 0a93d875: Merge "StorageManager: Clean up and generalize storage configur...Mike Lockwood2011-05-161-13/+96
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "StorageManager: Clean up and generalize storage configuration resourc...Mike Lockwood2011-05-161-13/+96
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | StorageManager: Clean up and generalize storage configuration resourcesMike Lockwood2011-05-161-13/+96
| * | | | | am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improv...Dianne Hackborn2011-05-165-239/+683
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity ma...Dianne Hackborn2011-05-165-239/+683
| | |\ \ \ \ | | | |/ / /
| | | * | | DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.Dianne Hackborn2011-05-135-239/+683
| | | |/ /
* | | | | am d0903e14: am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECE...Wink Saville2011-05-141-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 6e41b32d: Merge "TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_...Wink Saville2011-05-141-4/+0
| |\ \ \ \ | | |/ / /
| | * | | TelephonyRegistry remove 4 uses of FLAG_RECEIVER_REPLACE_PENDING.Wink Saville2011-05-141-4/+0
* | | | | Merge "Full backup tweaks"Christopher Tate2011-05-131-7/+6
|\ \ \ \ \
| * | | | | Full backup tweaksChristopher Tate2011-05-131-7/+6
* | | | | | am 0d9288d7: am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945Jeff Brown2011-05-132-6/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945Jeff Brown2011-05-132-6/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 4fb76253: Fix bounds check. Bug: 4413945Jeff Brown2011-05-132-6/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix bounds check.Jeff Brown2011-05-132-6/+2
| * | | | | am 46a282f3: am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen widt...Dianne Hackborn2011-05-131-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 0ed2e845: Merge "DO NOT MERGE. Integrate add new screen width/height in "...Dianne Hackborn2011-05-131-0/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | DO NOT MERGE. Integrate add new screen width/height in "dp" configs.Dianne Hackborn2011-05-121-0/+3
| * | | | | am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward...Jean-Baptiste Queru2011-05-121-4/+4
| |\ \ \ \ \
| | * \ \ \ \ am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways com...Jean-Baptiste Queru2011-05-121-4/+4
| | |\ \ \ \ \
| | | * | | | | Tweak audio APIs for better forward/backward/sideways compatibility.Jean-Baptiste Queru2011-05-121-4/+4
| | * | | | | | am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbreadIrfan Sheriff2011-05-111-31/+120
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge "Move Wifi Ap configuration to flat file" into gingerbreadIrfan Sheriff2011-05-111-31/+120
| | | |\ \ \ \ \
| | | | * | | | | Move Wifi Ap configuration to flat fileIrfan Sheriff2011-05-091-31/+120
* | | | | | | | | Merge "Add initial API for stylus and mouse buttons."Jeff Brown2011-05-139-389/+648
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add initial API for stylus and mouse buttons.Jeff Brown2011-05-139-389/+648
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "Fix audio effect framework issues"Eric Laurent2011-05-132-28/+55
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |