summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* Merge "Revert "Add keychain user with special keystore access permissions""Brian Carlstrom2011-07-011-6/+0
|\
| * Revert "Add keychain user with special keystore access permissions"Brian Carlstrom2011-06-301-6/+0
* | Migrate bandwidth control to NMS, omit history.Jeff Sharkey2011-06-301-2/+0
|/
* Enforce background data flag, rules through netd.Jeff Sharkey2011-06-301-2/+7
* Merge "Plumb information from the framework about asec container size."Dianne Hackborn2011-06-291-0/+33
|\
| * Plumb information from the framework about asec container size.Dianne Hackborn2011-06-281-0/+33
* | Push interface quota rules from NetworkPolicyManager to kernel.Ashish Sharma2011-06-291-0/+10
|/
* Merge "Fix race condition in WakeLocks."Jake Hamby2011-06-271-1/+1
|\
| * Fix race condition in WakeLocks.Jake Hamby2011-06-151-1/+1
* | Turn on HW accel by default for apps that target ICS.Dianne Hackborn2011-06-241-0/+10
* | Enable bandwidth module from stats service.Jeff Sharkey2011-06-221-0/+2
* | Tethering: Use UsbManager to enable/disable RNDISMike Lockwood2011-06-191-15/+0
* | Fix IP address cleanup on network disconnectIrfan Sheriff2011-06-171-0/+5
* | Merge f28f1de3 - regen current.txtJean-Baptiste Queru2011-06-161-0/+18
|\ \ | |/ |/|
| * am 413b53b5: am 70921d61: Merge "We must keep up with the Joneses." into hone...Dianne Hackborn2011-06-151-0/+18
| |\
| | * am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2Dianne Hackborn2011-06-151-0/+18
| | |\
| | | * We must keep up with the Joneses.Dianne Hackborn2011-06-151-0/+18
* | | | Merge "resolved conflicts for merge of 77fc8b80 to master"Dianne Hackborn2011-06-141-0/+20
|\ \ \ \
| * \ \ \ resolved conflicts for merge of 77fc8b80 to masterDianne Hackborn2011-06-141-0/+20
| |\ \ \ \ | | |/ / /
| | * | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f...Dianne Hackborn2011-06-141-0/+20
| | |\ \ \ | | | |/ /
| | | * | am c5193c62: Merge "Add new landscape and portrait orientation features." int...Dianne Hackborn2011-06-141-0/+20
| | | |\ \ | | | | |/
| | | | * Add new landscape and portrait orientation features.Dianne Hackborn2011-06-141-0/+20
* | | | | deprecate RADIO constant, add getRadioVersion methodDoug Zongker2011-06-141-2/+20
|/ / / /
* | | | Merge "Optimize StrictMode activity instance count check."Jeff Brown2011-06-101-16/+87
|\ \ \ \
| * | | | Optimize StrictMode activity instance count check.Jeff Brown2011-06-101-16/+87
* | | | | Merge "Always clear the Message when recycled."Jeff Brown2011-06-101-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Always clear the Message when recycled.Jeff Brown2011-06-101-1/+2
* | | | | resolved conflicts for merge of f51ded0f to masterDianne Hackborn2011-06-101-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag p...Dianne Hackborn2011-06-091-2/+2
| |\ \ \ | | |/ /
| | * | am 220cd77d: Merge "Enforce public resource restriction on bag parents." into...Dianne Hackborn2011-06-091-2/+2
| | |\ \ | | | |/
| | | * Enforce public resource restriction on bag parents.Dianne Hackborn2011-06-091-2/+2
* | | | Merge "StorageVolume: Add allowMassStorage flag"Mike Lockwood2011-06-071-5/+19
|\ \ \ \
| * | | | StorageVolume: Add allowMassStorage flagMike Lockwood2011-06-071-5/+19
* | | | | resolved conflict for merge of fc51aaec to masterWink Saville2011-06-041-4/+33
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTEWink Saville2011-06-041-4/+33
| |\ \ \ | | |/ /
| | * | Add FileUtils.checksumCrc32Wink Saville2011-06-031-4/+33
* | | | resolved conflicts for merge of d247ee41 to masterDianne Hackborn2011-06-032-0/+21
|\ \ \ \ | |/ / /
| * | | am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restorin...Dianne Hackborn2011-06-022-0/+21
| |\ \ \ | | |/ /
| | * | am b46ed763: Add new Fragment API for explicitly saving/restoring state.Dianne Hackborn2011-06-022-0/+21
| | |\ \ | | | |/
| | | * Add new Fragment API for explicitly saving/restoring state.Dianne Hackborn2011-06-022-0/+21
* | | | am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-031-0/+10
|\ \ \ \ | |/ / /
| * | | am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-011-0/+10
| |\ \ \ | | |/ /
| | * | am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-011-0/+10
| | |\ \ | | | |/
| | | * Work around OpenFeint bug.Dianne Hackborn2011-06-011-0/+10
* | | | am ca6c3a2b: am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes ...Gilles Debunne2011-06-022-8/+6
|\ \ \ \ | |/ / /
| * | | am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional S...Gilles Debunne2011-05-262-8/+6
| |\ \ \ | | |/ /
| | * | am 24de44a1: Merge "ExternalStorageFormatter takes an optional StorageVolume ...Gilles Debunne2011-05-262-8/+6
| | |\ \ | | | |/
| | | * ExternalStorageFormatter takes an optional StorageVolume target.Gilles Debunne2011-05-262-8/+6
* | | | Collect historical network stats.Jeff Sharkey2011-06-011-35/+0
* | | | Move stringToFile utility from ConnectivityService to FileUtilsMike Lockwood2011-05-281-0/+17