android_frameworks_ex, branch stable/cm-12.1-YOG3C Unnamed repository; edit this file 'description' to name the repository. Merge tag 'android-5.1.0_r1' into HEAD 2015-03-10T16:59:51+00:00 Ricardo Cerqueira ricardo@cyngn.com 2015-03-10T16:59:51+00:00 78692bfeeddeb9218cd24940ba6f828f86ee26a2 Android 5.1.0 release 1 Change-Id: I11a3d0ee668ab4fd9ad7f07decbdf99c57024291 
Android 5.1.0 release 1

Change-Id: I11a3d0ee668ab4fd9ad7f07decbdf99c57024291
merge in lmp-mr1-release history after reset to lmp-mr1-dev 2015-01-06T14:09:54+00:00 The Android Automerger android-build@google.com 2015-01-06T14:09:54+00:00 02ce5a07e060328c367326770f5451e945633aff 






CameraAgent: give more time to close && open camera.
2014-12-27T05:30:20+00:00

repo Shareef Ali
shareefalis@gmail.com

2014-12-27T05:30:20+00:00

9bd171c5eeb3c94cd0c50f3ec6906d706eee7fe8

Some devices like hlte need more time, expectually when thermald
is slowing cpu clock.

Change-Id: I00fb44f8953d91959f170f7b8a5f02dd02da2d40





Some devices like hlte need more time, expectually when thermald
is slowing cpu clock.

Change-Id: I00fb44f8953d91959f170f7b8a5f02dd02da2d40







Fix StaleDataExceptions
2014-12-19T18:35:24+00:00

Jay Shrauner
shrauner@google.com

2014-12-17T00:06:03+00:00

7158b6705d330ac1e61d5aa51c51b54507c4ab88

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





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







camera2: Fix null pointer exception while initializing max zoom ratio
2014-12-15T10:07:43+00:00

Cristoforo Cataldo
cristoforo.cataldo@gmail.com

2014-12-15T06:40:55+00:00

f3d1d5be8b4c97769ee750efefdb23aebc833a30

Before initializing the max zoom ratio, we should check if the zoom
feature is supported by the currently used camera.
Some old legacy front cameras don't have zoom feature and the camera
app, without this commit, throws an error because of the null pointer
exception.

Change-Id: I479ed6a33b8aba1ab2219d409fcd1b35179d0ee0





Before initializing the max zoom ratio, we should check if the zoom
feature is supported by the currently used camera.
Some old legacy front cameras don't have zoom feature and the camera
app, without this commit, throws an error because of the null pointer
exception.

Change-Id: I479ed6a33b8aba1ab2219d409fcd1b35179d0ee0







merge in lmp-mr1-release history after reset to lmp-mr1-dev
2014-11-13T14:14:46+00:00

The Android Automerger
android-build@google.com

2014-11-13T14:14:46+00:00

776b56075385f998ce49245d2f5e3309277cd4d2












Merge commit '25b78c8a18327bd73c3d4d34887dd63953aeaa8c' into lmp-mr1-dev
2014-11-12T21:51:24+00:00

Qiwen Zhao
zhao@google.com

2014-11-12T21:51:24+00:00

ede5a97a7ed75ac04dfa58c3b867e67ea4e80f92












Merge commit 'c15ddae4862bb9a10b0142fac9558a5f899b1a21' into lmp-mr1-dev
2014-11-12T21:51:22+00:00

Qiwen Zhao
zhao@google.com

2014-11-12T21:51:22+00:00

e7e528accaef2dfdc4c74c3ad116ede1cbb0c2e9












Merge commit '733ca8dfa76ac34d1f9caff8798d01a4a8f44002' into lmp-mr1-dev
2014-11-12T21:51:20+00:00

Qiwen Zhao
zhao@google.com

2014-11-12T21:51:20+00:00

3238136a95ea85c0283a1b623e501c835ed5b753












Merge commit '318eeb225f4567a8c2a6fe14baa06e8923ebe622' into lmp-mr1-dev
2014-11-12T21:51:18+00:00

Qiwen Zhao
zhao@google.com

2014-11-12T21:51:18+00:00

7ce2ce7d166d839eb62e03b4cdad7fad4b5e267a