summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add logic to handle changes to file_contexts during update."Geremy Condra2013-04-152-11/+110
|\
| * Add logic to handle changes to file_contexts during update.Geremy Condra2013-04-152-11/+110
* | Merge "Support persistable Uri permission grants."Jeff Sharkey2013-04-153-153/+492
|\ \
| * | Support persistable Uri permission grants.Jeff Sharkey2013-04-153-153/+492
* | | Merge "Revert "Add logic to handle changes to file_contexts during update.""Geremy Condra2013-04-152-80/+11
|\ \ \ | |/ / |/| |
| * | Revert "Add logic to handle changes to file_contexts during update."Geremy Condra2013-04-152-80/+11
* | | resolved conflicts for merge of dd03b6dc to masterSvetoslav2013-04-121-3/+28
|\ \ \
| * \ \ am 26257a09: Merge "Allow for setting test type as a monkey." into jb-mr2-devSvetoslav Ganov2013-04-121-3/+28
| |\ \ \
| | * \ \ Merge "Allow for setting test type as a monkey." into jb-mr2-devSvetoslav Ganov2013-04-131-3/+28
| | |\ \ \
| | | * | | Allow for setting test type as a monkey.Adam Momtaz2013-04-121-3/+28
* | | | | | Merge "Implement separate stacks."Craig Mautner2013-04-1311-472/+628
|\ \ \ \ \ \
| * | | | | | Implement separate stacks.Craig Mautner2013-04-1211-472/+628
* | | | | | | Merge "Add logic to handle changes to file_contexts during update."Geremy Condra2013-04-122-11/+80
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Add logic to handle changes to file_contexts during update.Geremy Condra2013-04-122-11/+80
| | |_|_|/ | |/| | |
* | | | | Merge "Prepare WindowManager for multiple stacks."Craig Mautner2013-04-125-27/+79
|\ \ \ \ \
| * | | | | Prepare WindowManager for multiple stacks.Craig Mautner2013-04-065-27/+79
* | | | | | Merge "Separate stacks into Home and others."Craig Mautner2013-04-123-28/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Separate stacks into Home and others.Craig Mautner2013-04-063-28/+25
* | | | | | am 9b8abb5a: am ce70311b: Merge "Add user restrictions (credentials, user rem...Emily Bernier2013-04-121-0/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am ce70311b: Merge "Add user restrictions (credentials, user removal)" into j...Emily Bernier2013-04-121-0/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Add user restrictions (credentials, user removal)" into jb-mr2-devEmily Bernier2013-04-121-0/+4
| | |\ \ \ \
| | | * | | | Add user restrictions (credentials, user removal)Emily Bernier2013-04-111-0/+4
* | | | | | | am 2d28d622: am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-devRobert Greenwalt2013-04-122-3/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-devRobert Greenwalt2013-04-122-3/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Add new route.hasGateway() api" into jb-mr2-devRobert Greenwalt2013-04-122-3/+2
| | |\ \ \ \ \
| | | * | | | | Add new route.hasGateway() apiRobert Greenwalt2013-04-122-3/+2
* | | | | | | | am 12cff6f6: am 10a25c0a: Merge "Remove keystore entries when app data cleare...Kenny Root2013-04-121-23/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 10a25c0a: Merge "Remove keystore entries when app data cleared" into jb-mr...Kenny Root2013-04-121-23/+45
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove keystore entries when app data clearedKenny Root2013-04-121-23/+45
* | | | | | | | am 9d02928e: am 14c8c741: Merge "Adding APIs for an accessibility service to ...Svetoslav2013-04-113-45/+324
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 14c8c741: Merge "Adding APIs for an accessibility service to intercept key...Svetoslav2013-04-113-45/+324
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Adding APIs for an accessibility service to intercept key events." int...Svetoslav2013-04-123-45/+324
| | |\ \ \ \ \ \
| | | * | | | | | Adding APIs for an accessibility service to intercept key events.Svetoslav2013-04-113-45/+324
* | | | | | | | | am 64ef8ed8: am 68913baf: Merge "Remove /data/system location for mac_permiss...Geremy Condra2013-04-111-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 68913baf: Merge "Remove /data/system location for mac_permissions.xml."Geremy Condra2013-04-111-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove /data/system location for mac_permissions.xml.Stephen Smalley2013-04-051-1/+0
* | | | | | | | | | am 26c702c3: am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPacka...Dianne Hackborn2013-04-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am ba880da4: Merge "Fix issue #7643046: Activity.getCallingPackage() bogusly ...Dianne Hackborn2013-04-111-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Fix issue #7643046: Activity.getCallingPackage() bogusly returns null...Dianne Hackborn2013-04-111-1/+1
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | am 5ec50ebd: am b7e6a443: Merge "Routing workaround." into jb-mr2-devRobert Greenwalt2013-04-111-22/+23
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am b7e6a443: Merge "Routing workaround." into jb-mr2-devRobert Greenwalt2013-04-111-22/+23
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Routing workaround." into jb-mr2-devRobert Greenwalt2013-04-111-22/+23
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Routing workaround.Robert Greenwalt2013-04-091-22/+23
* | | | | | | | | am 63582a79: am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" ...Robert Greenwalt2013-04-111-5/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-devRobert Greenwalt2013-04-111-5/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-devRobert Greenwalt2013-04-111-5/+10
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Use CONNECTIVITY_INTERNAL for global proxyRobert Greenwalt2013-04-101-5/+10
* | | | | | | | | am ea4f556f: am 651f99cb: Merge "Sensor values changes." into jb-mr2-devJaikumar Ganesh2013-04-111-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 651f99cb: Merge "Sensor values changes." into jb-mr2-devJaikumar Ganesh2013-04-111-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Sensor values changes.Jaikumar Ganesh2013-04-111-1/+1