OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 4efa19ba: am 05118cc6: am d76a81f5: Merge "Fix missing break in Icon class" into...
Yorke Lee [Fri, 15 May 2015 02:11:20 +0000 (02:11 +0000)]
am 4efa19ba: am 05118cc6: am d76a81f5: Merge "Fix missing break in Icon class" into mnc-dev

* commit '4efa19baa6a33f20ba7e9e556b3dd21757e03005':
  Fix missing break in Icon class

9 years agoam 05118cc6: am d76a81f5: Merge "Fix missing break in Icon class" into mnc-dev
Yorke Lee [Fri, 15 May 2015 02:01:35 +0000 (02:01 +0000)]
am 05118cc6: am d76a81f5: Merge "Fix missing break in Icon class" into mnc-dev

* commit '05118cc6147b381d97448ed4e3d4c83708535409':
  Fix missing break in Icon class

9 years agoam d76a81f5: Merge "Fix missing break in Icon class" into mnc-dev
Yorke Lee [Fri, 15 May 2015 01:50:37 +0000 (01:50 +0000)]
am d76a81f5: Merge "Fix missing break in Icon class" into mnc-dev

* commit 'd76a81f5195b8a23b136f5a9965d3b5dd12a195d':
  Fix missing break in Icon class

9 years agoMerge "Fix missing break in Icon class" into mnc-dev
Yorke Lee [Fri, 15 May 2015 01:39:03 +0000 (01:39 +0000)]
Merge "Fix missing break in Icon class" into mnc-dev

9 years agoam 8ceb7b4d: am c51c8e92: am ebb1d76e: Merge "Fix post dial for remote connections...
Sailesh Nepal [Fri, 15 May 2015 01:35:00 +0000 (01:35 +0000)]
am 8ceb7b4d: am c51c8e92: am ebb1d76e: Merge "Fix post dial for remote connections" into mnc-dev

* commit '8ceb7b4d6fa7112d519076b3f5365dd6d984ff72':
  Fix post dial for remote connections

9 years agoam c51c8e92: am ebb1d76e: Merge "Fix post dial for remote connections" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 01:24:51 +0000 (01:24 +0000)]
am c51c8e92: am ebb1d76e: Merge "Fix post dial for remote connections" into mnc-dev

* commit 'c51c8e9243a27f27f285289d78109df6965a0ac2':
  Fix post dial for remote connections

9 years agoFix missing break in Icon class
Yorke Lee [Fri, 15 May 2015 01:22:02 +0000 (18:22 -0700)]
Fix missing break in Icon class

This causes RuntimeExceptions to fall through to the next
case statement.

Bug: 21168985
Change-Id: Ie69610b22c6caf9f6536ebd48673067880cb75a2

9 years agoam ebb1d76e: Merge "Fix post dial for remote connections" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 01:06:12 +0000 (01:06 +0000)]
am ebb1d76e: Merge "Fix post dial for remote connections" into mnc-dev

* commit 'ebb1d76e32535df04be5baab72fc067decf8ee15':
  Fix post dial for remote connections

9 years agoam 4f3efcff: am 6823ea49: am 4b4d4757: Merge "Start AnimationDrawable from the zeroth...
Doris Liu [Fri, 15 May 2015 01:01:00 +0000 (01:01 +0000)]
am 4f3efcff: am 6823ea49: am 4b4d4757: Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev

* commit '4f3efcff8041b027e652c0bafb00a64b576eac26':
  Start AnimationDrawable from the zeroth frame.

9 years agoMerge "Fix post dial for remote connections" into mnc-dev
Sailesh Nepal [Fri, 15 May 2015 00:55:39 +0000 (00:55 +0000)]
Merge "Fix post dial for remote connections" into mnc-dev

9 years agoam 6823ea49: am 4b4d4757: Merge "Start AnimationDrawable from the zeroth frame."...
Doris Liu [Fri, 15 May 2015 00:49:11 +0000 (00:49 +0000)]
am 6823ea49: am 4b4d4757: Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev

* commit '6823ea491d85e58929407068c6c68ed7c2e5447a':
  Start AnimationDrawable from the zeroth frame.

9 years agoFix post dial for remote connections
Sailesh Nepal [Fri, 15 May 2015 00:39:41 +0000 (17:39 -0700)]
Fix post dial for remote connections

Use the correct callback (onPostDialChar instead of onPostDialWait).
This fixes a bug where every remote call would prompt the user
to send tones after the call became active.

BUG: 21004101
Change-Id: I1656a4266d0028ef29494a3cee169180267e16cd

9 years agoam 15d4c534: am 54834f28: am 2cdf5eaa: Merge "Fix build: udpate parser factory method...
Deepanshu Gupta [Fri, 15 May 2015 00:38:38 +0000 (00:38 +0000)]
am 15d4c534: am 54834f28: am 2cdf5eaa: Merge "Fix build: udpate parser factory method" into mnc-dev

* commit '15d4c5340fdd3e7b1b78e74889eafd6301052c86':
  Fix build: udpate parser factory method

9 years agoam 4b4d4757: Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev
Doris Liu [Fri, 15 May 2015 00:37:25 +0000 (00:37 +0000)]
am 4b4d4757: Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev

* commit '4b4d4757698718f785aa534b69a117007f5b64a7':
  Start AnimationDrawable from the zeroth frame.

9 years agoMerge "Start AnimationDrawable from the zeroth frame." into mnc-dev
Doris Liu [Fri, 15 May 2015 00:28:32 +0000 (00:28 +0000)]
Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev

9 years agoam 54834f28: am 2cdf5eaa: Merge "Fix build: udpate parser factory method" into mnc-dev
Deepanshu Gupta [Fri, 15 May 2015 00:24:01 +0000 (00:24 +0000)]
am 54834f28: am 2cdf5eaa: Merge "Fix build: udpate parser factory method" into mnc-dev

* commit '54834f287f6d9785e5ae77de6310abbe8f0f18dd':
  Fix build: udpate parser factory method

9 years agoStart AnimationDrawable from the zeroth frame.
Doris Liu [Thu, 14 May 2015 22:12:23 +0000 (15:12 -0700)]
Start AnimationDrawable from the zeroth frame.

This CL fixes the issue where when start is called, we run the next frame
of the animation drawable while mCurFrame is already set to 0. The result
is that the first frame of the AnimationDrawable is then skipped.

Bug: 21168854
Change-Id: I2b77ae017d3debd0f8cfec81ea86d1120e78bb55

9 years agoam 2cdf5eaa: Merge "Fix build: udpate parser factory method" into mnc-dev
Deepanshu Gupta [Fri, 15 May 2015 00:14:54 +0000 (00:14 +0000)]
am 2cdf5eaa: Merge "Fix build: udpate parser factory method" into mnc-dev

* commit '2cdf5eaad4ad84fc87b73945fdd3262da4a0ab43':
  Fix build: udpate parser factory method

9 years agoMerge "Fix build: udpate parser factory method" into mnc-dev
Deepanshu Gupta [Fri, 15 May 2015 00:01:51 +0000 (00:01 +0000)]
Merge "Fix build: udpate parser factory method" into mnc-dev

9 years agoam f7e98a23: am b1e5a9ae: am 0e4a2b5f: Merge "Check for setting to already set" into...
John Reck [Fri, 15 May 2015 00:01:38 +0000 (00:01 +0000)]
am f7e98a23: am b1e5a9ae: am 0e4a2b5f: Merge "Check for setting to already set" into mnc-dev

* commit 'f7e98a2348ccde0ffb865b9563103c609add6d27':
  Check for setting to already set

9 years agoam 780dd388: am 9927e509: am e650fd95: Merge "Fix grant/revoke to act on owner by...
Svet Ganov [Fri, 15 May 2015 00:01:33 +0000 (00:01 +0000)]
am 780dd388: am 9927e509: am e650fd95: Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev

* commit '780dd388667c2ccf5a9a5897a4d32477090b9632':
  Fix grant/revoke to act on owner by default and log invalid user id.

9 years agoam 95ffecaa: am 9c1c33b9: am fcb34c59: Merge "Adjust lockscreen style to spec" into...
Jorim Jaggi [Fri, 15 May 2015 00:01:29 +0000 (00:01 +0000)]
am 95ffecaa: am 9c1c33b9: am fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev

* commit '95ffecaa0b59a131eb8cb08442a1781772d872cc':
  Adjust lockscreen style to spec

9 years agoam 00c8ff6d: am 52bb6c26: am 97993692: Fix brightness mirror positioning.
Jorim Jaggi [Fri, 15 May 2015 00:01:24 +0000 (00:01 +0000)]
am 00c8ff6d: am 52bb6c26: am 97993692: Fix brightness mirror positioning.

* commit '00c8ff6d5e147bf7286ced1a1645608fc7bbeee3':
  Fix brightness mirror positioning.

9 years agoam 28922386: am 106c6ba3: am af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference...
Deepanshu Gupta [Fri, 15 May 2015 00:01:20 +0000 (00:01 +0000)]
am 28922386: am 106c6ba3: am af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev

* commit '28922386d8c846fa1b33c93191fa6a7bb184a4fb':
  Don't keep LayoutlibCallback reference.

9 years agoFix build: udpate parser factory method
Deepanshu Gupta [Fri, 15 May 2015 00:00:50 +0000 (17:00 -0700)]
Fix build: udpate parser factory method

Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544

9 years agoam b1e5a9ae: am 0e4a2b5f: Merge "Check for setting to already set" into mnc-dev
John Reck [Thu, 14 May 2015 23:49:11 +0000 (23:49 +0000)]
am b1e5a9ae: am 0e4a2b5f: Merge "Check for setting to already set" into mnc-dev

* commit 'b1e5a9aef72788d3b0408782f5d7e6adcdcdbefa':
  Check for setting to already set

9 years agoam 9927e509: am e650fd95: Merge "Fix grant/revoke to act on owner by default and...
Svet Ganov [Thu, 14 May 2015 23:49:06 +0000 (23:49 +0000)]
am 9927e509: am e650fd95: Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev

* commit '9927e509ee129254df9be87d64667900ada0c43f':
  Fix grant/revoke to act on owner by default and log invalid user id.

9 years agoam 9c1c33b9: am fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 23:49:02 +0000 (23:49 +0000)]
am 9c1c33b9: am fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev

* commit '9c1c33b9dc9afdbf207ca95fb0d8aab5143eee6f':
  Adjust lockscreen style to spec

9 years agoam 52bb6c26: am 97993692: Fix brightness mirror positioning.
Jorim Jaggi [Thu, 14 May 2015 23:48:56 +0000 (23:48 +0000)]
am 52bb6c26: am 97993692: Fix brightness mirror positioning.

* commit '52bb6c26c89bdbf44f1263532e216a758e80c0b3':
  Fix brightness mirror positioning.

9 years agoam 106c6ba3: am af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 23:48:51 +0000 (23:48 +0000)]
am 106c6ba3: am af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev

* commit '106c6ba38b277b387d044eaa3433a1f3aababe68':
  Don't keep LayoutlibCallback reference.

9 years agoam e018313d: am 03c8750d: am f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 23:48:25 +0000 (23:48 +0000)]
am e018313d: am 03c8750d: am f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev

* commit 'e018313d3266dcb9b9e353aa7f57ab5c5c51e7b4':
  CEC: Remove obsolete TODOs

9 years agoam 0e4a2b5f: Merge "Check for setting to already set" into mnc-dev
John Reck [Thu, 14 May 2015 23:45:44 +0000 (23:45 +0000)]
am 0e4a2b5f: Merge "Check for setting to already set" into mnc-dev

* commit '0e4a2b5ff0ee061c46bfe3b1f15a7067308e0da8':
  Check for setting to already set

9 years agoam e650fd95: Merge "Fix grant/revoke to act on owner by default and log invalid user...
Svet Ganov [Thu, 14 May 2015 23:45:39 +0000 (23:45 +0000)]
am e650fd95: Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev

* commit 'e650fd95a9d87f74fb420687b7062c9d428ef3f1':
  Fix grant/revoke to act on owner by default and log invalid user id.

9 years agoam 03c8750d: am f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 23:38:00 +0000 (23:38 +0000)]
am 03c8750d: am f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev

* commit '03c8750d3162dd32e5110a354e5a2a2237b7c01f':
  CEC: Remove obsolete TODOs

9 years agoam fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 23:34:04 +0000 (23:34 +0000)]
am fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev

* commit 'fcb34c599f59d3bd73edad1848c081548e721024':
  Adjust lockscreen style to spec

9 years agoam 97993692: Fix brightness mirror positioning.
Jorim Jaggi [Thu, 14 May 2015 23:33:57 +0000 (23:33 +0000)]
am 97993692: Fix brightness mirror positioning.

* commit '979936920ee2e654e23678172c49b301e886c374':
  Fix brightness mirror positioning.

9 years agoam af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 23:33:49 +0000 (23:33 +0000)]
am af4d3d2d: Merge "Don\'t keep LayoutlibCallback reference." into mnc-dev

* commit 'af4d3d2d141b905fe6f92c9cce81ee76a8203fd8':
  Don't keep LayoutlibCallback reference.

9 years agoam f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 23:29:19 +0000 (23:29 +0000)]
am f2fb0e73: Merge "CEC: Remove obsolete TODOs" into mnc-dev

* commit 'f2fb0e73f1e7a056c8986959b391ad29eabbf8f9':
  CEC: Remove obsolete TODOs

9 years agoMerge "Check for setting to already set" into mnc-dev
John Reck [Thu, 14 May 2015 23:27:47 +0000 (23:27 +0000)]
Merge "Check for setting to already set" into mnc-dev

9 years agoMerge "Fix grant/revoke to act on owner by default and log invalid user id." into...
Svet Ganov [Thu, 14 May 2015 23:25:09 +0000 (23:25 +0000)]
Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev

9 years agoFix grant/revoke to act on owner by default and log invalid user id.
Svet Ganov [Thu, 14 May 2015 23:18:05 +0000 (16:18 -0700)]
Fix grant/revoke to act on owner by default and log invalid user id.

bug:21163229

Change-Id: I66d0cc130b37b5752ed06afc73259ed41bfb7830

9 years agoMerge "Adjust lockscreen style to spec" into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 23:15:23 +0000 (23:15 +0000)]
Merge "Adjust lockscreen style to spec" into mnc-dev

9 years agoFix brightness mirror positioning.
Jorim Jaggi [Thu, 14 May 2015 00:39:18 +0000 (17:39 -0700)]
Fix brightness mirror positioning.

Bug: 20884993
Change-Id: Iba75c2dd7aca9b7ac446cb6a278085af4e150b95

9 years agoCheck for setting to already set
John Reck [Thu, 14 May 2015 22:47:03 +0000 (15:47 -0700)]
Check for setting to already set

Bug: 20105644
Change-Id: Ia79d2ae5c725c139d2b7c423a899be625cb8f14f

9 years agoAdjust lockscreen style to spec
Jorim Jaggi [Thu, 14 May 2015 21:13:20 +0000 (14:13 -0700)]
Adjust lockscreen style to spec

Bug: 21111048
Change-Id: Ibdecaf01224ef45a53b4981d8b79d27034a3df45

9 years agoam 3507cfc9: am bcaa424a: am 39a0b22c: Merge "[RenderScript] Add dummy getMinorID...
Miao Wang [Thu, 14 May 2015 22:58:37 +0000 (22:58 +0000)]
am 3507cfc9: am bcaa424a: am 39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev

* commit '3507cfc95adc3b9a2825509a58a2cfa062820894':
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.

9 years agoam 265f5fb5: am 812eae18: am 3e02adb0: Fix closing state
Jorim Jaggi [Thu, 14 May 2015 22:58:32 +0000 (22:58 +0000)]
am 265f5fb5: am 812eae18: am 3e02adb0: Fix closing state

* commit '265f5fb52d51d859ab3742c9eac1842609395241':
  Fix closing state

9 years agoMerge "Don't keep LayoutlibCallback reference." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 22:57:02 +0000 (22:57 +0000)]
Merge "Don't keep LayoutlibCallback reference." into mnc-dev

9 years agoMerge "CEC: Remove obsolete TODOs" into mnc-dev
Jinsuk Kim [Thu, 14 May 2015 22:47:05 +0000 (22:47 +0000)]
Merge "CEC: Remove obsolete TODOs" into mnc-dev

9 years agoam a8fe399e: am c55f0d8b: am a8545890: Merge "Move couple of intellij libraries to...
Deepanshu Gupta [Thu, 14 May 2015 22:46:55 +0000 (22:46 +0000)]
am a8fe399e: am c55f0d8b: am a8545890: Merge "Move couple of intellij libraries to project level." into mnc-dev

* commit 'a8fe399e13b0ad96a14ce84effc467215da866cb':
  Move couple of intellij libraries to project level.

9 years agoam ea3c13d2: am 53ec4a66: am 474bb82f: Merge "Clarify docs for BackupTransport.initia...
Christopher Tate [Thu, 14 May 2015 22:46:50 +0000 (22:46 +0000)]
am ea3c13d2: am 53ec4a66: am 474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev

* commit 'ea3c13d2aaf91a6cb58633be13e7413a67ee8011':
  Clarify docs for BackupTransport.initializeDevice()

9 years agoam d2115eaa: am 499b0d9f: am a0807a65: Merge "Camera: tonemap linkify update" into...
Yin-Chia Yeh [Thu, 14 May 2015 22:46:45 +0000 (22:46 +0000)]
am d2115eaa: am 499b0d9f: am a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev

* commit 'd2115eaa6613c1c96394012c3af7b131cf520dcd':
  Camera: tonemap linkify update

9 years agoam bcaa424a: am 39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain...
Miao Wang [Thu, 14 May 2015 22:46:42 +0000 (22:46 +0000)]
am bcaa424a: am 39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev

* commit 'bcaa424abc577135d02f4f2a1a55ac7b6c773f20':
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.

9 years agoam 812eae18: am 3e02adb0: Fix closing state
Jorim Jaggi [Thu, 14 May 2015 22:46:37 +0000 (22:46 +0000)]
am 812eae18: am 3e02adb0: Fix closing state

* commit '812eae1851cc77528aa696714471722cc1f71c50':
  Fix closing state

9 years agoDon't keep LayoutlibCallback reference.
Deepanshu Gupta [Thu, 14 May 2015 22:37:29 +0000 (15:37 -0700)]
Don't keep LayoutlibCallback reference.

Switch to the newer API that enables keeping a reference only to the
ParserFactory which is a much leaner object as compared to
LayoutlibCallback.

Change-Id: I9b7afd93226db23786a00b2951cbf5ae5b8f3e5f

9 years agoam 39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain compatible with...
Miao Wang [Thu, 14 May 2015 22:35:04 +0000 (22:35 +0000)]
am 39a0b22c: Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev

* commit '39a0b22cf854963dc04dc7a7714b4a7a263e93aa':
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.

9 years agoam 3e02adb0: Fix closing state
Jorim Jaggi [Thu, 14 May 2015 22:34:59 +0000 (22:34 +0000)]
am 3e02adb0: Fix closing state

* commit '3e02adb028741938dab9787fa1552f86b2558c9a':
  Fix closing state

9 years agoam c55f0d8b: am a8545890: Merge "Move couple of intellij libraries to project level...
Deepanshu Gupta [Thu, 14 May 2015 22:34:13 +0000 (22:34 +0000)]
am c55f0d8b: am a8545890: Merge "Move couple of intellij libraries to project level." into mnc-dev

* commit 'c55f0d8b024f12b6ac2cfba28ff0c7fe7ee2e9c3':
  Move couple of intellij libraries to project level.

9 years agoam 53ec4a66: am 474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice...
Christopher Tate [Thu, 14 May 2015 22:34:08 +0000 (22:34 +0000)]
am 53ec4a66: am 474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev

* commit '53ec4a66630ce14a4ad9e2976dd9863a12fe092c':
  Clarify docs for BackupTransport.initializeDevice()

9 years agoam 499b0d9f: am a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev
Yin-Chia Yeh [Thu, 14 May 2015 22:34:01 +0000 (22:34 +0000)]
am 499b0d9f: am a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev

* commit '499b0d9fd3f1c7c3eec8bc2d6d3c989f1a7c5fd6':
  Camera: tonemap linkify update

9 years agoam a8545890: Merge "Move couple of intellij libraries to project level." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 22:25:33 +0000 (22:25 +0000)]
am a8545890: Merge "Move couple of intellij libraries to project level." into mnc-dev

* commit 'a8545890ac7851dbd113535e14d170e083357f5b':
  Move couple of intellij libraries to project level.

9 years agoam 474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev
Christopher Tate [Thu, 14 May 2015 22:25:28 +0000 (22:25 +0000)]
am 474bb82f: Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev

* commit '474bb82fd5dafdba8de917ed7a834ba68890678f':
  Clarify docs for BackupTransport.initializeDevice()

9 years agoam a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev
Yin-Chia Yeh [Thu, 14 May 2015 22:25:22 +0000 (22:25 +0000)]
am a0807a65: Merge "Camera: tonemap linkify update" into mnc-dev

* commit 'a0807a65e93aeb7c73fb2fcc68244ab324dd3c07':
  Camera: tonemap linkify update

9 years agoMerge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat...
Miao Wang [Thu, 14 May 2015 22:22:01 +0000 (22:22 +0000)]
Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev

9 years agoFix closing state
Jorim Jaggi [Thu, 14 May 2015 00:50:26 +0000 (17:50 -0700)]
Fix closing state

Bug: 20940663
Change-Id: I34e2bf4fb3ba9f9ad15e634c4a09883f57b446b2

9 years agoam 33db304c: am d0c2d0dc: am 758e6a8f: Merge "ImageReader: Image getFormat should...
Zhijun He [Thu, 14 May 2015 22:21:16 +0000 (22:21 +0000)]
am 33db304c: am d0c2d0dc: am 758e6a8f: Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev

* commit '33db304c162c38aa4d248093f7197297e40468b4':
  ImageReader: Image getFormat should return the Image buffer format

9 years agoam 79fc2da0: am ff704248: am 492afe90: Merge "Image/Reader/Writer: address API review...
Zhijun He [Thu, 14 May 2015 22:21:11 +0000 (22:21 +0000)]
am 79fc2da0: am ff704248: am 492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev

* commit '79fc2da09f4bb848f284ecc4386c818e1f6d3084':
  Image/Reader/Writer: address API review comments

9 years agoMerge "Move couple of intellij libraries to project level." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 22:18:32 +0000 (22:18 +0000)]
Merge "Move couple of intellij libraries to project level." into mnc-dev

9 years agoMerge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev
Christopher Tate [Thu, 14 May 2015 22:16:32 +0000 (22:16 +0000)]
Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev

9 years agoMove couple of intellij libraries to project level.
Deepanshu Gupta [Thu, 14 May 2015 22:12:57 +0000 (15:12 -0700)]
Move couple of intellij libraries to project level.

Move framework and layoutlib api libraries back to being project
libraries so that other modules can depend on it. This enables custom
widget libraries project to merge through cleanly.

Change-Id: I4f00d6fb378a80662f32491a2b0061d6bf61899f

9 years agoMerge "Camera: tonemap linkify update" into mnc-dev
Yin-Chia Yeh [Thu, 14 May 2015 22:12:29 +0000 (22:12 +0000)]
Merge "Camera: tonemap linkify update" into mnc-dev

9 years ago[RenderScript] Add dummy getMinorID to maintain compatible with old RS
Miao Wang [Thu, 14 May 2015 21:53:30 +0000 (14:53 -0700)]
[RenderScript] Add dummy getMinorID to maintain compatible with old RS
compat lib.

bug: 21132592
Change-Id: I375f188dfbd33367a9589533aa51b182fda8bc21

9 years agoam d0c2d0dc: am 758e6a8f: Merge "ImageReader: Image getFormat should return the Image...
Zhijun He [Thu, 14 May 2015 22:11:16 +0000 (22:11 +0000)]
am d0c2d0dc: am 758e6a8f: Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev

* commit 'd0c2d0dc0890a5580a75037685383390d1ce3065':
  ImageReader: Image getFormat should return the Image buffer format

9 years agoam ff704248: am 492afe90: Merge "Image/Reader/Writer: address API review comments...
Zhijun He [Thu, 14 May 2015 22:11:12 +0000 (22:11 +0000)]
am ff704248: am 492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev

* commit 'ff7042481a08a9b109be72982c9e38220c1262f5':
  Image/Reader/Writer: address API review comments

9 years agoam 02c95700: am 27ba8fef: am 21de2f62: am 08bea4c9: (-s ours) am 627f2681: Merge...
Joe LaPenna [Thu, 14 May 2015 22:01:59 +0000 (22:01 +0000)]
am 02c95700: am 27ba8fef: am 21de2f62: am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev

* commit '02c9570059b13b7a02dd9a1fc77c29772510e2ed':
  Wait for KEY_SLEEP UP event before calling goToSleep()

9 years agoam 5992dacc: am b27d3858: am 7fc802bb: Merge "MediaDataSource: address API council...
Chong Zhang [Thu, 14 May 2015 22:01:54 +0000 (22:01 +0000)]
am 5992dacc: am b27d3858: am 7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev

* commit '5992dacc7f980e35db0c8918ab7dc2088f3ae479':
  MediaDataSource: address API council comments

9 years agoam 758e6a8f: Merge "ImageReader: Image getFormat should return the Image buffer forma...
Zhijun He [Thu, 14 May 2015 21:55:49 +0000 (21:55 +0000)]
am 758e6a8f: Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev

* commit '758e6a8f70b28e1584588b06b12d227deeefba74':
  ImageReader: Image getFormat should return the Image buffer format

9 years agoam 492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev
Zhijun He [Thu, 14 May 2015 21:55:43 +0000 (21:55 +0000)]
am 492afe90: Merge "Image/Reader/Writer: address API review comments" into mnc-dev

* commit '492afe901459274ea8b9dd52815d3f51dd1f244f':
  Image/Reader/Writer: address API review comments

9 years agoam 27ba8fef: am 21de2f62: am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLE...
Joe LaPenna [Thu, 14 May 2015 21:51:09 +0000 (21:51 +0000)]
am 27ba8fef: am 21de2f62: am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev

* commit '27ba8fef99151ad4697d1809d97f785939febcc7':
  Wait for KEY_SLEEP UP event before calling goToSleep()

9 years agoam b27d3858: am 7fc802bb: Merge "MediaDataSource: address API council comments" into...
Chong Zhang [Thu, 14 May 2015 21:51:04 +0000 (21:51 +0000)]
am b27d3858: am 7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev

* commit 'b27d38588aec4f0be4f09e26310ce7c4592453a9':
  MediaDataSource: address API council comments

9 years agoMerge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev
Zhijun He [Thu, 14 May 2015 21:46:36 +0000 (21:46 +0000)]
Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev

9 years agoam e33a0cf6: am 6500bbd4: am 51bf5d9c: Merge "media: remove setPlaybackRate from...
Lajos Molnar [Thu, 14 May 2015 21:44:01 +0000 (21:44 +0000)]
am e33a0cf6: am 6500bbd4: am 51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev

* commit 'e33a0cf6bb95aa1037861e1a58084583a225e592':
  media: remove setPlaybackRate from MediaPlayer and MediSync

9 years agoMerge "Image/Reader/Writer: address API review comments" into mnc-dev
Zhijun He [Thu, 14 May 2015 21:43:59 +0000 (21:43 +0000)]
Merge "Image/Reader/Writer: address API review comments" into mnc-dev

9 years agoam a949e442: am 879d52f1: am af047944: Merge "media: change final fields to accessors...
Lajos Molnar [Thu, 14 May 2015 21:43:55 +0000 (21:43 +0000)]
am a949e442: am 879d52f1: am af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev

* commit 'a949e442c402d3c0e83800090c176c6fba89ef20':
  media: change final fields to accessors in MediaTimestamp

9 years agoam 017de07d: am 2e036538: am 55a30240: Merge "wallpaper: avoid exception when user...
Xiaohui Chen [Thu, 14 May 2015 21:43:50 +0000 (21:43 +0000)]
am 017de07d: am 2e036538: am 55a30240: Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev

* commit '017de07dbbe21aab647298ee25d3aefb8b75f269':
  wallpaper: avoid exception when user is not initialized

9 years agoCEC: Remove obsolete TODOs
Jinsuk Kim [Thu, 14 May 2015 21:28:47 +0000 (06:28 +0900)]
CEC: Remove obsolete TODOs

Removed legacy TODOs and the associated hack to enable CEC service
for buggy partner low-level implementation.

Bug: 21153475
Change-Id: I105f77389dd5c604336f86ce375016fa87c86759

9 years agoam 21de2f62: am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event...
Joe LaPenna [Thu, 14 May 2015 21:37:12 +0000 (21:37 +0000)]
am 21de2f62: am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev

* commit '21de2f629df37014dd269e746924374f3df0811a':
  Wait for KEY_SLEEP UP event before calling goToSleep()

9 years agoam 7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev
Chong Zhang [Thu, 14 May 2015 21:37:07 +0000 (21:37 +0000)]
am 7fc802bb: Merge "MediaDataSource: address API council comments" into mnc-dev

* commit '7fc802bbf750a8ed6be0e1858ebcf9740dda15cb':
  MediaDataSource: address API council comments

9 years agoImage/Reader/Writer: address API review comments
Zhijun He [Wed, 13 May 2015 19:11:47 +0000 (12:11 -0700)]
Image/Reader/Writer: address API review comments

* Remove isOpaque methods
* Removew ImageReader#newOpaqueInstance
* Rename Writer listener and callback
* Clarify the timestamp spec
* Fix a bug in ImageUtils

Bug: 21044520
Change-Id: Ifb85ef25e4d152c2a445b3369c1e16dc1bc5220c

9 years agoam 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling...
Joe LaPenna [Thu, 14 May 2015 21:34:16 +0000 (21:34 +0000)]
am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev

* commit '08bea4c90dce2991ab518bd167a29df8b23f7d1b':
  Wait for KEY_SLEEP UP event before calling goToSleep()

9 years agoam 6500bbd4: am 51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and...
Lajos Molnar [Thu, 14 May 2015 21:33:19 +0000 (21:33 +0000)]
am 6500bbd4: am 51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev

* commit '6500bbd4ed468e5b1fa615f19daa537dbccf7e3b':
  media: remove setPlaybackRate from MediaPlayer and MediSync

9 years agoam 879d52f1: am af047944: Merge "media: change final fields to accessors in MediaTime...
Lajos Molnar [Thu, 14 May 2015 21:33:13 +0000 (21:33 +0000)]
am 879d52f1: am af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev

* commit '879d52f1763a07d5abf8b941244cacc409f5058f':
  media: change final fields to accessors in MediaTimestamp

9 years agoam 2e036538: am 55a30240: Merge "wallpaper: avoid exception when user is not initiali...
Xiaohui Chen [Thu, 14 May 2015 21:33:09 +0000 (21:33 +0000)]
am 2e036538: am 55a30240: Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev

* commit '2e0365386fce8360988362022bd924bff7fcac72':
  wallpaper: avoid exception when user is not initialized

9 years agoMerge "MediaDataSource: address API council comments" into mnc-dev
Chong Zhang [Thu, 14 May 2015 21:29:50 +0000 (21:29 +0000)]
Merge "MediaDataSource: address API council comments" into mnc-dev

9 years agoam 6f9e7a55: am ca0d787f: am 3b7bc569: Merge "Camera2: Fix reprocessing API naming...
Chien-Yu Chen [Thu, 14 May 2015 21:27:01 +0000 (21:27 +0000)]
am 6f9e7a55: am ca0d787f: am 3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev

* commit '6f9e7a556781a1dbf0ecf6d8a6744f04fed8c2ae':
  Camera2: Fix reprocessing API naming and docs

9 years agoam 99b972c5: am 993a0f70: am 93559668: Merge "Tiny fix after updating the error repor...
Mikhail Naganov [Thu, 14 May 2015 21:26:55 +0000 (21:26 +0000)]
am 99b972c5: am 993a0f70: am 93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev

* commit '99b972c5441c960c14adbb9287c5e4355282dda4':
  Tiny fix after updating the error reporting API

9 years agoam 1894743a: am 487e1655: am de355db3: Merge "Change the location of Brandmaster...
Joseph Wen [Thu, 14 May 2015 21:26:46 +0000 (21:26 +0000)]
am 1894743a: am 487e1655: am de355db3: Merge "Change the location of Brandmaster statement file." into mnc-dev

* commit '1894743a518e07d60f36edbf1af6a8b62e5adabc':
  Change the location of Brandmaster statement file.

9 years agoam 9f233c51: am 462e926f: am f93d16bc: Merge "Avoid sealed check when unparceling...
Alan Viverette [Thu, 14 May 2015 21:26:38 +0000 (21:26 +0000)]
am 9f233c51: am 462e926f: am f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev

* commit '9f233c51b2e08fc96d327f83a06c6c36a804ae8f':
  Avoid sealed check when unparceling AccessibilityNodeInfo

9 years agoam 71cfc416: am afff09ae: am f0616532: Merge "Fix issues found during CTS testing...
Jason Sams [Thu, 14 May 2015 21:26:34 +0000 (21:26 +0000)]
am 71cfc416: am afff09ae: am f0616532: Merge "Fix issues found during CTS testing of FP16" into mnc-dev

* commit '71cfc4163e41d15327a3c4ff46f481a95a36d8df':
  Fix issues found during CTS testing of FP16

9 years agoam 5b1519fc: am b6291689: am fed0196b: Merge "Lock top task if whitelisting arrives...
Craig Mautner [Thu, 14 May 2015 21:26:24 +0000 (21:26 +0000)]
am 5b1519fc: am b6291689: am fed0196b: Merge "Lock top task if whitelisting arrives after start." into mnc-dev

* commit '5b1519fc5804b8ff7c903367975da5e023693dca':
  Lock top task if whitelisting arrives after start.