GitLab

am: da885a69  -s ours

* commit 'da885a69':
  Import translations. DO NOT MERGE

Change-Id: I121f3574cd0e0dde12f5a5d34b95a82b05d83a78
Auto-generated-cl: translation import

Change-Id: I75a1e1f5da8f91337a13286c7f39ac6ae3bbe094
Auto-generated-cl: translation import

* commit 'd1f37448':
  Check mCurrentThumbRequest.mPath to prevent crash.

Bug: 19246412

Change-Id: I25c2f09ded0527ac062d9c8a57adf3aa7639ea76

* commit 'd1b7c58a':
  Fix SQLiteDiskIOException in stability test

    Because Sprout has removable storage, the framework needs to maintain
    external database for keeping multiple databases between SD cards.
    When cleaning up databases for old external storage volumes, we can't
    delete .db-shm and .db-wal because these two files always have the
    latest data and .db doesn't have. Using camera or Google+ will access
    .db-shm and .db-wal to get the latest data and will cause SQLite Disk
    I/O exception if they are deleted.

    The fix is to modify the logic of cleaning up databases (only delete
    .db file, not to delete .db-shm and .db-wal file).

    Bug 18412563

    Review: https://partner-android-review.git.corp.google.com/#/c/187072

Signed-off-by: Benson Huang <benson.huang@mediatek.com>

Change-Id: I484bd535ddebee09824a10f12241f6b2ce086b94

automerge: 407c6ddc

* commit '407c6ddc':
  Reset album and artist tables due to change in how collation keys are calculated.

Bug: 18118488
Change-Id: If1d12def4598be9cbf86b8550061f4d075be9717

* commit 'e11db3f7':
  Check access before creating thumbnail

* commit '21b5eadc':
  Check access before creating thumbnail

* commit '6ad96629':
  Check access before creating thumbnail

Bug: 17943556
Change-Id: I1ee026fc0f6248dab2e678e478ba76e8d464dba6

am 2e3d2608: (-s ours) am 00ad971d: (-s ours) am 168c9e90: (-s ours) Import translations. DO NOT MERGE

* commit '2e3d2608':
  Import translations. DO NOT MERGE

* commit '00ad971d':
  Import translations. DO NOT MERGE

* commit '168c9e90':
  Import translations. DO NOT MERGE

Change-Id: If52a2290bd6f5d199ddf78a707662301180ba755
Auto-generated-cl: translation import

am 0ce9cb80: (-s ours) am ee041574: (-s ours) am 132a0ec7: (-s ours) Import translations. DO NOT MERGE

* commit '0ce9cb80':
  Import translations. DO NOT MERGE

* commit 'ee041574':
  Import translations. DO NOT MERGE

* commit '132a0ec7':
  Import translations. DO NOT MERGE

Change-Id: I4ac6eef1b0e668d96d043bcef5c51f86c533729c
Auto-generated-cl: translation import

This reverts commit c50b2bef.

When user set alarm ringtone in DeskClock,
It can't play with AudioManager.STREAM_SYSTEM stream type

Bug: 16906307
Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d

BUG: 17212898
Change-Id: Id4228e1bf9a21139111d4ed6b7672bd5bb80be20

* commit 'cac375e6':
  Import translations. DO NOT MERGE

* commit 'd6291f34':
  Import translations. DO NOT MERGE

Change-Id: I828370cf1297638fd65ef381131fca2685c13469
Auto-generated-cl: translation import

Bug 16552638

Change-Id: If32429d6c124970b22075930a60fa23cafed8395

BUG: 16845793
Change-Id: I4ed109b5cce1d0c98b6c0942356d157adf9a69be

When choosing a ringtone, avoid the ringer stream during
playback to avoid interception.

As before, no playback is performed if muted.

Bug:15344396
Change-Id: I7301c7e60682c57187708dfc8fa933a150c5147a

Instead, make it look like a dialog launched from Settings.

Bug:16156303
Change-Id: I00e5bbb2aadcc0858da5ea6822274eab95b2cb42

Change-Id: I139a459528157e76ee7e33d50776398f063532ec

Change-Id: Ie3fb4817398befdd131faef233defe08bbcbee5f
Auto-generated-cl: translation import

Change-Id: I435117625a41b36497f774facfe12c30af3cb892
Auto-generated-cl: translation import

Change-Id: I7e2c13b124ca3c1e7ef663483011a72914d7668f
Auto-generated-cl: translation import

vaguely related to bug 10733373

Change-Id: Icda99a66d893374de7a1ed84d24f2c97a72b90b2

* commit '4c546b54':
  Clean up cursors in try/finally

* commit '501b93fb':
  Clean up cursors in try/finally

* commit '17750fdd':
  Clean up cursors in try/finally