summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbreadKenny Root2010-10-101-12/+4
|\
| * am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbreadKenny Root2010-10-071-12/+4
| |\
| | * Eliminate MCS_GIVE_UP stateKenny Root2010-10-071-12/+4
* | | am c296f22e: am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"Kenny Root2010-10-101-32/+0
|\ \ \ | |/ /
| * | am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID"Kenny Root2010-10-071-32/+0
| |\ \ | | |/
| | * Revert "Only allow 8 OBBs to be mounted by a UID"Kenny Root2010-10-071-32/+0
* | | am 6ed0cfd3: am 5919ac6b: OBB: track binder death observersKenny Root2010-10-081-14/+44
|\ \ \ | |/ /
| * | am 5919ac6b: OBB: track binder death observersKenny Root2010-10-071-14/+44
| |\ \ | | |/
| | * OBB: track binder death observersKenny Root2010-10-061-14/+44
* | | am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it foun...Kenny Root2010-10-081-6/+2
|\ \ \ | |/ /
| * | am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into ginge...Kenny Root2010-10-071-6/+2
| |\ \ | | |/
| | * Merge "Add MountService tests and fix a bug it found" into gingerbreadKenny Root2010-10-061-6/+2
| | |\
| | | * Add MountService tests and fix a bug it foundKenny Root2010-10-061-6/+2
* | | | am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass vi...Dianne Hackborn2010-10-082-13/+18
|\ \ \ \ | |/ / /
| * | | am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android...Dianne Hackborn2010-10-072-13/+18
| |\ \ \ | | |/ /
| | * | Work on issue #3062691: GPS enable bypass via com.android.settings.widget.Set...Dianne Hackborn2010-10-062-13/+18
| | |/
* | | Revert "Merge "Allow notifications to not specify a contentIntent.""Jason Chen2010-10-081-0/+4
* | | Merge "Allow notifications to not specify a contentIntent."Joe Onorato2010-10-081-4/+0
|\ \ \
| * | | Allow notifications to not specify a contentIntent.Joe Onorato2010-10-081-4/+0
* | | | Merge "fix a bug where timeouts would only be handled when a message was deli...Mathias Agopian2010-10-081-7/+11
|\ \ \ \ | |/ / / |/| | |
| * | | fix a bug where timeouts would only be handled when a message was deliveredMathias Agopian2010-10-071-7/+11
* | | | Merge "Fix a null dereference"Mathias Agopian2010-10-081-1/+3
|\ \ \ \ | |/ / /
| * | | Fix a null dereferenceMathias Agopian2010-10-071-1/+3
* | | | resolved conflicts for merge of efa4f7f8 to masterDianne Hackborn2010-10-084-145/+46
|\ \ \ \ | | |/ / | |/| |
| * | | am 4e6baf24: Merge "Fix issue #3001368: API REVIEW: android.app.Activity" int...Dianne Hackborn2010-10-054-145/+46
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbreadDianne Hackborn2010-10-054-145/+46
| | |\ \
| | | * | Fix issue #3001368: API REVIEW: android.app.ActivityDianne Hackborn2010-10-054-145/+46
* | | | | Add a cancel button to InputMethodPicker and InputMethodSubtypePickersatok2010-10-081-0/+6
* | | | | Merge "Show "more" button in the dialog of InputMethodSubtypePicker"satok2010-10-071-24/+60
|\ \ \ \ \
| * | | | | Show "more" button in the dialog of InputMethodSubtypePickersatok2010-10-071-24/+60
* | | | | | Stop using unauthorized dnsRobert Greenwalt2010-10-071-1/+1
* | | | | | am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks...Eric Laurent2010-10-071-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into ginger...Eric Laurent2010-10-051-3/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Fixed AudioFlinger not always pausing tracks" into gingerbreadEric Laurent2010-10-051-3/+3
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fixed AudioFlinger not always pausing tracksEric Laurent2010-10-051-3/+3
* | | | | | am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag.....Joe Onorato2010-10-071-46/+88
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f7872780: Merge "PowerManagerService needs yet another flag..." into ginge...Joe Onorato2010-10-051-46/+88
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "PowerManagerService needs yet another flag..." into gingerbreadJoe Onorato2010-10-051-46/+88
| | |\ \ \ \
| | | * | | | PowerManagerService needs yet another flag...Joe Onorato2010-10-051-46/+88
| | | |/ / /
* | | | | | am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /...Kenny Root2010-10-071-5/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gi...Kenny Root2010-10-051-5/+17
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove lingering system app native libs in /dataKenny Root2010-10-051-5/+17
* | | | | | am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall...Kenny Root2010-10-071-7/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8735c4cd: Merge "Get correct native library path on reinstall" into ginger...Kenny Root2010-10-051-7/+16
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Get correct native library path on reinstall" into gingerbreadKenny Root2010-10-051-7/+16
| | |\ \ \ \
| | | * | | | Get correct native library path on reinstallKenny Root2010-10-051-7/+16
| | | |/ / /
* | | | | | Merge "resolved conflicts for merge of 6327a9fe to master"Mike Lockwood2010-10-072-129/+380
|\ \ \ \ \ \
| * \ \ \ \ \ resolved conflicts for merge of 6327a9fe to masterMike Lockwood2010-10-072-129/+380
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | |
| | * | | | resolved conflicts for merge of 2f65a99f to gingerbread-plus-aospMike Lockwood2010-10-052-130/+379
| | |\ \ \ \ | | | |/ / /
| | | * | | GPS: Clean up GPS API extension initialization in JNI code.Mike Lockwood2010-10-051-73/+107