summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* New API to request a list of current notifications.Daniel Sandler2013-02-071-69/+145
* am d080bb07: am b9620a89: am 9434c112: Merge "Services: Adding HSPAP info in ...Jaikumar Ganesh2013-02-071-1/+2
|\
| * am 9434c112: Merge "Services: Adding HSPAP info in Android"Jaikumar Ganesh2013-02-071-1/+2
| |\
| | * Merge "Services: Adding HSPAP info in Android"Jaikumar Ganesh2013-02-071-1/+2
| | |\
| | | * Services: Adding HSPAP info in AndroidArun Ravindran2012-09-051-1/+2
* | | | Merge "Second pass tying into dns cache per interface"Robert Greenwalt2013-02-072-114/+69
|\ \ \ \
| * | | | Second pass tying into dns cache per interfaceMattias Falk2013-02-062-114/+69
* | | | | Merge "Migrate AppWindowToken lists into DisplayContent."Craig Mautner2013-02-079-246/+459
|\ \ \ \ \
| * | | | | Migrate AppWindowToken lists into DisplayContent.Craig Mautner2013-02-059-246/+459
* | | | | | Fix build, conflict with another change.Dianne Hackborn2013-02-071-1/+1
* | | | | | Merge "App ops: track system windows, monitoring changes."Dianne Hackborn2013-02-075-15/+165
|\ \ \ \ \ \
| * | | | | | App ops: track system windows, monitoring changes.Dianne Hackborn2013-02-065-15/+165
* | | | | | | Merge "Require that bugreport requesters have DUMP."Jeff Sharkey2013-02-061-3/+1
|\ \ \ \ \ \ \
| * | | | | | | Require that bugreport requesters have DUMP.Jeff Sharkey2013-02-051-3/+1
* | | | | | | | Merge "refactor isAllowedBySettingsLocked()"Victoria Lease2013-02-061-22/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | refactor isAllowedBySettingsLocked()Victoria Lease2013-02-051-22/+32
* | | | | | | | | Merge "Fix addGpsStatusListener"Victoria Lease2013-02-061-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix addGpsStatusListenerVictoria Lease2013-02-051-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"Derek Sollenberger2013-02-061-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | am 080df3f3: Merge "dual-mode switching single/multiuser ServiceWatcher"Victoria Lease2013-02-058-69/+101
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | am 923bd98f: Merge "UsbDebuggingManager: Add interface to clear secure adb keys"Benoit Goby2013-02-013-3/+40
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | am 1782468c: Merge "EntropyMixer: add ro.build.fingerprint to the mix"Nick Kralevich2013-02-011-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am f265ea9d: App ops: vibration, neighboring cells, dialing, etc.Dianne Hackborn2013-02-0112-89/+125
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 88a23f2f: Merge ""Fixing backwards cmpatibility for enabling explore by to...Svetoslav Ganov2013-02-011-36/+215
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 0214f205: Merge "Revert "Fixing backwards cmpatibility for enabling explor...Mike Cleron2013-02-011-215/+36
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 9b4a2858: Merge "Migrate package notification restrictions to AppOps."Daniel Sandler2013-02-011-75/+59
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 97273d50: Merge "Fixing backwards cmpatibility for enabling explore by touch"Svetoslav2013-02-011-36/+215
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am d4b1d9cf: Merge changes I4859c8db,I7643024dGeremy Condra2013-01-312-15/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f48a2d30: Merge "Add accessibility actions for text editing."Svetoslav2013-01-301-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ec695824: Merge "Remove "enhance web scripts" from settings and make it re...Svetoslav2013-01-301-131/+80
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75d880df: Merge "Revert "Clean up published network condition reporting.""Wink Saville2013-01-301-21/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am afae9d24: Merge "BatteryService: Treat USB charging ports and charging acc...Todd Poynor2013-01-301-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b86d026a: Merge "BatteryService: Allow power supplies to switch type betwe...Todd Poynor2013-01-301-82/+142
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am da01da17: Merge "Do not turn on imes unexpectedly with unit tests"Satoshi Kataoka2013-01-291-15/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d4d93640: Maybe fix build.Dianne Hackborn2013-01-292-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7f54ffd0: Merge "Improve configuration of default preferred apps."Dianne Hackborn2013-01-294-30/+167
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 91488eed: Merge changes Ie674e8b2,I0b9448c8Svetoslav2013-01-282-2/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d0fd5464: Merge "Adding UI test automation APIs."Svetoslav Ganov2013-01-284-32/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4daf9b1b: Merge "UsbDeviceManager: Don\'t start UsbDebuggingManager when d...Benoit Goby2013-01-281-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5988335a: Merge "Optimize Looper JNI code."Jeff Brown2013-01-281-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 93f770b5: Merge "Fix bug where we could get stuck repeatedly launching an ...Dianne Hackborn2013-01-282-2/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am de07d41f: Merge "Annotate Locations coming from mock providers"Victoria Lease2013-01-281-3/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b9781fe0: Merge "App ops: you can now turn off operations."Dianne Hackborn2013-01-257-54/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 377fc095: Merge "Fix GpsLocationProvider.enable/disable/isEnabled"Laurent Tu2013-01-241-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d8ba6cc9: Merge "Add new API to propagate contextual data to the assist ac...Dianne Hackborn2013-01-231-0/+81
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 51ff575d: Merge "Fix issue #7649720: ANR occur when OTA with lower version...Dianne Hackborn2013-01-231-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 846dda3f: Merge "Add new disabled state for "optional" built-in apps."Dianne Hackborn2013-01-234-10/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 56dc0e02: Merge "Tests to assert correct January behavior."Jeff Sharkey2013-01-221-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 172175fe: am 05f1f0ec: am 555b07df: am 2c64b539: am 596532d9: Properly ini...Amith Yamasani2013-01-221-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cc743347: Merge "New API to get app op information about a single package."Dianne Hackborn2013-01-181-21/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |