summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am ea8eafad: am 2529a453: Merge "Make bad notifications crash their applicati...Dianne Hackborn2010-06-243-8/+82
|\
| * am 2529a453: Merge "Make bad notifications crash their application." into gin...Dianne Hackborn2010-06-243-8/+82
| |\
| | * Merge "Make bad notifications crash their application." into gingerbreadDianne Hackborn2010-06-243-8/+82
| | |\
| | | * Make bad notifications crash their application.Dianne Hackborn2010-06-243-8/+82
* | | | am cac3126c: am 5340bffd: am 5827d3ea: Merge "Properly note the current activ...Dianne Hackborn2010-06-241-1/+1
|\ \ \ \ | |/ / /
| * | | am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set...Dianne Hackborn2010-06-241-1/+1
| |\ \ \ | | |/ /
| | * | am 5827d3ea: Merge "Properly note the current active restore set\'s token" in...Dianne Hackborn2010-06-241-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Properly note the current active restore set's tokenChristopher Tate2010-06-241-1/+1
* | | | resolved conflicts for merge of 2eb12a47 to masterDianne Hackborn2010-06-249-264/+265
|\ \ \ \ | |/ / /
| * | | am 01e4cfc4: Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-249-264/+265
| |\ \ \ | | |/ /
| | * | Some ActivityThread/ActivityManager cleanup.Dianne Hackborn2010-06-249-264/+265
* | | | am 82677b95: am e57c3a88: Merge "Add APIs for finding heavy-weight apps." int...Dianne Hackborn2010-06-241-0/+3
|\ \ \ \ | |/ / /
| * | | am e57c3a88: Merge "Add APIs for finding heavy-weight apps." into gingerbreadDianne Hackborn2010-06-241-0/+3
| |\ \ \ | | |/ /
| | * | Add APIs for finding heavy-weight apps.Dianne Hackborn2010-06-241-0/+3
| * | | am 477def1d: Merge changes I11495d03,If5816721 into gingerbreadMike Lockwood2010-06-242-1/+209
| |\ \ \ | | |/ /
| | * | Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.Mike Lockwood2010-06-242-1/+209
* | | | Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.Mike Lockwood2010-06-242-1/+209
* | | | am 2d8e2498: am 4ca092c7: Merge "Fix bug 2772728 with the suggested fix. I w...Joe Onorato2010-06-231-0/+1
|\ \ \ \ | |/ / /
| * | | am 4ca092c7: Merge "Fix bug 2772728 with the suggested fix. I wasn\'t able t...Joe Onorato2010-06-231-0/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it...Joe Onorato2010-06-231-0/+1
| | |\ \
| | | * | Fix bug 2772728 with the suggested fix. I wasn't able to reproduce it though.Joe Onorato2010-06-161-0/+1
* | | | | am c82b4e80: am 69a4817e: Immersive activity API.Daniel Sandler2010-06-232-0/+34
|\ \ \ \ \ | |/ / / /
| * | | | am 69a4817e: Immersive activity API.Daniel Sandler2010-06-232-0/+34
| |\ \ \ \ | | |/ / /
| | * | | Immersive activity API.Daniel Sandler2010-06-232-0/+34
* | | | | am dae19d7c: am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationP...Mike Lockwood2010-06-232-286/+127
|\ \ \ \ \ | |/ / / /
| * | | | am aaf39f84: Merge "GPS: remove GpsEventThread from GpsLocationProvider" into...Mike Lockwood2010-06-222-286/+127
| |\ \ \ \ | | |/ / /
| | * | | GPS: remove GpsEventThread from GpsLocationProviderMike Lockwood2010-06-222-286/+127
* | | | | am b1efc3f6: am 7fbdc84e: More native input event dispatching.Jeff Brown2010-06-234-326/+762
|\ \ \ \ \ | |/ / / /
| * | | | am 7fbdc84e: More native input event dispatching.Jeff Brown2010-06-214-326/+762
| |\ \ \ \ | | |/ / /
| | * | | More native input event dispatching.Jeff Brown2010-06-214-326/+762
| * | | | merge from froyo-plus-aospThe Android Open Source Project2010-06-211-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge from open-source masterThe Android Open Source Project2010-06-151-1/+1
| | |\ \ \
| | | * \ \ Merge "Replaced deprecated String Constructor"Jean-Baptiste Queru2010-06-141-1/+1
| | | |\ \ \
| | | | * | | Replaced deprecated String ConstructorChristian Mehlmauer2010-05-251-1/+1
| | | * | | | Merge "Fix for deadlock between StatusBarService and NotificationManagerService"Jean-Baptiste Queru2010-06-091-14/+19
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Fix for deadlock between StatusBarService and NotificationManagerServiceObi Okafor2010-03-111-14/+19
| | | * | | | Corrected debug message in WindowManagerJohan Alfven2010-05-121-1/+1
| | | * | | | Remove ProximityAlerts Receiver when last ProximityAlert expires.Sean Foy2010-05-111-1/+2
| | | * | | | Merge "Corrected repeat count for key repeat in input device."Dianne Hackborn2010-05-111-9/+26
| | | |\ \ \ \
| | * | \ \ \ \ am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is ch...Mike Lockwood2010-06-101-2/+8
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a...Adam Powell2010-06-101-0/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b...Nick Kralevich2010-06-101-1/+6
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy ...Jim Miller2010-06-082-37/+68
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is e...Jim Miller2010-06-071-18/+43
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into ...Christopher Tate2010-06-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws Security...Dianne Hackborn2010-06-071-6/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 5a671d03: Cut logging, boost efficiency of ThrottleServiceRobert Greenwalt2010-06-071-17/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyoChristopher Tate2010-06-041-0/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f9610b38: Merge "Make the DUN apn data secure." into froyoRobert Greenwalt2010-06-041-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Don't modify a list while iterating."Robert Greenwalt2010-06-211-6/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \