summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Revert "Revert "Close ActivityView and ActivityContainer cleanly.""Craig Mautner2014-06-132-38/+77
* Do not treat the dummy animation as an animationCraig Mautner2014-06-132-3/+17
* Merge commit '0f3d3dd2'Qiwen Zhao2014-06-132-74/+35
|\
| * am dd5c9471: Revert "Close ActivityView and ActivityContainer cleanly."Justin Koh2014-06-132-76/+36
| |\
| | * Revert "Close ActivityView and ActivityContainer cleanly."Justin Koh2014-06-132-76/+36
* | | Merge "Merge kwd to master"Wink Saville2014-06-122-135/+427
|\ \ \
| * | | Merge kwd to masterWink Saville2014-06-132-135/+427
* | | | Don't remove a user already being removed.Kenny Guy2014-06-131-1/+1
|/ / /
* | | Merge "Modifies APIs for retrieving managed profile accounts."Alexandra Gherghina2014-06-101-9/+16
|\ \ \
| * | | Modifies APIs for retrieving managed profile accounts.Alexandra Gherghina2014-06-121-9/+16
* | | | Fixed a wrong path to HdmiPortInfo classJinsuk Kim2014-06-131-2/+2
* | | | resolved conflicts for merge of 4849aa86 to masterChad Jones2014-06-122-3/+16
|\ \ \ \ | | |/ / | |/| |
| * | | am be634951: Fix permission problem and NPECraig Mautner2014-06-122-2/+16
| |\ \ \ | | | |/ | | |/|
| | * | Fix permission problem and NPECraig Mautner2014-06-122-2/+16
* | | | Merge "Separate Hardware Flp ServiceWatcher flags from the ones used by Softw...destradaa2014-06-101-2/+2
|\ \ \ \
| * | | | Separate Hardware Flp ServiceWatcher flags from the ones used by Software Flp.destradaa2014-06-121-2/+2
* | | | | RoutingControlAction for HdmiControlServiceJinsuk Kim2014-06-125-15/+408
* | | | | Merge "Do not display unsecure windows behind dialogs"Craig Mautner2014-06-122-4/+5
|\ \ \ \ \
| * | | | | Do not display unsecure windows behind dialogsCraig Mautner2014-06-122-4/+5
* | | | | | DeviceSelectAction for HdmiControlServiceJinsuk Kim2014-06-128-39/+504
* | | | | | am 00768c4d: Merge "JobScheduler blocking main thread." into lmp-preview-devMatthew Williams2014-06-122-6/+11
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "JobScheduler blocking main thread." into lmp-preview-devMatthew Williams2014-06-122-6/+11
| |\ \ \ \ \ \
| | * | | | | | JobScheduler blocking main thread.Matthew Williams2014-06-122-6/+11
* | | | | | | | am 2d0ab42b: Merge "Apply API Council comments to ConnectivityManager" into l...Robert Greenwalt2014-06-122-7/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-devRobert Greenwalt2014-06-122-7/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Apply API Council comments to ConnectivityManagerRobert Greenwalt2014-06-112-7/+6
* | | | | | | | am 50ece5ec: am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy ...Nick Kralevich2014-06-121-1/+8
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles."Nick Kralevich2014-06-121-1/+8
| |\ \ \ \ \ \ \
| | * | | | | | | Add service_contexts to policy update bundles.Riley Spahn2014-06-121-1/+8
* | | | | | | | | Merge "Fix backwards compatibility for introspected windows."Svetoslav2014-06-115-68/+132
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix backwards compatibility for introspected windows.Svetoslav2014-06-125-68/+132
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Allow device owner to configure secondary users"Jason Monk2014-06-121-2/+47
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow device owner to configure secondary usersJason Monk2014-06-121-2/+47
* | | | | | | | | | Merge "Guest user first iteration"Amith Yamasani2014-06-121-42/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Guest user first iterationAmith Yamasani2014-06-121-42/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | am e2f6373c: Merge "Heads-up notifications for low battery warnings." into lm...John Spurlock2014-06-121-0/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Heads-up notifications for low battery warnings." into lmp-preview-devJohn Spurlock2014-06-101-0/+13
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Heads-up notifications for low battery warnings.John Spurlock2014-06-111-0/+13
| * | | | | | | | | Merge "Minor changes to the LinkAddress API docs." into lmp-preview-devRobert Greenwalt2014-06-103-8/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Minor changes to the LinkAddress API docs.Lorenzo Colitti2014-06-113-8/+8
| * | | | | | | | | | Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-devRobert Greenwalt2014-06-113-7/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add a new IpPrefix class and use it in RouteInfo.Sreeram Ramachandran2014-06-113-7/+7
| | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-pr...Robert Greenwalt2014-06-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-devRobert Greenwalt2014-06-111-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Make NetworkCapabilities publicly immutable.Robert Greenwalt2014-06-111-2/+2
| | |/ / / / / / / / /
* | | | | | | | | | | am 8c4b4dc8: Merge "b/15330955 Make RemoteController use the new session APIs...RoboErik2014-06-121-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "b/15330955 Make RemoteController use the new session APIs" into lmp-pr...RoboErik2014-06-111-0/+5
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | b/15330955 Make RemoteController use the new session APIsRoboErik2014-06-111-0/+5
* | | | | | | | | | | am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightl...Christopher Tate2014-06-121-8/+18
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge "Relax duplicate-permission-definition constraints slightly" into lmp-p...Christopher Tate2014-06-111-8/+18
| |\ \ \ \ \ \ \ \ \