summaryrefslogtreecommitdiffstats
path: root/core/java
Commit message (Expand)AuthorAgeFilesLines
* am d9e0abdf: am 04143fdd: am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
|\
| * am e38ee9df: Merge "Add Debug.getRuntimeStat()."Hiroshi Yamauchi2015-04-141-0/+90
| |\
| | * Add Debug.getRuntimeStat().Hiroshi Yamauchi2015-04-141-0/+90
* | | Merge "Add setting flag to enable new contact aggregator"Zheng Fu2015-04-141-0/+7
|\ \ \
| * | | Add setting flag to enable new contact aggregatorZheng Fu2015-04-131-0/+7
* | | | Merge "Fixes to idle alarm scheduling, package importance."Dianne Hackborn2015-04-147-47/+251
|\ \ \ \
| * | | | Fixes to idle alarm scheduling, package importance.Dianne Hackborn2015-04-147-47/+251
* | | | | Merge "Add more firstStrong alternatives for textDirection."Roozbeh Pournader2015-04-142-8/+44
|\ \ \ \ \
| * | | | | Add more firstStrong alternatives for textDirection.Roozbeh Pournader2015-04-132-8/+44
* | | | | | Merge "camera2: add reprocess support"Chien-Yu Chen2015-04-1410-123/+759
|\ \ \ \ \ \
| * | | | | | camera2: add reprocess supportChien-Yu Chen2015-04-1310-123/+759
* | | | | | | Merge "Use HandleView's previous offset for text selection handles"Mady Mellor2015-04-141-15/+7
|\ \ \ \ \ \ \
| * | | | | | | Use HandleView's previous offset for text selection handlesMady Mellor2015-04-011-15/+7
* | | | | | | | Merge changes from topic 'lss-update'Andres Morales2015-04-143-12/+123
|\ \ \ \ \ \ \ \
| * | | | | | | | Add challenge to IGateKeeperServiceAndres Morales2015-04-133-2/+54
| * | | | | | | | Wire up GateKeeper to LockSettingsServiceAndres Morales2015-04-133-12/+71
* | | | | | | | | Make ActionBar animations work correctlyChet Haase2015-04-143-91/+45
* | | | | | | | | Merge "Introduce device owner API to disable the keyguard"Benjamin Franz2015-04-142-0/+25
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Introduce device owner API to disable the keyguardBenjamin Franz2015-04-142-0/+25
* | | | | | | | | | Merge "Revert "Load WebView from one out of a list of packages.""Gustav Sennton2015-04-141-57/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Load WebView from one out of a list of packages."Gustav Sennton2015-04-141-57/+14
* | | | | | | | | | | am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contai...Erik Kline2015-04-142-7/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-142-7/+16
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge "Add android.net.IpPrefix#contains()"Erik Kline2015-04-142-7/+16
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Add android.net.IpPrefix#contains()Erik Kline2015-04-142-7/+16
* | | | | | | | | | | Merge "Load WebView from one out of a list of packages."Gustav Sennton2015-04-141-14/+57
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Load WebView from one out of a list of packages.Gustav Sennton2015-04-081-14/+57
* | | | | | | | | | | Merge "Add setOtaPolicy/getOtaPolicy API in DPMS"Rubin Xu2015-04-143-0/+234
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add setOtaPolicy/getOtaPolicy API in DPMSRubin Xu2015-04-143-0/+234
* | | | | | | | | | | | Merge "Add Bluetooth Contacts Sharing policy in DevicePolicyManager"Ricky Wai2015-04-142-0/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add Bluetooth Contacts Sharing policy in DevicePolicyManagerRicky Wai2015-04-142-0/+71
* | | | | | | | | | | | am 36e53bb8: am 1770f9cf: am 3afca74a: Merge "BatteryStats: Adds an additiona...Ruchi Kandoi2015-04-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 3afca74a: Merge "BatteryStats: Adds an additional condition to avoid Array...Ruchi Kandoi2015-04-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "BatteryStats: Adds an additional condition to avoid ArrayIndexOutOfBou...Ruchi Kandoi2015-04-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | BatteryStats: Adds an additional condition to avoidRuchi Kandoi2014-07-081-1/+1
* | | | | | | | | | | | | Add ability to flush FLP HAL batched locations buffer.David Christie2015-04-131-11/+18
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Add a status callback for location batching in FLP HAL"David Christie2015-04-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| * | | | | | | | | | | Add a status callback for location batching in FLP HALDavid Christie2015-04-131-0/+6
* | | | | | | | | | | | Merge "Add capability callback for FLP HAL."David Christie2015-04-143-3/+45
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Add capability callback for FLP HAL.David Christie2015-04-123-3/+45
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Implement ChooserTargetService querying for ChooserActivity"Adam Powell2015-04-145-125/+908
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Implement ChooserTargetService querying for ChooserActivityAdam Powell2015-04-135-125/+908
* | | | | | | | | | | | Merge "Add KeyguardManager.isDeviceSecure"Adrian Roos2015-04-132-0/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add KeyguardManager.isDeviceSecureAdrian Roos2015-04-132-0/+27
* | | | | | | | | | | | Merge "Zen: Support external condition providers."John Spurlock2015-04-133-5/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Zen: Support external condition providers.John Spurlock2015-04-133-5/+18
* | | | | | | | | | | | Merge "Grant cert installer access to installKeyPair()"Rubin Xu2015-04-131-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Grant cert installer access to installKeyPair()Rubin Xu2015-04-021-3/+4
* | | | | | | | | | | | | Avoid zero-payload backups in local transportChristopher Tate2015-04-132-17/+43
* | | | | | | | | | | | | Merge "Hide Voicemails.{insert, deleteAll, setStatus}"Yorke Lee2015-04-131-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |