summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* Merge "BatteryStats: Better big-little CPU accounting" into mnc-dr-devAdam Lesinski2015-09-181-7/+6
|\
| * BatteryStats: Better big-little CPU accountingAdam Lesinski2015-09-091-7/+6
* | Send power hint on fling gestures.Michael Wright2015-09-171-0/+11
|/
* Merge "BatteryStats: Start using cpu power from kernel" into mnc-dr-devAdam Lesinski2015-08-311-0/+1
|\
| * BatteryStats: Start using cpu power from kernelAdam Lesinski2015-08-211-0/+1
* | am 3883e72a: Merge "BatteryStats: Bump checkin version" into mnc-devAshish Sharma2015-08-271-1/+1
|\ \ | |/ |/|
| * BatteryStats: Bump checkin versionAdam Lesinski2015-08-201-1/+1
* | am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-devJeff Sharkey2015-08-201-1/+3
|\ \ | |/
| * Pass underlying volume UUID to StorageVolume.Jeff Sharkey2015-08-191-1/+3
* | am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system U...Adam Lesinski2015-08-141-6/+6
|\ \ | |/
| * Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDsAdam Lesinski2015-08-131-6/+6
* | am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Sett...Dianne Hackborn2015-08-131-0/+11
|\ \ | |/
| * Fix issue #23116383: Include security patch level in SettingsDianne Hackborn2015-08-121-0/+11
* | am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mn...Dianne Hackborn2015-08-071-0/+4
|\ \ | |/
| * Fix issue #22989030: Separate battery whitelistsDianne Hackborn2015-08-071-0/+4
* | am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner"...Andres Morales2015-08-062-0/+22
|\ \ | |/
| * Merge "[UserManager] expose method to retrieve credential owner" into mnc-devAndres Morales2015-08-062-0/+22
| |\
| | * [UserManager] expose method to retrieve credential ownerAndres Morales2015-08-052-0/+22
* | | am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-devMichael Wright2015-08-061-1/+0
|\ \ \ | |/ /
| * | Merge "Make the NullVibrator really null." into mnc-devMichael Wright2015-08-061-1/+0
| |\ \
| | * | Make the NullVibrator really null.Michael Wright2015-07-301-1/+0
* | | | resolved conflicts for merge of dbc4edcc to mnc-dr-devPaul Jensen2015-08-051-1/+10
|\ \ \ \ | |/ / /
| * | | Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-devPaul Jensen2015-08-051-1/+10
| |\ \ \ | | |_|/ | |/| |
| | * | Fix NOT_RESTRICTED network capability and enforce it.Paul Jensen2015-08-041-1/+10
| | |/
* | | am c1836bb0: Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-312-2/+2
|\ \ \ | |/ /
| * | Merge "Change MNC codename to just M." into mnc-devDianne Hackborn2015-07-312-2/+2
| |\ \
| | * | Change MNC codename to just M.Dianne Hackborn2015-07-292-2/+2
* | | | am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unkno...Adam Lesinski2015-07-301-1/+3
|\ \ \ \ | |/ / /
| * | | Merge "BatteryStats: include mobile radio active count and unknown time in ch...Adam Lesinski2015-07-301-1/+3
| |\ \ \
| | * | | BatteryStats: include mobile radio active count and unknown time in checkinAdam Lesinski2015-07-301-1/+3
| | |/ /
* | | | am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions runni...Dianne Hackborn2015-07-301-1/+3
|\ \ \ \ | |/ / /
| * | | More maybe fix issue #22765972: Binder transactions running out...Dianne Hackborn2015-07-291-1/+3
| |/ /
* | | am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out ...Dianne Hackborn2015-07-291-1/+8
|\ \ \ | |/ /
| * | Merge "Work on issue #22765972: Binder transactions running out of address......Dianne Hackborn2015-07-291-1/+8
| |\ \
| | * | Work on issue #22765972: Binder transactions running out of address...Dianne Hackborn2015-07-281-1/+8
* | | | am b8040265: Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-294-11/+46
|\ \ \ \ | |/ / /
| * | | Give secondary users read-only physical cards.Jeff Sharkey2015-07-284-11/+46
| |/ /
* | | am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-devJeff Sharkey2015-07-231-0/+12
|\ \ \ | |/ /
| * | Merge "More info to support CTS, fix reconcile bug." into mnc-devJeff Sharkey2015-07-221-0/+12
| |\ \
| | * | More info to support CTS, fix reconcile bug.Jeff Sharkey2015-07-221-0/+12
| | |/
* | | am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze...Dianne Hackborn2015-07-231-0/+1
|\ \ \ | |/ /
| * | Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-devDianne Hackborn2015-07-221-0/+1
| |\ \
| | * | Fix issue #22612630: Ensure SMS/Call delivery during DozeDianne Hackborn2015-07-211-0/+1
| | |/
* | | am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction"...Fyodor Kupolov2015-07-211-1/+3
|\ \ \ | |/ /
| * | Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restrictionFyodor Kupolov2015-07-211-1/+3
| |/
* | am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-devSvetoslav2015-07-151-1/+16
|\ \ | |/
| * Make sure we get valid package name or fail.Svetoslav2015-07-151-1/+16
* | resolved conflicts for merge of 1d4247c4 to mnc-dr-devJim Miller2015-07-153-5/+19
|\ \ | |/
| * Improve tracking of screen on reasons.Dianne Hackborn2015-07-153-5/+19
* | am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing...Dianne Hackborn2015-07-152-4/+11
|\ \ | |/