summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Expand)AuthorAgeFilesLines
* am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-111-16/+13
|\
| * am 96619f9f: Merge "Add some error-case logging." into gingerbreadWink Saville2010-10-101-16/+13
| |\
| | * Add some error-case logging.Robert Greenwalt2010-10-101-16/+13
* | | am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multi...Mike Lockwood2010-10-112-22/+29
|\ \ \ | |/ /
| * | am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" in...Mike Lockwood2010-10-092-22/+29
| |\ \ | | |/
| | * GPS: Do not call sGpsInterface->init() multiple timesMike Lockwood2010-10-092-22/+29
* | | am 681f327e: am 62d8874e: Merge "Fix retaining of granted permissions when up...Dianne Hackborn2010-10-101-4/+9
|\ \ \ | |/ /
| * | am 62d8874e: Merge "Fix retaining of granted permissions when updating of sys...Dianne Hackborn2010-10-081-4/+9
| |\ \ | | |/
| | * Merge "Fix retaining of granted permissions when updating of system app." int...Dianne Hackborn2010-10-081-4/+9
| | |\
| | | * Fix retaining of granted permissions when updating of system app.Dianne Hackborn2010-10-081-4/+9
* | | | am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in...Dianne Hackborn2010-10-101-18/+22
|\ \ \ \ | |/ / /
| * | | am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, ...Dianne Hackborn2010-10-081-18/+22
| |\ \ \ | | |/ /
| | * | Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lockDianne Hackborn2010-10-081-18/+22
| | |/
* | | am 98e1f384: am aecab79b: Merge "Remove races in Geocoder/LocationProvider Pr...Mike Lockwood2010-10-103-198/+250
|\ \ \ | |/ /
| * | am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gin...Mike Lockwood2010-10-083-198/+250
| |\ \ | | |/
| | * Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbreadMike Lockwood2010-10-083-198/+250
| | |\
| | | * Remove races in Geocoder/LocationProvider ProxyMark Vandevoorde2010-10-053-198/+250
* | | | am b77455ee: am 78d68836: Implement tracking of package install times.Dianne Hackborn2010-10-101-34/+135
|\ \ \ \ | |/ / /
| * | | am 78d68836: Implement tracking of package install times.Dianne Hackborn2010-10-071-34/+135
| |\ \ \ | | |/ /
| | * | Implement tracking of package install times.Dianne Hackborn2010-10-071-34/+135
* | | | am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD...Kenny Root2010-10-102-17/+65
|\ \ \ \ | |/ / /
| * | | am 54e01e0f: Merge "Symlink application lib directory when on SD card" into g...Kenny Root2010-10-072-17/+65
| |\ \ \ | | |/ /
| | * | Symlink application lib directory when on SD cardKenny Root2010-10-072-17/+65
* | | | 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