summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 8c1d1b3e: Merge "Maybe fix issue #9296868: Crash in system process" into j...Dianne Hackborn2013-06-051-23/+28
|\
| * Maybe fix issue #9296868: Crash in system processDianne Hackborn2013-06-051-23/+28
* | am 05caa2a3: Apply scan-always setting to initial wifi state.Robert Greenwalt2013-06-031-1/+5
|\ \ | |/
| * Apply scan-always setting to initial wifi state.Robert Greenwalt2013-06-011-1/+5
* | am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr...Robert Greenwalt2013-06-011-2/+12
|\ \ | |/
| * Remember wifi country that's set before bootRobert Greenwalt2013-05-311-2/+12
* | am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-devVictoria Lease2013-05-291-55/+23
|\ \ | |/
| * break up LocationManagerService's WakeLockVictoria Lease2013-05-291-55/+23
| * DO NOT MERGE. Framework/base: Added synchronization block to avoid race condi...Maunik Shah2013-05-281-1/+3
* | 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
* | | | 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
| | |/ /
* | | | 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
* | | | | 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
* | | | | | | 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
* | | | | | | 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 60b4afed: Merge "Fix account filtering for specific package name" into jb-...Amith Yamasani2013-05-231-4/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix account filtering for specific package nameAmith Yamasani2013-05-221-4/+11
| | |/ / / / / | |/| | | | |
* | | | | | | am 4c32885c: Merge "Don\'t put up wifi-available note when disabled" into jb-...Robert Greenwalt2013-05-211-0/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Don't put up wifi-available note when disabled" into jb-mr2-devRobert Greenwalt2013-05-211-0/+5
| |\ \ \ \ \ \
| | * | | | | | Don't put up wifi-available note when disabledRobert Greenwalt2013-05-211-0/+5
* | | | | | | | am f5ceaf4b: Merge "Archive a copy of each dismissed notification." into jb-m...Daniel Sandler2013-05-211-4/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Archive a copy of each dismissed notification." into jb-mr2-devDaniel Sandler2013-05-211-4/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Archive a copy of each dismissed notification.Daniel Sandler2013-05-211-4/+5
* | | | | | | | am 507bd53a: Merge "Do not report the fake UI automation service to clients."...Svetoslav Ganov2013-05-201-2/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Do not report the fake UI automation service to clients." into jb-mr2-devSvetoslav Ganov2013-05-201-2/+22
| |\ \ \ \ \ \ \
| | * | | | | | | Do not report the fake UI automation service to clients.Svetoslav Ganov2013-05-171-2/+22
* | | | | | | | | am b11672de: Merge "Add a time margin for deferred enable." into jb-mr2-devRobert Greenwalt2013-05-201-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Add a time margin for deferred enable.Robert Greenwalt2013-05-201-2/+6
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | am 5c11e8ee: Fix off-by-1 error in timingRobert Greenwalt2013-05-201-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix off-by-1 error in timingRobert Greenwalt2013-05-201-2/+2
* | | | | | | | am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-devRobert Greenwalt2013-05-191-4/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add some temp wifi debugging output" into jb-mr2-devRobert Greenwalt2013-05-191-4/+21
| |\ \ \ \ \ \ \