GitLab

When choosing a ringtone for alarm use by "Android System"
ringtone picker (RingtonePickerActivity), default ringtone is
not played for preview with volume of alarm stream type but
with that of normal stream type.

It is because stream type is not reflected on mDefaultRingtone
instance of RingtonePickerActivity.

Change-Id: Idc71c9b620e40e4109604b2337677134bb74a8cd

am 8f7e3e0f: Merge "AlbumArt image of songs in the non-primary storage root dir are images in the same dir"

* commit '8f7e3e0f':
  AlbumArt image of songs in the non-primary storage root dir are images in the same dir

MediaProvider will fall back to the image in the same folder of music,
if MetadataRetriver failed to extract the AlbumArt image from those mp3 files.
MediaProvider will only bypass the albumArt image search if the music located
in the root director of the primary external storage. Add this bypass for all
external storages.

Change-Id: I972586b2f92bd439f51ee932f09e824fc5507236
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>

* commit '63e04a52':

Change-Id: I2cc359dc6ba475b9fff93cb18cb9a1c43d6e3acb

Change-Id: I5bf69a6082795ba81b7c22b052f2ae10b0ed3d6f

* commit '81befcaa':
  Ack, scanner doesn't take volume paths.

Bug: 7205962
Change-Id: Ie0b28501e25758094f14736ac47f6e4dd3a90be5

Change-Id: I2113e75ca4c91539da0c7bb6ed80d56b4ba91af7

* commit '9bc0e811':
  Update bucket_display_list and bucket_id columns when renaming directories via MTP

Bug: 6949231

Change-Id: Ib301b250c40a6abc3cab17658e19308951b4cd4a
Signed-off-by: Mike Lockwood <lockwood@google.com>

* commit '6d1fac3d':
  Update buckets after path changes.

Bug: 7174672
Change-Id: Ib44a52ad337ca6df135955e71e6cec3261da780d

* commit 'f58f4b95':
  Multi-user MTP, handle secondary user boot.

Watch for BOOT_COMPLETED, and dispatch any current USB state or
mounted volumes which may have already occured.  This specifically
handles starting of secondary users.

The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. To solve this, the framework
cycles the USB host stack when switching users, giving the new
user's media process a chance to claim the kernel device.  We only
start an MtpServer when we're the active user.

Bug: 6925114
Change-Id: Idfcda09aed88140bb470a110a9e4434f5b79abdd

* commit '704fe6bc':
  Make sure file paths are canonical in scanFile()

Bug:  6987701

Change-Id: I55d2f95ab63df19f9c9ba39da5215893b8e658e4
Signed-off-by: Mike Lockwood <lockwood@google.com>

* commit '57b65f10':
  Leave trigger intact during upgrade.

Change-Id: I55a93be5e1edd0f00c318d07363242388936aa63

Change-Id: I561bcbb1b33f19d08e9c9b316e132f4314116e5f

* commit '395ad259':
  Include user identifier in external storage paths.

When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Bug: 7131382
Change-Id: I85f9eeed418a4fcced6633c579642e947fba65d7

* commit '4a7bf688':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)

- add android:supportsRtl="true" for the manifest

Change-Id: I77a1af134f2d43a3b3d0cbcb4021515bf28d7afb

Change-Id: Idf52e01ae31e4f8665ff945fc53943906611e62e

* commit 'b7fb6600':
  MtpService: check primary storage status when use it in PTP mode

* commit '7021e104':
  MtpService: check primary storage status when use it in PTP mode

Using single storage solution means its primary storage is physical SD
card. So, it is possible for user to insert a non-Vfat SD card to make
primary storage not mounted.
So, before using primary storage in PTP mode, let's have a check first

Change-Id: I3932c16399675232d8b2329c8e30cf6030b3586e
Author: Chuanxiao Dong <chuanxiao.dong@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 30725

* commit 'fda8379c':
  Fixed release of wakelock

* commit 'f1597bc9':
  Fixed release of wakelock