summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge "Improve debug output." into jb-mr1-devCraig Mautner2012-09-131-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Improve debug output.Craig Mautner2012-09-131-5/+8
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Add preliminary API for reporting display capabilities." into jb-mr1-devJeff Brown2012-09-139-15/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add preliminary API for reporting display capabilities.Jeff Brown2012-09-139-15/+90
* | | | | | | | | | | | | | | Merge "Require ACCESS_FINE_LOCATION for Geofence use." into jb-mr1-devVictoria Lease2012-09-132-7/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Require ACCESS_FINE_LOCATION for Geofence use.Victoria Lease2012-09-132-7/+35
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Enable remote submix for wifi display." into jb-mr1-devJeff Brown2012-09-131-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Enable remote submix for wifi display.Jeff Brown2012-09-121-0/+17
* | | | | | | | | | | | | | | Merge "Add accessibility scroll actions to TabWidget" into jb-mr1-devSvetoslav Ganov2012-09-131-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add accessibility scroll actions to TabWidgetalanv2012-09-131-0/+37
* | | | | | | | | | | | | | | | Merge "Settings db upgrade steps only apply to the owner user" into jb-mr1-devChristopher Tate2012-09-131-63/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Settings db upgrade steps only apply to the owner userChristopher Tate2012-09-131-63/+74
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Fix bugs in grain where values could go out of bounds." into jb-mr1-devJason Sams2012-09-131-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix bugs in grain where values could go out of bounds.Jason Sams2012-09-131-3/+4
* | | | | | | | | | | | | | | | | Merge "Use shared app gid for forward-locked processes" into jb-mr1-devKenny Root2012-09-134-4/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use shared app gid for forward-locked processesKenny Root2012-09-114-4/+41
* | | | | | | | | | | | | | | | | Merge "Propagate systemUiVisibility changes to window manager" into jb-mr1-devCraig Mautner2012-09-132-6/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Propagate systemUiVisibility changes to window managerCraig Mautner2012-09-132-6/+5
* | | | | | | | | | | | | | | | | dodging the @JavascriptInterface bulletGuang Zhu2012-09-131-0/+2
| |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix build.Adam Powell2012-09-131-0/+20
* | | | | | | | | | | | | | | | Merge "Fix crash in recents" into jb-mr1-devMichael Jurka2012-09-132-15/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix crash in recentsMichael Jurka2012-09-132-15/+16
* | | | | | | | | | | | | | | | | Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr...Eino-Ville Talvala2012-09-132-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | NEW_API: Unhide android.hardware.Camera#enableShutterSoundEino-Ville Talvala2012-09-112-1/+1
* | | | | | | | | | | | | | | | | | Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-devGeremy Condra2012-09-136-0/+547
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | DO NOT MERGE Push event logging down into libcore.EventLoggerGeremy Condra2012-09-121-0/+11
| * | | | | | | | | | | | | | | | | | DO NOT MERGE Added event logging for config installation failures.Geremy Condra2012-09-122-0/+10
| * | | | | | | | | | | | | | | | | | DO NOT MERGE Create intermediate directories when installing config data.Geremy Condra2012-09-121-2/+11
| * | | | | | | | | | | | | | | | | | DO NOT MERGE Add components for the Android Config Updater to system server.Geremy Condra2012-09-124-0/+517
* | | | | | | | | | | | | | | | | | | Merge "Bring back new permission organization." into jb-mr1-devDianne Hackborn2012-09-132-282/+659
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Bring back new permission organization.Dianne Hackborn2012-09-132-282/+659
* | | | | | | | | | | | | | | | | | | | am d21b9a9e: am 2f140f96: Merge "Doc change: GCM changes" into jb-devKatie McCormick2012-09-1323-89/+257
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 2f140f96: Merge "Doc change: GCM changes" into jb-devKatie McCormick2012-09-1323-89/+257
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Doc change: GCM changes" into jb-devKatie McCormick2012-09-1323-89/+257
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Doc change: GCM changesKatie McCormick2012-09-1223-89/+257
* | | | | | | | | | | | | | | | | | | | | Merge "Try to avoid possible NPE" into jb-mr1-devKenny Root2012-09-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Try to avoid possible NPEKenny Root2012-09-131-1/+1
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Give DefaultContainerService all external storage." into jb-mr1-devJeff Sharkey2012-09-132-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Give DefaultContainerService all external storage.Jeff Sharkey2012-09-132-3/+7
* | | | | | | | | | | | | | | | | | | | | Merge "Fix build." into jb-mr1-devDianne Hackborn2012-09-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix build.Dianne Hackborn2012-09-121-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Updated tests for simpler ScriptC constructors." into jb-mr1-devStephen Hines2012-09-1228-29/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Updated tests for simpler ScriptC constructors.Stephen Hines2012-09-1228-29/+28
* | | | | | | | | | | | | | | | | | | | | | | Merge "Core accessibility settings should not be cleared on restore." into jb...Svetoslav Ganov2012-09-121-11/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Core accessibility settings should not be cleared on restore.Svetoslav Ganov2012-09-121-11/+21
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "New permissions UI, again." into jb-mr1-devDianne Hackborn2012-09-1210-394/+476
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | New permissions UI, again.Dianne Hackborn2012-09-1210-394/+476
* | | | | | | | | | | | | | | | | | | | | | | Merge "Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibilit...Svetoslav Ganov2012-09-121-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Enforcing BIND_ACCESSIBILITY_SERVICE for connecting to an accessibility service.Svetoslav Ganov2012-09-121-5/+1
| | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Secure setting for LocationFudger's accuracy" into jb-mr1-devVictoria Lease2012-09-122-47/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |