| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1 | Ricardo Cerqueira | 2015-03-10 | 11 | -427/+750 |
| |\ | | | | | | | | | | | Android 5.1.0 release 1 Change-Id: I11a3d0ee668ab4fd9ad7f07decbdf99c57024291 | ||||
| | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2015-01-06 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in lmp-mr1-release history after reset to lmp-mr1-dev | The Android Automerger | 2014-11-13 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-08 | 0 | -0/+0 |
| | | | |\ | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-06 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-05 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-04 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-03 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-02 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-11-01 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-30 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-29 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-28 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-27 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-26 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-25 | 0 | -0/+0 |
| | | | |/| | | | | | | | | | | | | | | | | 2f5251072284508374cb36d1e83f7e24cc590049 | ||||
| | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-23 | 0 | -0/+0 |
| | | | | |\ | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-22 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-21 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-20 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-19 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-18 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-16 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-15 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-14 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-13 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-12 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-11 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-09 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-08 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-07 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-06 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-05 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-04 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-02 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-10-01 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-30 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-29 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-28 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-27 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-25 | 0 | -0/+0 |
| | | | | |/| | | | | | | | | | | | | | | | | | | | 70a82d9d9a59c2a0b9241fdb0b8b0f1a61d0d5a0 | ||||
| | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-24 | 0 | -0/+0 |
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | 2eed7ab0e5d81c0025737c6ce9931f3d8b57b418 | ||||
| | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-23 | 0 | -0/+0 |
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | 2eed7ab0e5d81c0025737c6ce9931f3d8b57b418 | ||||
| | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-23 | 0 | -0/+0 |
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e | ||||
| | | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-22 | 0 | -0/+0 |
| | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e | ||||
| | | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-22 | 0 | -0/+0 |
| | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e | ||||
| | | | | | | | * | merge in lmp-mr1-release history after reset to ↵ | The Android Automerger | 2014-09-22 | 0 | -0/+0 |
| | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 06b23bb5cbddfed587a6f0d75636734862b49a1e | ||||
| | * | | | | | | | Fix StaleDataExceptions | Jay Shrauner | 2014-12-19 | 1 | -2/+9 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ensureCacheValid, check whether the cursor is closed before querying its count. In getItem, check whether the cursor is closed before moving it to position, as was already being done in getItemId. Bug:18815354 Change-Id: I4cf2509923695afe9499d0507383c4e0d51bd23e | ||||
| | * | | | | | | Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-dev | Qiwen Zhao | 2014-11-12 | 1 | -5/+10 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Ensure default handler always is set if no other error handler registered | Alan Newberger | 2014-11-04 | 1 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid memory leaks we set the error handler to null in activity onDestroy. But, the agent may receive callbacks after this, so ensure at minimum that we set the default logging handler to default handle errors post activity destroy. Bug: 18200874 Bug: 18202261 Change-Id: Ie7251a149ab02c474d8affd15af6b9ea48c2cdc0 | ||||
 |
index : android_frameworks_ex | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |