summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* Ignore spammy package logs when dumping.Jeff Sharkey2014-11-241-15/+10
* Introduce revision codes for split APKs.Jeff Sharkey2014-11-242-13/+74
* Merge "Don't bother validating networks that don't satisfy the default reques...Paul Jensen2014-11-243-12/+30
|\
| * Don't bother validating networks that don't satisfy the default request.Paul Jensen2014-11-203-12/+30
* | Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1...Dianne Hackborn2014-11-245-74/+188
|\ \
| * | Work on issue #18486438: Reduce size of bugreport outputDianne Hackborn2014-11-215-74/+188
* | | Merge "Delete unused/non-working code." into lmp-mr1-devSreeram Ramachandran2014-11-241-88/+0
|\ \ \
| * | | Delete unused/non-working code.Sreeram Ramachandran2014-11-211-88/+0
* | | | Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-devSreeram Ramachandran2014-11-242-11/+84
|\ \ \ \
| * | | | Allow VPNs to specify their underlying networks.Sreeram Ramachandran2014-11-212-11/+84
| |/ / /
* | | | Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr...Sreeram Ramachandran2014-11-243-176/+126
|\ \ \ \ | |/ / /
| * | | Eliminate race conditions in UID-based network filtering.Sreeram Ramachandran2014-11-213-176/+126
* | | | Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-devAdrian Roos2014-11-241-2/+2
|\ \ \ \
| * | | | Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045Adrian Roos2014-11-211-2/+2
* | | | | Merge "Fix DPM.resetPassword("")" into lmp-mr1-devAdrian Roos2014-11-241-2/+9
|\ \ \ \ \
| * | | | | Fix DPM.resetPassword("")Adrian Roos2014-11-211-2/+9
* | | | | | Merge "Fixed several time related states for secondary users" into lmp-mr1-devSelim Cinek2014-11-241-5/+6
|\ \ \ \ \ \
| * | | | | | Fixed several time related states for secondary usersSelim Cinek2014-11-211-5/+6
* | | | | | | Merge "Additional changes to SubscriptionManager API as per API council." int...Wink Saville2014-11-223-148/+157
|\ \ \ \ \ \ \
| * | | | | | | Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-223-148/+157
* | | | | | | | Fix binder equality checkRoboErik2014-11-211-1/+2
|/ / / / / / /
* | | | | | | Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-devJeff Sharkey2014-11-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Avoid NPE in forceStopPackageLocked().Jeff Sharkey2014-11-211-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-devCraig Mautner2014-11-211-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Treat screen-on while pausing as pause timeout.Craig Mautner2014-11-201-0/+4
* | | | | | | | Merge "Different messages when wiping user and not device" into lmp-mr1-devAmith Yamasani2014-11-211-0/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Different messages when wiping user and not deviceAmith Yamasani2014-11-211-0/+13
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Lightweight checkin output for network stats." into lmp-mr1-devJeff Sharkey2014-11-214-41/+158
|\ \ \ \ \ \ \ \
| * | | | | | | | Lightweight checkin output for network stats.Jeff Sharkey2014-11-214-41/+158
| |/ / / / / / /
* | | | | | | | Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-devJeff Brown2014-11-214-175/+160
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 694c1d2b to lmp-mr1-devJeff Brown2014-11-214-175/+160
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge "Support keeping activities resumed while dozing." into lmp-sprout-devJeff Brown2014-11-213-175/+158
| | |\ \ \ \ \ \ \
| | | * | | | | | | Support keeping activities resumed while dozing.Jeff Brown2014-11-203-175/+158
* | | | | | | | | | Merge "CEC: Enable log for non-user builds" into lmp-mr1-devJinsuk Kim2014-11-211-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | CEC: Enable log for non-user buildsJinsuk Kim2014-11-221-2/+3
* | | | | | | | | | Merge "Shutdown backup manager service when device owner is set" into lmp-mr1...Zoltan Szatmary-Ban2014-11-211-0/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Shutdown backup manager service when device owner is setZoltan Szatmary-Ban2014-11-131-0/+13
* | | | | | | | | | | Merge "Adding method to query backup manager service activity status" into lm...Zoltan Szatmary-Ban2014-11-211-1/+16
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Adding method to query backup manager service activity statusZoltan Szatmary-Ban2014-11-121-1/+16
* | | | | | | | | | Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-devPaul Jensen2014-11-211-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't allow an uncreated Network to satsify requests.Paul Jensen2014-11-191-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | am c3f5d718: Merge "Fix null handling in proxies." into lmp-devGeoffrey Borggaard2014-11-212-6/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | am c3f5d718: Merge "Fix null handling in proxies." into lmp-devGeoffrey Borggaard2014-11-202-6/+9
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Fix null handling in proxies.Geoffrey Borggaard2014-11-202-6/+9
| * | | | | | | | | Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-devGeoffrey Borggaard2014-11-191-2/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Setting ADB_ENABLED may result in a SecurityException.Geoffrey Borggaard2014-11-191-2/+7
* | | | | | | | | | Merge "Recents backup helper" into lmp-mr1-devChristopher Tate2014-11-211-0/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Recents backup helperChristopher Tate2014-11-201-0/+6
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge "Rename EXTRA_NETWORK ConnectivityManager constants." into lmp-mr1-devErik Kline2014-11-211-3/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename EXTRA_NETWORK ConnectivityManager constants.Erik Kline2014-11-201-3/+2