summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Clean up some temporary allocations.Dianne Hackborn2013-05-308-457/+499
* Merge "break up LocationManagerService's WakeLock"Victoria Lease2013-05-301-55/+23
|\
| * break up LocationManagerService's WakeLockVictoria Lease2013-05-291-55/+23
* | Merge "Disable the AssetAtlas when running under valgrind Bug #9191438"Romain Guy2013-05-291-0/+5
|\ \
| * | Disable the AssetAtlas when running under valgrindRomain Guy2013-05-291-0/+5
| |/
* | am 096d3843: am 3ec14d9c: am 9b76b2d2: Merge "framework:base: iterator error ...Amith Yamasani2013-05-291-0/+1
|\ \ | |/ |/|
| * am 9b76b2d2: Merge "framework:base: iterator error in singletone provider"Amith Yamasani2013-05-291-0/+1
| |\
| | * Merge "framework:base: iterator error in singletone provider"Amith Yamasani2013-05-291-0/+1
| | |\
| | | * framework:base: iterator error in singletone providerJun Su2013-05-291-0/+1
* | | | Add more details about why a force stop is happening.Dianne Hackborn2013-05-282-30/+42
* | | | Merge "Fix parsing of global:http_proxy value."Andreas Huber2013-05-281-0/+6
|\ \ \ \
| * | | | Fix parsing of global:http_proxy value.Andreas Huber2013-05-281-0/+6
* | | | | am 2c4b0905: am ab4a0541: am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUN...Jeff Sharkey2013-05-281-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am e4c29de9: Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"Jeff Sharkey2013-05-281-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Add missing ACTION_MEDIA_UNMOUNTED intent"Jeff Sharkey2013-05-281-1/+1
| | |\ \ \
| | | * | | Add missing ACTION_MEDIA_UNMOUNTED intentChristian Beck2013-05-201-1/+1
| | | | |/ | | | |/|
* | | | | am ef0c3e26: am c8c82009: resolved conflicts for merge of 7573e594 to stage-a...Jeff Brown2013-05-281-4/+8
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 7573e594 to stage-aosp-masterJeff Brown2013-05-281-4/+8
| |\ \ \ \ | | |/ / /
| | * | | Merge "Properly rotate full [-pi, +pi] orientation range if available"Jeff Brown2013-05-281-4/+8
| | |\ \ \
| | | * | | Properly rotate full [-pi, +pi] orientation range if availableJason Gerecke2013-03-151-4/+8
* | | | | | Merge "Hideybars feature confirmation toast bar."John Spurlock2013-05-281-5/+7
|\ \ \ \ \ \
| * | | | | | Hideybars feature confirmation toast bar.John Spurlock2013-05-281-5/+7
* | | | | | | am 66e596e7: am 840f1143: am 7f3ff133: Merge "Fix wrong log information in De...Dianne Hackborn2013-05-281-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | am 7f3ff133: Merge "Fix wrong log information in DevicePolicyManagerService"Dianne Hackborn2013-05-261-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Fix wrong log information in DevicePolicyManagerService"Dianne Hackborn2013-05-261-1/+1
| | |\ \ \ \
| | | * | | | Fix wrong log information in DevicePolicyManagerServicejoonyoung.cho2013-04-181-1/+1
| * | | | | | am f3251033: Merge "Framework/base: Added synchronization block to avoid race...Dianne Hackborn2013-05-261-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Framework/base: Added synchronization block to avoid race condition"Dianne Hackborn2013-05-261-1/+3
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Framework/base: Added synchronization block to avoid race conditionMaunik Shah2012-11-211-1/+3
| * | | | | | am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" int...Michael Wright2013-05-242-4/+90
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-devMichael Wright2013-05-242-4/+90
| | |\ \ \ \ \ \
| | | * | | | | | Pipe through bounding box information (DO NOT MERGE)Michael Wright2013-05-232-4/+90
* | | | | | | | | Replace mFocusedStack with getFocusedStack()Craig Mautner2013-05-281-2/+3
* | | | | | | | | Merge "New ArrayMap class."Dianne Hackborn2013-05-245-789/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New ArrayMap class.Dianne Hackborn2013-05-245-789/+15
* | | | | | | | | | Merge "Convert API refs to StackBox from ActivityStack."Craig Mautner2013-05-244-84/+86
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Convert API refs to StackBox from ActivityStack.Craig Mautner2013-05-244-84/+86
* | | | | | | | | | | am f2eb6fbc: am 36a151ab: Merge "Use the old interface when resetting connect...Robert Greenwalt2013-05-241-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 36a151ab: Merge "Use the old interface when resetting connections" into jb...Robert Greenwalt2013-05-241-3/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Use the old interface when resetting connections" into jb-mr2-devRobert Greenwalt2013-05-241-3/+4
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Use the old interface when resetting connectionsRobert Greenwalt2013-05-231-3/+4
* | | | | | | | | | | Merge "Add retrieval of StackBox info for more flexibility"Craig Mautner2013-05-244-1/+74
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Add retrieval of StackBox info for more flexibilityCraig Mautner2013-05-244-1/+74
* | | | | | | | | | | Some improvements to meminfo output.Dianne Hackborn2013-05-241-6/+11
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | am f25b876c: am 55bf965e: Merge "Compare binder instances when checking if li...Andrew Wilson2013-05-231-1/+2
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am 55bf965e: Merge "Compare binder instances when checking if listeners match...Andrew Wilson2013-05-231-1/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Compare binder instances when checking if listeners match." into jb-mr...Andrew Wilson2013-05-231-1/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Compare binder instances when checking if listeners match.Andrew Wilson2013-05-221-1/+2
* | | | | | | | | | | am 77049e13: am 60b4afed: Merge "Fix account filtering for specific package n...Amith Yamasani2013-05-231-4/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | am 60b4afed: Merge "Fix account filtering for specific package name" into jb-...Amith Yamasani2013-05-231-4/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /