GitLab

am aa58f460: am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev

* commit 'aa58f460':
  Fix typo in streaming media url

am 2fcdab95: am 6cab21b6: am ab0bb72d: am e610cae3: Merge "Fix typo in streaming media url" into jb-dev

* commit '2fcdab95':
  Fix typo in streaming media url

* commit '6cab21b6':
  Fix typo in streaming media url

* commit 'ab0bb72d':
  Fix typo in streaming media url

* commit 'e610cae3':
  Fix typo in streaming media url

Change-Id: I168ee2d82d0b9a4bd7c9f30d1fd5d417e122664e

am b55ee96b: am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'b55ee96b':
  Update Android CTS bandaid urls that use test_key1 to a new key

am f9a6b37b: am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'f9a6b37b':
  Update Android CTS bandaid urls that use test_key1 to a new key

am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'cf05e0c2':
  Update Android CTS bandaid urls that use test_key1 to a new key

am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit '0969f15c':
  Update Android CTS bandaid urls that use test_key1 to a new key

* commit 'ac08bc8a':
  Update Android CTS bandaid urls that use test_key1 to a new key

* commit '46d82f0b':
  Fix test

* commit 'c6fca737':
  Fix test

* commit 'ee955b85':
  Fix test

* commit '26d352cd':
  Fix test

* commit '6558d48b':
  Fix test

MediaPlayer.isPlaying is unreliable/broken for Midi files, so don't
test that aspect.

bug:18640852
Change-Id: I9d7c83395dd95af3e82619b48e6c13733786ce2d

am 7733e474: am e2247907: am a4163a07: am b8c7cf77: am bba8cbda: Merge "Add tests for midi playback" into jb-dev

* commit '7733e474':
  Add tests for midi playback

* commit 'e2247907':
  Add tests for midi playback

* commit 'a4163a07':
  Add tests for midi playback

* commit 'b8c7cf77':
  Add tests for midi playback

* commit 'bba8cbda':
  Add tests for midi playback

Change-Id: Ie2dd509870a89b2eec346e8e6cf1e80d727a1f9c

am 2b4962b1: am 1d438a13: am cb190b0d: am 92df8753: add tests for stream type check in audio policy binder.

* commit '2b4962b1':
  add tests for stream type check in audio policy binder.

* commit '1d438a13':
  add tests for stream type check in audio policy binder.

* commit 'cb190b0d':
  add tests for stream type check in audio policy binder.

* commit '92df8753':
  add tests for stream type check in audio policy binder.

Bug: 18001784.
Bug: 18002005.
Change-Id: I65bbce0578ae77b1c24156c75bb751365acd709b

am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '4b3c7eaf':
  Fix CTS case   testQueryExternalMiniThumbnails failure

am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '6861e8d6':
  Fix CTS case   testQueryExternalMiniThumbnails failure

am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '9b9de51d':
  Fix CTS case   testQueryExternalMiniThumbnails failure

am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '6a1c1372':
  Fix CTS case   testQueryExternalMiniThumbnails failure

* commit '4bc52341':
  Fix CTS case   testQueryExternalMiniThumbnails failure

The output Bitmap of BitmapFactory.decodeResource depends on device display density
so that the thumbnail resolution is different, add target density parameter when call
to ensure the output Bitmap is same on all devices.

Change-Id: I0d4dbca9752126baab6be9ba829d3320e6f4a033