192300 Commits

Author SHA1 Message Date
Matthew Williams
af9ea2cf5e Merge "Fix bug with jobservice context giving wrong value" into mnc-dev 2015-05-15 03:51:58 +00:00
Matthew Williams
d9db9d75ef Fix bug with jobservice context giving wrong value
BUG: 20614145
Change-Id: Ibd555732e03646d6d59e6d0effa9f92ec70ca3c4
2015-05-14 20:50:54 -07:00
Lorenzo Colitti
bdc8b6d247 Merge "Statically import NetworkCapabilities constants for brevity." into mnc-dev 2015-05-15 03:37:24 +00:00
Dirk Dougherty
7414f97a04 am efd254b2: Doc change: fix urls, remove obsolete image.
* commit 'efd254b2f9246d4c259be7885ef344be745bc8bc':
  Doc change: fix urls, remove obsolete image.
2015-05-15 03:22:53 +00:00
Dirk Dougherty
3519ddfe07 am de401c82: Doc change: More changes to distribute files, Google Services page update.
* commit 'de401c82f58a9465593391fede942fe6ffd22ef1':
  Doc change: More changes to distribute files, Google Services page update.
2015-05-15 03:17:37 +00:00
Dirk Dougherty
efd254b2f9 Doc change: fix urls, remove obsolete image.
Change-Id: I61ec972b1df2c3211da6e21ee4e4ec3319d0d02b
2015-05-14 20:14:34 -07:00
Dirk Dougherty
de401c82f5 Doc change: More changes to distribute files, Google Services page update.
Change-Id: I047ff9165c5844075561b31e42f8127d8819aeb0
2015-05-14 20:05:13 -07:00
Jae Seo
0a8e06cbd3 Merge "TIF: Remove incorrect audio mode check" into mnc-dev 2015-05-15 02:44:22 +00:00
Jae Seo
ed6586a569 TIF: Remove incorrect audio mode check
Bug: 21170680
Change-Id: If50181294d7b2977d8e0735ae4d118943e0aad60
2015-05-14 19:16:30 -07:00
Christopher Tate
abcbf05c98 Merge "fullBackupContent isn't public API" into mnc-dev 2015-05-15 01:50:39 +00:00
Ruben Brunk
096c11dc37 Merge "camera2: Fix work-profile eviction handling." into mnc-dev 2015-05-15 01:45:19 +00:00
Jeff Tinker
5ffbae6492 MediaDrm API Updates per api council review
bug: 21044671

Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
2015-05-15 01:44:59 +00:00
Sailesh Nepal
8309a19181 Merge "Fix in-call UI crash on Nova devcies (framework/base)" into mnc-dev 2015-05-15 01:40:26 +00:00
Ruben Brunk
7f75da2405 camera2: Fix work-profile eviction handling.
Bug: 20124384

Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
2015-05-14 18:39:50 -07:00
Yorke Lee
d76a81f519 Merge "Fix missing break in Icon class" into mnc-dev 2015-05-15 01:39:04 +00:00
Sailesh Nepal
d9be9cfe5e Fix in-call UI crash on Nova devcies (framework/base)
If a status hint icon wasn't set we'd crash.
Fix was to set StatusHitns.mIcon to null if the icon resource ID'
was 0.

BUG: 21168985
Change-Id: I33c06169f9e184b063e6fd10f77408bc262ea3c8
2015-05-14 18:28:10 -07:00
Yorke Lee
220239e371 Fix missing break in Icon class
This causes RuntimeExceptions to fall through to the next
case statement.

Bug: 21168985
Change-Id: Ie69610b22c6caf9f6536ebd48673067880cb75a2
2015-05-14 18:24:31 -07:00
Alan Viverette
50210d9129 Adjust light source for window position
Bug: 16523629
Change-Id: I2f3fed1edcac0a3cfd5034aded45e08ececfebaf
2015-05-14 18:05:36 -07:00
Sailesh Nepal
ebb1d76e32 Merge "Fix post dial for remote connections" into mnc-dev 2015-05-15 00:55:41 +00:00
Sailesh Nepal
40451b3977 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
2015-05-14 17:39:41 -07:00
Doris Liu
4b4d475769 Merge "Start AnimationDrawable from the zeroth frame." into mnc-dev 2015-05-15 00:28:33 +00:00
Doris Liu
c7741d467b 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
2015-05-14 17:23:43 -07:00
Tor Norbye
2d49752ee0 Add bluetooth permission annotations
Change-Id: I5bc86f8ec6ea5c873f1e14dab0e0c47c5c9df7f7
2015-05-15 00:18:28 +00:00
Deepanshu Gupta
2cdf5eaad4 Merge "Fix build: udpate parser factory method" into mnc-dev 2015-05-15 00:01:52 +00:00
Deepanshu Gupta
3dc19883c5 Fix build: udpate parser factory method
Change-Id: I78ad55bc924427b44451ec32fbd1032d6cd77544
2015-05-14 17:00:50 -07:00
John Reck
0e4a2b5ff0 Merge "Check for setting to already set" into mnc-dev 2015-05-14 23:27:49 +00:00
Svet Ganov
e650fd95a9 Merge "Fix grant/revoke to act on owner by default and log invalid user id." into mnc-dev 2015-05-14 23:25:10 +00:00
Svet Ganov
4ccca50d7e Fix grant/revoke to act on owner by default and log invalid user id.
bug:21163229

Change-Id: I66d0cc130b37b5752ed06afc73259ed41bfb7830
2015-05-14 16:24:19 -07:00
Jorim Jaggi
fcb34c599f Merge "Adjust lockscreen style to spec" into mnc-dev 2015-05-14 23:15:24 +00:00
Jorim Jaggi
979936920e Fix brightness mirror positioning.
Bug: 20884993
Change-Id: Iba75c2dd7aca9b7ac446cb6a278085af4e150b95
2015-05-14 23:13:28 +00:00
John Reck
6d8371e73f Check for setting to already set
Bug: 20105644
Change-Id: Ia79d2ae5c725c139d2b7c423a899be625cb8f14f
2015-05-14 16:06:12 -07:00
Jorim Jaggi
e5716222a1 Adjust lockscreen style to spec
Bug: 21111048
Change-Id: Ibdecaf01224ef45a53b4981d8b79d27034a3df45
2015-05-14 16:04:15 -07:00
Deepanshu Gupta
af4d3d2d14 Merge "Don't keep LayoutlibCallback reference." into mnc-dev 2015-05-14 22:57:05 +00:00
Jinsuk Kim
f2fb0e73f1 Merge "CEC: Remove obsolete TODOs" into mnc-dev 2015-05-14 22:47:06 +00:00
Deepanshu Gupta
f2d408b51d 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
2015-05-14 15:37:29 -07:00
Zhijun He
527d522f34 Camera2: get ride of sceneModeOverrides in API doc
sceneModeOverrides isn't public API.

Bug: 20152738
Change-Id: I4024b152c47c1d0184971539c99a2f1cc1b1c1a0
2015-05-14 15:36:04 -07:00
Miao Wang
39a0b22cf8 Merge "[RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib." into mnc-dev 2015-05-14 22:22:07 +00:00
Jorim Jaggi
3e02adb028 Fix closing state
Bug: 20940663
Change-Id: I34e2bf4fb3ba9f9ad15e634c4a09883f57b446b2
2015-05-14 22:21:45 +00:00
Deepanshu Gupta
a8545890ac Merge "Move couple of intellij libraries to project level." into mnc-dev 2015-05-14 22:18:33 +00:00
Christopher Tate
474bb82fd5 Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev 2015-05-14 22:16:33 +00:00
Deepanshu Gupta
fc41c2c02e 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
2015-05-14 15:12:57 -07:00
Yin-Chia Yeh
a0807a65e9 Merge "Camera: tonemap linkify update" into mnc-dev 2015-05-14 22:12:43 +00:00
Miao Wang
f9d518a2af [RenderScript] Add dummy getMinorID to maintain compatible with old RS
compat lib.

bug: 21132592
Change-Id: I375f188dfbd33367a9589533aa51b182fda8bc21
2015-05-14 15:11:52 -07:00
Christopher Tate
98fa656f16 fullBackupContent isn't public API
Bug 21090205

Change-Id: I1b468f1e7bf86455576760e4a1d1ea9657074a9e
2015-05-14 15:01:45 -07:00
Paul McLean
f62c7428e7 Change AudioDevicesInfo.getFormats() to getEncodings().
Change-Id: Id5115853744cd945bee5fee2601d9febc953208f
2015-05-14 14:57:08 -07:00
Zhijun He
758e6a8f70 Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev 2015-05-14 21:46:38 +00:00
Zhijun He
492afe9014 Merge "Image/Reader/Writer: address API review comments" into mnc-dev 2015-05-14 21:44:01 +00:00
Jinsuk Kim
4d5648b9c5 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
2015-05-15 06:43:06 +09:00
Zhijun He
d99dc329b9 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
2015-05-14 14:35:57 -07:00
Joe LaPenna
21de2f629d 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()
2015-05-14 21:34:16 +00:00