OSDN Git Service

android-x86/frameworks-base.git
9 years agoClean up AssetManager::scanAndMergeZipLocked
Yusuke Sato [Fri, 26 Jun 2015 00:47:35 +0000 (17:47 -0700)]
Clean up AssetManager::scanAndMergeZipLocked

Now that ZipFileRO::startIteration supports prefix/suffix matching,
we can pass dirName to the function for simpler code and slightly
better performance.

Change-Id: Ia93c3ab3fa688ce013dd9febbf0f4bd3ee1f3e5e

9 years agoam a52d960b: am 09395e5e: am 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtoneP...
Todd Kennedy [Tue, 21 Jul 2015 19:18:53 +0000 (19:18 +0000)]
am a52d960b: am 09395e5e: am 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev

* commit 'a52d960bc4b1b6f8f95cabb10453e3fb9f64a80d':
  Use RingtonePlayer to get ringtone title

9 years agoam 09395e5e: am 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to...
Todd Kennedy [Tue, 21 Jul 2015 19:04:09 +0000 (19:04 +0000)]
am 09395e5e: am 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev

* commit '09395e5e18d506432dbfdcb4b076af941c1170e1':
  Use RingtonePlayer to get ringtone title

9 years agoam 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone...
Todd Kennedy [Tue, 21 Jul 2015 18:52:13 +0000 (18:52 +0000)]
am 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev

* commit '8e0ab9971cc33cc0d827cbbd901b488694012632':
  Use RingtonePlayer to get ringtone title

9 years agoMerge "aapt: expat exports its header files now."
Elliott Hughes [Tue, 21 Jul 2015 18:44:45 +0000 (18:44 +0000)]
Merge "aapt: expat exports its header files now."

9 years agoaapt: expat exports its header files now.
Elliott Hughes [Tue, 21 Jul 2015 18:39:21 +0000 (11:39 -0700)]
aapt: expat exports its header files now.

Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174

9 years agoam 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
Todd Kennedy [Tue, 21 Jul 2015 18:37:15 +0000 (18:37 +0000)]
am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev

* commit '548871f202c2c68e0197cc993073ca80a60f70da':
  Use RingtonePlayer to get ringtone title

9 years agoMerge "docs/html/ndk: update sample link to point to github"
David Friedman [Tue, 21 Jul 2015 18:35:08 +0000 (18:35 +0000)]
Merge "docs/html/ndk: update sample link to point to github"

9 years agoam b430c4f0: am 8326ebbe: am 6b04e5b8: am 894ffd10: am 673ccfd4: Merge "UsbDeviceMana...
Nick Kralevich [Tue, 21 Jul 2015 18:24:12 +0000 (18:24 +0000)]
am b430c4f0: am 8326ebbe: am 6b04e5b8: am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev

* commit 'b430c4f06c763e0c0fffb6d12b606064ccc84ce3':
  UsbDeviceManager: add back support for USB overlays

9 years agoam f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
Todd Kennedy [Tue, 21 Jul 2015 18:21:33 +0000 (18:21 +0000)]
am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev

* commit 'f2805bcbe1c99ce806448a2d8c0f12b142c7cece':
  Use RingtonePlayer to get ringtone title

9 years agoMerge "Use RingtonePlayer to get ringtone title" into mnc-dev
Todd Kennedy [Tue, 21 Jul 2015 18:11:16 +0000 (18:11 +0000)]
Merge "Use RingtonePlayer to get ringtone title" into mnc-dev

9 years agoam 8326ebbe: am 6b04e5b8: am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add...
Nick Kralevich [Tue, 21 Jul 2015 18:07:11 +0000 (18:07 +0000)]
am 8326ebbe: am 6b04e5b8: am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev

* commit '8326ebbe9ea324cc7608e8dc754a63d905bfdb63':
  UsbDeviceManager: add back support for USB overlays

9 years agoam c48d2f78: am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style...
Raph Levien [Tue, 21 Jul 2015 18:02:42 +0000 (18:02 +0000)]
am c48d2f78: am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit 'c48d2f780f5ef14af574f3c3d6668cb03470e50d':
  Respect style boundaries when measuring text

9 years agoam 6b04e5b8: am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support...
Nick Kralevich [Tue, 21 Jul 2015 17:53:46 +0000 (17:53 +0000)]
am 6b04e5b8: am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev

* commit '6b04e5b803820d03c0ccf483851ed2432d39c49b':
  UsbDeviceManager: add back support for USB overlays

9 years agoam ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries...
Raph Levien [Tue, 21 Jul 2015 17:49:07 +0000 (17:49 +0000)]
am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit 'ab30f486ba553d547aac0ff48d87cf307de2871d':
  Respect style boundaries when measuring text

9 years agoam 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays...
Nick Kralevich [Tue, 21 Jul 2015 17:38:50 +0000 (17:38 +0000)]
am 894ffd10: am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev

* commit '894ffd102d90a7c794e5c522818f163b92baa55d':
  UsbDeviceManager: add back support for USB overlays

9 years agoam fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring...
Raph Levien [Tue, 21 Jul 2015 17:31:06 +0000 (17:31 +0000)]
am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit 'fa8570bcd205859b9068105b389a80de32f7f85d':
  Respect style boundaries when measuring text

9 years agoam 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
Nick Kralevich [Tue, 21 Jul 2015 17:25:30 +0000 (17:25 +0000)]
am 673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev

* commit '673ccfd45a81482d97eecf76dc0fef0dfd57be73':
  UsbDeviceManager: add back support for USB overlays

9 years agoam 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into...
Raph Levien [Tue, 21 Jul 2015 17:17:49 +0000 (17:17 +0000)]
am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit '7026617e74cc1753ae7c1846e005dc7b3286170d':
  Respect style boundaries when measuring text

9 years agoMerge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
Nick Kralevich [Tue, 21 Jul 2015 17:16:07 +0000 (17:16 +0000)]
Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev

9 years agoam 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
Raph Levien [Tue, 21 Jul 2015 17:04:36 +0000 (17:04 +0000)]
am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev

* commit '1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
  Respect style boundaries when measuring text

9 years agoMerge "Respect style boundaries when measuring text" into mnc-dev
Raph Levien [Tue, 21 Jul 2015 16:55:37 +0000 (16:55 +0000)]
Merge "Respect style boundaries when measuring text" into mnc-dev

9 years agoam 2950da34: am 3b2ebfa3: am 224dfca6: am c273c178: am 66e66831: Merge "resolved...
Diego Perez [Tue, 21 Jul 2015 16:44:28 +0000 (16:44 +0000)]
am 2950da34: am 3b2ebfa3: am 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev

* commit '2950da3499cf4efe9b58af79809721104422829e':
  Render to measured size when using expand mode

9 years agoam 3b2ebfa3: am 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for...
Diego Perez [Tue, 21 Jul 2015 16:31:35 +0000 (16:31 +0000)]
am 3b2ebfa3: am 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev

* commit '3b2ebfa3d1d08cd144c48fcd387612ee7defef01':
  Render to measured size when using expand mode

9 years agoam 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a3...
Diego Perez [Tue, 21 Jul 2015 16:16:59 +0000 (16:16 +0000)]
am 224dfca6: am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev

* commit '224dfca641fb02b4a4a47deeeda9d03036c613fa':
  Render to measured size when using expand mode

9 years agoam c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc...
Diego Perez [Tue, 21 Jul 2015 16:04:20 +0000 (16:04 +0000)]
am c273c178: am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev

* commit 'c273c178d70eda9858714d59118b05da7ffb5313':
  Render to measured size when using expand mode

9 years agoam 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev
Diego Perez [Tue, 21 Jul 2015 15:50:11 +0000 (15:50 +0000)]
am 66e66831: Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev

* commit '66e6683193f6a1d071710ea8a39b02f5129fc505':
  Render to measured size when using expand mode

9 years agoMerge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev
Diego Perez [Tue, 21 Jul 2015 15:41:08 +0000 (15:41 +0000)]
Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev

9 years agoam 01386925: am f2f29dc4: am 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplic...
Wale Ogunwale [Tue, 21 Jul 2015 15:38:38 +0000 (15:38 +0000)]
am 01386925: am f2f29dc4: am 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev

* commit '013869253e77de091eaf3d365202cfda6c4c8b67':
  Don't duplicate recent tasks of the same affinity.

9 years agoam f2f29dc4: am 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent...
Wale Ogunwale [Tue, 21 Jul 2015 15:24:00 +0000 (15:24 +0000)]
am f2f29dc4: am 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev

* commit 'f2f29dc4add3943eb4f0b06a5c748b99664212da':
  Don't duplicate recent tasks of the same affinity.

9 years agoam 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the...
Wale Ogunwale [Tue, 21 Jul 2015 15:07:09 +0000 (15:07 +0000)]
am 18c87a1e: am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev

* commit '18c87a1eb8c7f1e11fe48daa61ec37f6ec29691b':
  Don't duplicate recent tasks of the same affinity.

9 years agoam 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity...
Wale Ogunwale [Tue, 21 Jul 2015 14:52:05 +0000 (14:52 +0000)]
am 7dcad6a5: am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev

* commit '7dcad6a5d426e1a243e36cbd084c60bc8038c56b':
  Don't duplicate recent tasks of the same affinity.

9 years agoam e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
Wale Ogunwale [Tue, 21 Jul 2015 14:38:04 +0000 (14:38 +0000)]
am e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev

* commit 'e99f20f5873c00b35f2407e28e06ff9119f85088':
  Don't duplicate recent tasks of the same affinity.

9 years agoresolved conflicts for merge of 112d8a36 to mnc-dev
Diego Perez [Tue, 21 Jul 2015 14:28:10 +0000 (15:28 +0100)]
resolved conflicts for merge of 112d8a36 to mnc-dev

Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2

9 years agoMerge "Don't duplicate recent tasks of the same affinity." into mnc-dev
Wale Ogunwale [Tue, 21 Jul 2015 14:28:13 +0000 (14:28 +0000)]
Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev

9 years agoDon't duplicate recent tasks of the same affinity.
Wale Ogunwale [Mon, 20 Jul 2015 22:43:37 +0000 (15:43 -0700)]
Don't duplicate recent tasks of the same affinity.

In change 510e554283d3dc250f836cd3e4abc36d87319333 we stated
limiting the number of document activity entries in recents
by comparing the realActivity of the tasks. This compared was
done for all tasks not just document tasks there by breaking
the use of task affinity to remove tasks with the same affinity
from recent task list. This change limits the compare of
realActivity to just document tasks.

Bug: 22564474
Bug: 18642190
Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94

9 years agoam d6f2a9ef: am 7720eb18: Merge "Render to measured size when using expand mode"...
Diego Perez [Tue, 21 Jul 2015 13:20:23 +0000 (13:20 +0000)]
am d6f2a9ef: am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev

* commit 'd6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
  Render to measured size when using expand mode

9 years agoam 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
Diego Perez [Tue, 21 Jul 2015 13:06:52 +0000 (13:06 +0000)]
am 7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev

* commit '7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
  Render to measured size when using expand mode

9 years agoMerge "Render to measured size when using expand mode" into lmp-mr1-dev
Diego Perez [Tue, 21 Jul 2015 12:56:50 +0000 (12:56 +0000)]
Merge "Render to measured size when using expand mode" into lmp-mr1-dev

9 years agodocs/html/ndk: update sample link to point to github
Johan Euphrosine [Tue, 21 Jul 2015 06:12:41 +0000 (15:12 +0900)]
docs/html/ndk: update sample link to point to github

9 years agoam 0ca81c89: am ef3ca9f3: am 37353dc1: Merge "[RenderScript] Add docs advising users...
Miao Wang [Tue, 21 Jul 2015 02:53:26 +0000 (02:53 +0000)]
am 0ca81c89: am ef3ca9f3: am 37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop bug."

* commit '0ca81c89867a59f1add30c9e30d059b4676a4594':
  [RenderScript] Add docs advising users about dstAtop bug.

9 years agoam ef3ca9f3: am 37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop...
Miao Wang [Tue, 21 Jul 2015 02:35:21 +0000 (02:35 +0000)]
am ef3ca9f3: am 37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop bug."

* commit 'ef3ca9f3fb3fd76359fb361a0d937ca92400725f':
  [RenderScript] Add docs advising users about dstAtop bug.

9 years agoam 3f56fb94: am 12d1db7d: am 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get...
Jae Seo [Tue, 21 Jul 2015 01:11:34 +0000 (01:11 +0000)]
am 3f56fb94: am 12d1db7d: am 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

* commit '3f56fb94b1fbe5b651b501884b6a0f2a9dbe797b':
  TIF: Get or create the user state when failed to find existing one

9 years agoam b5f80557: am 26fae7e1: am 00869af8: am aaf67d95: am e95af4ab: Merge "TIF: Use...
Terry Heo [Tue, 21 Jul 2015 01:11:26 +0000 (01:11 +0000)]
am b5f80557: am 26fae7e1: am 00869af8: am aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev

* commit 'b5f80557882c07f2a9c475faafd642c555a931f6':
  TIF: Use copied track list for onTracksChanged() callback

9 years agoam 12d1db7d: am 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get or create the...
Jae Seo [Tue, 21 Jul 2015 01:00:14 +0000 (01:00 +0000)]
am 12d1db7d: am 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

* commit '12d1db7d27553b0d02afe43937679cc1e6139ba1':
  TIF: Get or create the user state when failed to find existing one

9 years agoam 26fae7e1: am 00869af8: am aaf67d95: am e95af4ab: Merge "TIF: Use copied track...
Terry Heo [Tue, 21 Jul 2015 01:00:09 +0000 (01:00 +0000)]
am 26fae7e1: am 00869af8: am aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev

* commit '26fae7e181b20b471cddc6378fd75b73521d2893':
  TIF: Use copied track list for onTracksChanged() callback

9 years agoam 0294448c: am fe207d3d: am e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionR...
Dongwon Kang [Tue, 21 Jul 2015 00:50:21 +0000 (00:50 +0000)]
am 0294448c: am fe207d3d: am e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev

* commit '0294448c19715b559677ff8bceb5241b4381d7c0':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive

9 years agoam b3d17db1: am 997ebda4: am 4cb9ccc7: am c0469f99: am 55786e11: Merge "Test app...
Jorim Jaggi [Tue, 21 Jul 2015 00:50:13 +0000 (00:50 +0000)]
am b3d17db1: am 997ebda4: am 4cb9ccc7: am c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev

* commit 'b3d17db14474edbeb77961a534cb1af6e49f3144':
  Test app to emit all AccessibilityEvents to logcat.

9 years agoam 43bab2eb: am d9b611fd: am f2ae250e: am 7cc56bb4: am 1f98c62f: Fix unnecessary...
Jorim Jaggi [Tue, 21 Jul 2015 00:50:06 +0000 (00:50 +0000)]
am 43bab2eb: am d9b611fd: am f2ae250e: am 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation for appear animation

* commit '43bab2eb534e80117b54d6fd54d6a68664688adc':
  Fix unnecessary layer creation for appear animation

9 years agoam 77b33cba: am f68c6eed: am c1f197ca: am 6005f9e5: am 15d68941: Merge "[RenderScript...
Miao Wang [Tue, 21 Jul 2015 00:49:56 +0000 (00:49 +0000)]
am 77b33cba: am f68c6eed: am c1f197ca: am 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev

* commit '77b33cba7f7a9214d151a9a4dda4ec545bff0af6':
  [RenderScript] Add docs advising users about dstAtop bug.

9 years agoam 1eb7ccd1: am 631cf9cd: am b946ce96: am 00fe1b65: am 4cd72169: Fix window animation...
Jorim Jaggi [Tue, 21 Jul 2015 00:49:49 +0000 (00:49 +0000)]
am 1eb7ccd1: am 631cf9cd: am b946ce96: am 00fe1b65: am 4cd72169: Fix window animation flickering

* commit '1eb7ccd1f7bb2162e3c2ced9af7f085dd5b59f8d':
  Fix window animation flickering

9 years agoam 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when...
Jae Seo [Tue, 21 Jul 2015 00:40:37 +0000 (00:40 +0000)]
am 6ff64bc3: am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

* commit '6ff64bc34daf55874f5372d0cda444f67c892bdf':
  TIF: Get or create the user state when failed to find existing one

9 years agoam 00869af8: am aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracks...
Terry Heo [Tue, 21 Jul 2015 00:40:31 +0000 (00:40 +0000)]
am 00869af8: am aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev

* commit '00869af85d0df92b00155ecf84311eccbd1647cf':
  TIF: Use copied track list for onTracksChanged() callback

9 years agoam fe207d3d: am e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do...
Dongwon Kang [Tue, 21 Jul 2015 00:37:43 +0000 (00:37 +0000)]
am fe207d3d: am e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev

* commit 'fe207d3dee5bf392ddd6ea35f486b559410d3c48':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive

9 years agoam 997ebda4: am 4cb9ccc7: am c0469f99: am 55786e11: Merge "Test app to emit all Acces...
Jorim Jaggi [Tue, 21 Jul 2015 00:37:38 +0000 (00:37 +0000)]
am 997ebda4: am 4cb9ccc7: am c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev

* commit '997ebda43513dbb6da7ddeb54d3eb2a972ed2e1f':
  Test app to emit all AccessibilityEvents to logcat.

9 years agoam d9b611fd: am f2ae250e: am 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation...
Jorim Jaggi [Tue, 21 Jul 2015 00:37:29 +0000 (00:37 +0000)]
am d9b611fd: am f2ae250e: am 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation for appear animation

* commit 'd9b611fd3bbbe5ffb5c697e960da58d2c45d5abb':
  Fix unnecessary layer creation for appear animation

9 years agoam f68c6eed: am c1f197ca: am 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs...
Miao Wang [Tue, 21 Jul 2015 00:37:24 +0000 (00:37 +0000)]
am f68c6eed: am c1f197ca: am 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev

* commit 'f68c6eed147686268c846289971ee06d67d97ea0':
  [RenderScript] Add docs advising users about dstAtop bug.

9 years agoam 631cf9cd: am b946ce96: am 00fe1b65: am 4cd72169: Fix window animation flickering
Jorim Jaggi [Tue, 21 Jul 2015 00:37:18 +0000 (00:37 +0000)]
am 631cf9cd: am b946ce96: am 00fe1b65: am 4cd72169: Fix window animation flickering

* commit '631cf9cdb5548b4966740f74f817775dc9f2abd1':
  Fix window animation flickering

9 years agoam 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to...
Jae Seo [Tue, 21 Jul 2015 00:28:20 +0000 (00:28 +0000)]
am 6564934d: am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

* commit '6564934d1a3f1020184c48bdddbe91321652a0b2':
  TIF: Get or create the user state when failed to find existing one

9 years agoam aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged(...
Terry Heo [Tue, 21 Jul 2015 00:28:16 +0000 (00:28 +0000)]
am aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev

* commit 'aaf67d952711e9587df143e017618fc488c32077':
  TIF: Use copied track list for onTracksChanged() callback

9 years agoUse RingtonePlayer to get ringtone title
Todd Kennedy [Mon, 20 Jul 2015 20:32:40 +0000 (13:32 -0700)]
Use RingtonePlayer to get ringtone title

Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.

Bug: 22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce

9 years agoam 96ee8e8f: am 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI...
Jorim Jaggi [Tue, 21 Jul 2015 00:22:35 +0000 (00:22 +0000)]
am 96ee8e8f: am 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev

* commit '96ee8e8f04252ff7289e7e79289706b05637e40b':
  Fix SysUI crashes on svelte devices

9 years agoam e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock...
Dongwon Kang [Tue, 21 Jul 2015 00:21:50 +0000 (00:21 +0000)]
am e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev

* commit 'e64dfb47738c6b5fd3f7fabe1a1bce0c0acc07be':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive

9 years agoam 4cb9ccc7: am c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvent...
Jorim Jaggi [Tue, 21 Jul 2015 00:21:44 +0000 (00:21 +0000)]
am 4cb9ccc7: am c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev

* commit '4cb9ccc73282484f9330ecf95d5d9b7bff07040b':
  Test app to emit all AccessibilityEvents to logcat.

9 years agoam f2ae250e: am 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation for appear...
Jorim Jaggi [Tue, 21 Jul 2015 00:21:37 +0000 (00:21 +0000)]
am f2ae250e: am 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation for appear animation

* commit 'f2ae250e7e7410918589b2c9eb0d6101c90f4128':
  Fix unnecessary layer creation for appear animation

9 years agoam c1f197ca: am 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs advising users...
Miao Wang [Tue, 21 Jul 2015 00:21:31 +0000 (00:21 +0000)]
am c1f197ca: am 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev

* commit 'c1f197ca7db5845c31e36648b3974b844bb55067':
  [RenderScript] Add docs advising users about dstAtop bug.

9 years agoam b946ce96: am 00fe1b65: am 4cd72169: Fix window animation flickering
Jorim Jaggi [Tue, 21 Jul 2015 00:21:25 +0000 (00:21 +0000)]
am b946ce96: am 00fe1b65: am 4cd72169: Fix window animation flickering

* commit 'b946ce96d2f761550e7b30286846771fa3beb74d':
  Fix window animation flickering

9 years agoam 1e3da911: am d9fa0fd7: am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust paddin...
Alan Viverette [Tue, 21 Jul 2015 00:16:19 +0000 (00:16 +0000)]
am 1e3da911: am d9fa0fd7: am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev

* commit '1e3da911f1f91e6c2a1165aa5c01d5779ab697ab':
  Adjust padding and font size in time picker for Large text mode

9 years agoam c447689d: am 872cb95c: am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing...
Alan Viverette [Tue, 21 Jul 2015 00:16:12 +0000 (00:16 +0000)]
am c447689d: am 872cb95c: am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev

* commit 'c447689d2770a5f09bbef19a3097236f4a8e7445':
  Add missing invalidation check to drawable cache

9 years agoam 976b0428: am 6bd77bf8: am af12538d: am 7b36e3ad: am 02aff29c: Merge "[Fix MANAGE_U...
Simranjit Singh Kohli [Tue, 21 Jul 2015 00:15:54 +0000 (00:15 +0000)]
am 976b0428: am 6bd77bf8: am af12538d: am 7b36e3ad: am 02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The calle

* commit '976b0428c5cb33c1767362318db194ff7277de0f':
  [Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.

9 years agoam d9c5769e: am 0f8d156e: am 5c97a4ba: am 609cb585: am a7ce2344: Merge "Fix issue...
Dianne Hackborn [Tue, 21 Jul 2015 00:15:44 +0000 (00:15 +0000)]
am d9c5769e: am 0f8d156e: am 5c97a4ba: am 609cb585: am a7ce2344: Merge "Fix issue #22564918: Request is inactive" into mnc-dev

* commit 'd9c5769e1b0b9fd6044876e5f8af640a16dcd7c3':
  Fix issue #22564918: Request is inactive

9 years agoam b6be47fd: am 32909b4a: am 918ca968: am 7800a1f8: am 86b273f1: Fix jank in swipe...
Jorim Jaggi [Tue, 21 Jul 2015 00:15:37 +0000 (00:15 +0000)]
am b6be47fd: am 32909b4a: am 918ca968: am 7800a1f8: am 86b273f1: Fix jank in swipe-up to unlock

* commit 'b6be47fde3b9f2991610cccbae2bfa17b181c4ca':
  Fix jank in swipe-up to unlock

9 years agoam fa796912: am 37dbafd1: am b63c22e4: am c0c20b26: am f8763581: Allow navigation...
Jorim Jaggi [Tue, 21 Jul 2015 00:15:20 +0000 (00:15 +0000)]
am fa796912: am 37dbafd1: am b63c22e4: am c0c20b26: am f8763581: Allow navigation bar drawing during window animations

* commit 'fa796912095bbfbb63aad9105ccfbc6cd3b00b3b':
  Allow navigation bar drawing during window animations

9 years agoam edd2e67c: am 2dc20d7a: am 293eca69: am 32f7527d: am 2dc6ebbe: Merge "Fix default...
Roozbeh Pournader [Tue, 21 Jul 2015 00:14:57 +0000 (00:14 +0000)]
am edd2e67c: am 2dc20d7a: am 293eca69: am 32f7527d: am 2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev

* commit 'edd2e67cf217de075ee7184e080e17859c72d523':
  Fix default value of stereoReset() in the documentation.

9 years agoam abe22377: am 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong...
Keisuke Kuroyanagi [Tue, 21 Jul 2015 00:14:50 +0000 (00:14 +0000)]
am abe22377: am 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev

* commit 'abe22377262a2aadbeb3b64d8bc10916b0256d6d':
  Fix: Wrong suggestion popup position in extract mode.

9 years agoam d1e755a8: am 420d5fdd: am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optio...
Robert Greenwalt [Tue, 21 Jul 2015 00:14:43 +0000 (00:14 +0000)]
am d1e755a8: am 420d5fdd: am 30cf8079: am dacf0443: am b0e4a9e8: Merge "Support optional modem restart on certain errors." into mnc-dev

* commit 'd1e755a87b616e9acd46018d9d9964333062c702':
  Support optional modem restart on certain errors.

9 years agoam 3bb80cd1: am 85670df0: am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot...
Jason Monk [Tue, 21 Jul 2015 00:14:28 +0000 (00:14 +0000)]
am 3bb80cd1: am 85670df0: am eeeb45a7: am 47b9d250: am 33c619bb: Merge "Fix hotspot brokenness" into mnc-dev

* commit '3bb80cd19569eb31021eb975091a0d776998e25b':
  Fix hotspot brokenness

9 years agoam d12974f3: am a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession...
Jae Seo [Tue, 21 Jul 2015 00:14:21 +0000 (00:14 +0000)]
am d12974f3: am a38aaba2: am c160c231: am 48d707ae: am 26f7720e: Merge "MediaSession: Do not lock on AudioManager.getStreamVolume" into mnc-dev

* commit 'd12974f336bee5f3d1a14b51f0d6ded4af8afd64':
  MediaSession: Do not lock on AudioManager.getStreamVolume

9 years agoam d4dc8756: am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI...
Jeff Sharkey [Tue, 21 Jul 2015 00:14:13 +0000 (00:14 +0000)]
am d4dc8756: am 4524184c: am f811d7fc: am fe7a311c: am 35ba2cdb: Merge "Inherit ABI when moving existing install." into mnc-dev

* commit 'd4dc87569fcc608f8065395c98ac956a3d11a79a':
  Inherit ABI when moving existing install.

9 years agoam 6f5bf717: am e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap...
Roozbeh Pournader [Tue, 21 Jul 2015 00:13:59 +0000 (00:13 +0000)]
am 6f5bf717: am e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '6f5bf7170281b29ef1080fb02328715e08e19d8d':
  Bidi-wrap the results of format[Short]FileSize().

9 years agoam 385f2d18: (-s ours) am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d...
Geoff Mendal [Tue, 21 Jul 2015 00:13:45 +0000 (00:13 +0000)]
am 385f2d18: (-s ours) am 6b12a5fe: (-s ours) am 5038b92e: (-s ours) am ddb33d7d: (-s ours) am a6bf393d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '385f2d18c631190fc9eb0ea14b288f5589a1f30c':
  Import translations. DO NOT MERGE

9 years agoam b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing...
Jae Seo [Tue, 21 Jul 2015 00:10:47 +0000 (00:10 +0000)]
am b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

* commit 'b2eed1d6e11f38c00ce1776ade14dfa004c6119f':
  TIF: Get or create the user state when failed to find existing one

9 years agoam e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into...
Terry Heo [Tue, 21 Jul 2015 00:10:43 +0000 (00:10 +0000)]
am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev

* commit 'e95af4ab8bda68ee80bf4d444356e0c1afb1fe99':
  TIF: Use copied track list for onTracksChanged() callback

9 years agoam 37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop bug."
Miao Wang [Tue, 21 Jul 2015 00:08:36 +0000 (00:08 +0000)]
am 37353dc1: Merge "[RenderScript] Add docs advising users about dstAtop bug."

* commit '37353dc13e11000473f5aa43d5713816f2b6a83f':
  [RenderScript] Add docs advising users about dstAtop bug.

9 years agoam 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelt...
Jorim Jaggi [Tue, 21 Jul 2015 00:08:08 +0000 (00:08 +0000)]
am 537cd82a: am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev

* commit '537cd82ad5ab416eae2199d2dfe4634f974c89c8':
  Fix SysUI crashes on svelte devices

9 years agoam 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling...
Dongwon Kang [Tue, 21 Jul 2015 00:00:44 +0000 (00:00 +0000)]
am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev

* commit '14bdaa7f6b2140dadb631e67d61462219c678100':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive

9 years agoam c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat...
Jorim Jaggi [Tue, 21 Jul 2015 00:00:39 +0000 (00:00 +0000)]
am c0469f99: am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev

* commit 'c0469f99723919cf1d55b34180020ef14fb36b56':
  Test app to emit all AccessibilityEvents to logcat.

9 years agoam 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation for appear animation
Jorim Jaggi [Tue, 21 Jul 2015 00:00:33 +0000 (00:00 +0000)]
am 7cc56bb4: am 1f98c62f: Fix unnecessary layer creation for appear animation

* commit '7cc56bb44d2be8bc0d2cd43dba86247867992305':
  Fix unnecessary layer creation for appear animation

9 years agoam 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop...
Miao Wang [Tue, 21 Jul 2015 00:00:28 +0000 (00:00 +0000)]
am 6005f9e5: am 15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev

* commit '6005f9e5ae8e15e598d7bcb9667f1289e1d8c4fe':
  [RenderScript] Add docs advising users about dstAtop bug.

9 years agoam 00fe1b65: am 4cd72169: Fix window animation flickering
Jorim Jaggi [Tue, 21 Jul 2015 00:00:24 +0000 (00:00 +0000)]
am 00fe1b65: am 4cd72169: Fix window animation flickering

* commit '00fe1b650a8ac66838273d91ecf5facd6225bca1':
  Fix window animation flickering

9 years agoMerge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
Jae Seo [Mon, 20 Jul 2015 23:59:22 +0000 (23:59 +0000)]
Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev

9 years agoMerge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
Terry Heo [Mon, 20 Jul 2015 23:57:28 +0000 (23:57 +0000)]
Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev

9 years agoMerge "[RenderScript] Add docs advising users about dstAtop bug."
Miao Wang [Mon, 20 Jul 2015 23:57:19 +0000 (23:57 +0000)]
Merge "[RenderScript] Add docs advising users about dstAtop bug."

9 years agoam 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem...
Dongwon Kang [Mon, 20 Jul 2015 23:56:37 +0000 (23:56 +0000)]
am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev

* commit '6444fe121449f1cacf4500d3098b590c74e3646d':
  MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive

9 years agoam 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 23:56:33 +0000 (23:56 +0000)]
am 55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev

* commit '55786e1164d522d878d1f493c30330669b1fd868':
  Test app to emit all AccessibilityEvents to logcat.

9 years agoam 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices...
Jorim Jaggi [Mon, 20 Jul 2015 23:54:19 +0000 (23:54 +0000)]
am 027db7c9: am e58ba842: am 8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev

* commit '027db7c90a2bfde65069dece1c1a4519e246c202':
  Fix SysUI crashes on svelte devices

9 years agoMerge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive...
Dongwon Kang [Mon, 20 Jul 2015 23:49:59 +0000 (23:49 +0000)]
Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev

9 years agoam d9fa0fd7: am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust padding and font...
Alan Viverette [Mon, 20 Jul 2015 23:47:07 +0000 (23:47 +0000)]
am d9fa0fd7: am 6ae0a992: am 23305e9f: am 41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev

* commit 'd9fa0fd7f3b98473474103ac93ec6ca02455c8b0':
  Adjust padding and font size in time picker for Large text mode

9 years agoam 872cb95c: am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation...
Alan Viverette [Mon, 20 Jul 2015 23:47:01 +0000 (23:47 +0000)]
am 872cb95c: am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev

* commit '872cb95cf211b6d30c8ac6f7670bbd5de19d33cb':
  Add missing invalidation check to drawable cache

9 years agoam 1f98c62f: Fix unnecessary layer creation for appear animation
Jorim Jaggi [Mon, 20 Jul 2015 23:45:46 +0000 (23:45 +0000)]
am 1f98c62f: Fix unnecessary layer creation for appear animation

* commit '1f98c62f9a60fedd8f18bd47e3f3c4e5fcb34031':
  Fix unnecessary layer creation for appear animation