192328 Commits

Author SHA1 Message Date
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
Zach Johnson
cdaaa91f7c Create unified BIND_CARRIER_SERVICES permission
Replace BIND_CARRIER_MESSAGING_SERVICE and
BIND_CARRIER_CONFIG_SERVICE since we don't really
need one permission for each carrier service type.

Deprecate BIND_CARRIER_MESSAGING_SERVICE since it
already shipped, but remove BIND_CARRIER_CONFIG_SERVICE
since it hasn't.

b/21165906

Change-Id: I716f3f1c98a228afcfee84cf4a48911f0736ce8c
2015-05-14 15:10:39 -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
Chong Zhang
7fc802bbf7 Merge "MediaDataSource: address API council comments" into mnc-dev 2015-05-14 21:29:52 +00:00
Alan Viverette
b12172ef47 Update button visibility as a final step in DayPickerView construction
Previously it was only updated when the page was turned, but that listener
isn't called until the user turns the page.

Bug: 20701637
Change-Id: I06faf59660cda0e19d57766f4afd141e4a389b18
2015-05-14 14:24:36 -07:00
Chong Zhang
bc10185fa1 MediaDataSource: address API council comments
- throw IOExecption on fatal errors

- add offset argument to readAt

- and fix a crash in MediaExtractor

bug: 21045118
bug: 21163225
Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
2015-05-14 14:19:01 -07:00
Lajos Molnar
51bf5d9c07 Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev 2015-05-14 21:17:31 +00:00
Lajos Molnar
af0479446b Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev 2015-05-14 21:17:30 +00:00
George Mount
5aec62eae1 Remove hidden/deleted APIs.
Change-Id: Iabeaac2c9b485f1f25fb2fcc3193610b0d6478c4
2015-05-14 14:12:16 -07:00
Joe LaPenna
08bea4c90d am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '627f26817f752e0e1beb4185e778edc4501b4aa6':
  Wait for KEY_SLEEP UP event before calling goToSleep()
2015-05-14 21:07:54 +00:00
Xiaohui Chen
55a302402b Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev 2015-05-14 21:05:36 +00:00
Joe LaPenna
627f26817f Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev 2015-05-14 20:55:19 +00:00
Chien-Yu Chen
3b7bc569e6 Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 2015-05-14 20:46:38 +00:00
Mikhail Naganov
9355966878 Merge "Tiny fix after updating the error reporting API" into mnc-dev 2015-05-14 20:43:05 +00:00
Joseph Wen
de355db3ec Merge "Change the location of Brandmaster statement file." into mnc-dev 2015-05-14 20:31:07 +00:00
Mikhail Naganov
6162eafe7a Tiny fix after updating the error reporting API
Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.

Bug: 20064008, 21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582
2015-05-14 13:30:13 -07:00
Alan Viverette
f93d16bc70 Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev 2015-05-14 20:20:48 +00:00
Jason Sams
f061653202 Merge "Fix issues found during CTS testing of FP16" into mnc-dev 2015-05-14 20:15:40 +00:00
Joseph Wen
d28bb6e3ac Change the location of Brandmaster statement file.
Change the location of statement file for web asset
from /.well-known/associations.json to /.well-known/statements.json.

BUG=21153250

Change-Id: Ie8538b852d62c54254c895e0abadc7f502ea2181
2015-05-14 16:11:10 -04:00
Craig Mautner
fed0196b95 Merge "Lock top task if whitelisting arrives after start." into mnc-dev 2015-05-14 20:03:05 +00:00
Christopher Tate
56341e70a2 Clarify docs for BackupTransport.initializeDevice()
Explicitly call out that even if the backend is in an undefined state
(such as no authenticated account, so there is by definition no work
that can be done here), the transport should return TRANSPORT_OK in
response to initializeDevice().  Error returns from that method must
only be used to indicate that the initialize should be *retried*.

Bug 21136957

Change-Id: I41ad115b92c16092b4d931d9c554a44b77945359
2015-05-14 12:54:24 -07:00
Craig Mautner
e0570201f5 Lock top task if whitelisting arrives after start.
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.

When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.

Also more locktask debugging.

Fixes bug 21031298.

Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
2015-05-14 12:54:23 -07:00
Wale Ogunwale
92847c9687 Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev 2015-05-14 19:29:35 +00:00
Alan Viverette
c921f27694 Avoid sealed check when unparceling AccessibilityNodeInfo
Previously the unparceling code relied on addAction(), which would
incorrectly crash if the node was sealed.

Bug: 21135077
Change-Id: I773ac27b2dee501ffea0a0587536a192af402c32
2015-05-14 12:26:49 -07:00
Wale Ogunwale
159c3d8a8b Revert "Update IME focus when the active view is losing the focus."
This reverts commit 97c381304207013fd95c7806df4dcca0c69006c0.

This causes issue with the right IME window getting focus.

Bug: 21144633
Change-Id: I4c75b6e7dd87c10f008444d2059164b52a8f4335
2015-05-14 12:25:24 -07:00
Lajos Molnar
05a822161f media: change final fields to accessors in MediaTimestamp
Bug: 20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
2015-05-14 12:17:40 -07:00
Lajos Molnar
dbc908fba8 media: remove setPlaybackRate from MediaPlayer and MediSync
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.

Bug: 21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
2015-05-14 12:16:44 -07:00
Yorke Lee
0125d76fa3 Merge "Make Conferenceable an abstract class" into mnc-dev 2015-05-14 17:32:45 +00:00