summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
Commit message (Expand)AuthorAgeFilesLines
* am ff62e966: am 149510e0: am b9f960e0: Merge "Fixed cancel() not working corr...Narayan Kamath2014-01-311-1/+12
|\
| * am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"Narayan Kamath2014-01-311-3/+12
| |\
| | * Fixed cancel() not working correctlyjl19902014-01-301-3/+12
* | | am 4a587146: am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch...Narayan Kamath2014-01-292-46/+51
|\ \ \ | |/ /
| * | am 09d07d0d: am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Bind...Narayan Kamath2014-01-292-46/+51
| |\ \
| | * \ am e3e4b405: am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel...Narayan Kamath2014-01-292-46/+51
| | |\ \
| | | * \ am 9846fb69: am 50afaefd: Merge "AArch64: Make Binder and Parcel 64-bit compa...Narayan Kamath2014-01-292-46/+51
| | | |\ \ | | | | |/
| | | | * AArch64: Make Binder and Parcel 64-bit compatibleAshok Bhat2014-01-232-46/+51
* | | | | Add "start time" timestamp to battery stats.Dianne Hackborn2014-01-241-2/+11
* | | | | Hide android.os.Parcel.obtain(int).Narayan Kamath2014-01-231-0/+1
* | | | | Merge "Battery stats improvements."Dianne Hackborn2014-01-221-13/+78
|\ \ \ \ \
| * | | | | Battery stats improvements.Dianne Hackborn2014-01-221-13/+78
* | | | | | am e2c9cd58: Merge "Refactor display manager service to new pattern." into kl...Jeff Brown2014-01-181-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Refactor display manager service to new pattern.Jeff Brown2014-01-161-5/+5
* | | | | Merge "Run finalizers before counting for StrictMode."Jeff Sharkey2014-01-161-2/+9
|\ \ \ \ \
| * | | | | Run finalizers before counting for StrictMode.Jeff Sharkey2014-01-161-2/+9
* | | | | | boot into recovery via the pre-recovery serviceDoug Zongker2014-01-161-0/+12
* | | | | | resolved conflicts for merge of 6f357d32 to masterJeff Brown2014-01-162-0/+74
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Start untangling system server early bootstrapping.Jeff Brown2014-01-162-0/+74
| | |/ / / | |/| | |
* | | | | Track AArch64 changes from AOSP.Narayan Kamath2014-01-161-1/+1
* | | | | am 275586aa: am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch...Narayan Kamath2014-01-161-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-161-6/+6
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os...Narayan Kamath2014-01-161-6/+6
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Merge "AArch64: Use long for pointers in android/os/MessageQueue"Narayan Kamath2014-01-161-6/+6
| | | |\ \
| | | | * | AArch64: Use long for pointers in android/os/MessageQueueAshok Bhat2014-01-101-6/+6
* | | | | | am c45068e4: am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch...Narayan Kamath2014-01-161-5/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers ...Narayan Kamath2014-01-161-5/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os...Narayan Kamath2014-01-161-5/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "AArch64: Use long for pointers in android/os/MemoryFile"Narayan Kamath2014-01-161-5/+5
| | | |\ \ \
| | | | * | | AArch64: Use long for pointers in android/os/MemoryFileAshok Bhat2014-01-101-5/+5
| | | | |/ /
* | | | | | Whoops add a line separator.Dianne Hackborn2014-01-151-0/+1
* | | | | | Merge "Add battery power use reporting to batterystats service."Dianne Hackborn2014-01-161-9/+137
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add battery power use reporting to batterystats service.Dianne Hackborn2014-01-151-9/+137
* | | | | | Detect removable and emulated secondary storage.Jeff Sharkey2014-01-152-78/+124
* | | | | | am ac20b469: am 6c13f384: am 56b11064: am 9a5005a3: am f6730d26: Merge "Add s...Jeff Hao2014-01-151-13/+41
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 56b11064: am 9a5005a3: am f6730d26: Merge "Add sample profiling interface ...Jeff Hao2014-01-151-13/+41
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 9a5005a3: am f6730d26: Merge "Add sample profiling interface to startMetho...Jeff Hao2014-01-151-13/+41
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Add sample profiling interface to startMethodTracing.Jeff Hao2014-01-151-13/+41
| | | | |/ | | | |/|
* | | | | am 4b67b88e: am cce06eda: am b3436359: am e05190ea: am 85f98508: Merge "Docfi...John Spurlock2014-01-141-1/+1
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am b3436359: am e05190ea: am 85f98508: Merge "Docfixes: three typos and escap...John Spurlock2014-01-141-1/+1
| |\ \ \ | | |/ /
| | * | am e05190ea: am 85f98508: Merge "Docfixes: three typos and escape */*." into ...John Spurlock2014-01-141-1/+1
| | |\ \
| | | * \ am 85f98508: Merge "Docfixes: three typos and escape */*." into klp-docsJohn Spurlock2014-01-141-1/+1
| | | |\ \
| | | | * | Docfixes: three typos and escape */*.John Spurlock2014-01-061-1/+1
| * | | | | ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGETodd Poynor2014-01-031-13/+0
| |/ / / /
* | | | | Use custom classloader if provided for Serializables.John Spurlock2014-01-101-3/+21
* | | | | Document that Handler.postDelayed uses uptimeMillis() based counting.David Christie2013-12-191-0/+5
* | | | | Improvements to battery stats.Dianne Hackborn2013-12-191-303/+262
* | | | | am 4f6a1394: am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string ...Marco Nelissen2013-12-111-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am ce3bd309: Merge "Parse UUID string with Long.parseLong"Marco Nelissen2013-12-111-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Parse UUID string with Long.parseLongTom Marshall2013-12-061-1/+1