OSDN Git Service
TreeHugger Robot [Fri, 3 Jun 2016 00:18:16 +0000 (00:18 +0000)]
Merge "Adding an idle timeout to restart demo session" into nyc-mr1-dev
Svetoslav Ganov [Thu, 2 Jun 2016 22:47:26 +0000 (22:47 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
am:
e34bb5a1ff
* commit '
e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
Properly set default voice interactor
Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
Makoto Onuki [Thu, 2 Jun 2016 22:42:02 +0000 (22:42 +0000)]
Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev
Philip P. Moltmann [Thu, 2 Jun 2016 22:41:15 +0000 (22:41 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
am:
5d6a4f582e
* commit '
5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
Do not rotate PDFPrinter pages.
Change-Id: Ib428e9af14a8271545862189649780975053de86
Suprabh Shukla [Thu, 2 Jun 2016 07:31:41 +0000 (00:31 -0700)]
Adding an idle timeout to restart demo session
Tracking user activity from RetailModeManagerService to start and switch
to a new demo user when there has been no activity for a long time and
the demo video player has been disabled.
Bug:
27280140
Change-Id: Iebf37b5d04a659e4bfda0e4016111c7b9e5f4eb9
Svetoslav Ganov [Thu, 2 Jun 2016 22:36:04 +0000 (22:36 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 22:30:22 +0000 (22:30 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
Svetoslav Ganov [Thu, 2 Jun 2016 22:25:12 +0000 (15:25 -0700)]
Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.
bug:
28963642
Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
Jorim Jaggi [Thu, 2 Jun 2016 22:19:12 +0000 (22:19 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
am:
6321f42fbe
* commit '
6321f42fbee425745de9636d45e4973fa6c470b9':
Fix unminimizing dock stack for AppTask.moveToFront
Change-Id: I82b844611cb1761a681f91e2e26b25308202c6da
Annie Chin [Thu, 2 Jun 2016 22:10:00 +0000 (22:10 +0000)]
Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev
Billy Lamberta [Thu, 2 Jun 2016 22:09:27 +0000 (22:09 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c am:
84903c24ed
am:
a092b6cdb9
* commit '
a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
docs: work minisite post-launch fixes
Change-Id: If59f08e5eca51e6c21a53b01854b3e0dd6fac2a6
TreeHugger Robot [Thu, 2 Jun 2016 22:08:14 +0000 (22:08 +0000)]
Merge "Fix unminimizing dock stack for AppTask.moveToFront" into nyc-dev
Billy Lamberta [Thu, 2 Jun 2016 22:04:13 +0000 (22:04 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c
am:
84903c24ed
* commit '
84903c24ed74c75a2217648a96931cc3045143ea':
docs: work minisite post-launch fixes
Change-Id: I0477d9cb98a79a5d9b218e33877178562e53cbd5
Billy Lamberta [Thu, 2 Jun 2016 21:59:29 +0000 (21:59 +0000)]
docs: work minisite post-launch fixes
am:
9fec73a47c
* commit '
9fec73a47c158df0a184a1f2a0301b6394cfec40':
docs: work minisite post-launch fixes
Change-Id: I19be178cec83668e19e768af08eae0ae5fd5deda
Philip P. Moltmann [Thu, 2 Jun 2016 21:25:22 +0000 (21:25 +0000)]
Merge "Move Xerox recommendation plugin to service." into nyc-dev
am:
e509dcb43f
* commit '
e509dcb43fdbd949b18622a1dee7b9d7373dbabf':
Move Xerox recommendation plugin to service.
Change-Id: I8bde4ef5c7aff566a7797ac95429a34656512048
Philip P. Moltmann [Thu, 2 Jun 2016 21:18:06 +0000 (21:18 +0000)]
Merge "Move Xerox recommendation plugin to service." into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 21:14:09 +0000 (21:14 +0000)]
Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
am:
30e434a996
* commit '
30e434a996e0053eeeeb41f6a198f3945055445b':
Fix memory leak via ZenModeController callbacks.
Change-Id: Id392b79729d9f8e560554859260845d3f0972548
Chong Zhang [Thu, 2 Jun 2016 21:05:58 +0000 (21:05 +0000)]
Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
am:
b1e24209f1
* commit '
b1e24209f16621fd095dacb615364bfd15dfe721':
Fix scroll amount calculation in ViewRootImpl
Change-Id: I538add512f7899ced2e0f940b16c8c34df5a9681
TreeHugger Robot [Thu, 2 Jun 2016 21:05:55 +0000 (21:05 +0000)]
Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
Makoto Onuki [Thu, 2 Jun 2016 18:03:51 +0000 (11:03 -0700)]
ShortcutManager: Break down unit tests
The test file is getting too big and making the IDE very slow.
Now it's split into multiple files
Change-Id: I50ed89f19defd3809f327bc21e7d9ea790dcde4e
Chong Zhang [Thu, 2 Jun 2016 20:58:05 +0000 (20:58 +0000)]
Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
Christopher Tate [Thu, 2 Jun 2016 20:55:28 +0000 (20:55 +0000)]
Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am:
453951d077
* commit '
453951d0777b1421e95bbcac501fb8b091c0f6a3':
Don't back up/restore the "automatically restore app data" setting
Change-Id: Ia950b6992e76d05bccd5773cdda04308ddb054c0
Philip P. Moltmann [Tue, 31 May 2016 23:29:25 +0000 (16:29 -0700)]
Do not rotate PDFPrinter pages.
- applyPrintAttributes is only used by PDFPrinter
Fixes:
29057330
Change-Id: I883cc64039f4ca2c93810e99d758f2dceec67a8b
Chris Tate [Thu, 2 Jun 2016 20:45:14 +0000 (20:45 +0000)]
Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev
Makoto Onuki [Thu, 2 Jun 2016 20:38:14 +0000 (20:38 +0000)]
Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev
Chong Zhang [Thu, 2 Jun 2016 19:56:54 +0000 (12:56 -0700)]
Fix scroll amount calculation in ViewRootImpl
When calculating scroll amount, we should check whehter focus
is visible using before-scrolling position.
It's possible that the view is already scrolled, then visible
insets changes (eg. IME went away). Previous scroll position
still makes the focus visible, but it will leave the focus
in a bad position when it should be scrolled back.
bug:
29025892
Change-Id: I091f16bebc4c1e5ba831616c51ab2ac75d4c4b3c
Chris Wren [Thu, 2 Jun 2016 20:28:30 +0000 (20:28 +0000)]
Merge "Give the auto-merger somthing to hang on to." into nyc-mr1-dev
Billy Lamberta [Thu, 19 May 2016 21:27:49 +0000 (14:27 -0700)]
docs: work minisite post-launch fixes
* Localization for table of contents.
* Replace occurrences of 'app restrictions' with the preferred
term 'managed configurations' (see go/afw-words). Update resource
card titles and add page redirects.
* In guide, update language for SSO with Chrome Custom Tabs.
(Cherry-picked from
1056063.)
* Add resource card for 'Your Apps at Work' video.
bug:
28378252,
27744376
Change-Id: I8bc2e87d0486159bdd6680600b783af7334c3a58
Jorim Jaggi [Thu, 2 Jun 2016 19:45:17 +0000 (19:45 +0000)]
Merge "Also update setMinLines" into nyc-dev
am:
79c0b2bcbb
* commit '
79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
Also update setMinLines
Change-Id: Iae144dc953cc9e67225ebad2b2e7be777808d1eb
Jorim Jaggi [Thu, 2 Jun 2016 19:34:56 +0000 (19:34 +0000)]
Merge "Also update setMinLines" into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:30:58 +0000 (19:30 +0000)]
Merge "Fix leak on density change." into nyc-dev
am:
a31ac7ddfb
* commit '
a31ac7ddfbccdb602aebb05686fcdb582ba74752':
Fix leak on density change.
Change-Id: I4158711144354eb7059d6b421ed35d6673b63a5b
Julia Reynolds [Thu, 2 Jun 2016 19:29:16 +0000 (15:29 -0400)]
Fix memory leak via ZenModeController callbacks.
Bug:
29064258
Change-Id: Ie817ec50206ce23561775fc0ac178754b946f030
Julia Reynolds [Thu, 2 Jun 2016 19:30:50 +0000 (19:30 +0000)]
Merge "Hide alarm condition if there\'s no alarm." into nyc-dev
am:
62716a9197
* commit '
62716a9197ba77b349d74770e6cd3b114e5f5de7':
Hide alarm condition if there's no alarm.
Change-Id: I16ff49b128224db3972335fd1f4b0aee9a06fcb8
TreeHugger Robot [Thu, 2 Jun 2016 19:24:15 +0000 (19:24 +0000)]
Merge "Fix leak on density change." into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 19:22:35 +0000 (19:22 +0000)]
Merge "Hide alarm condition if there's no alarm." into nyc-dev
Annie Chin [Thu, 2 Jun 2016 00:46:27 +0000 (17:46 -0700)]
Remove SystemUIFactory.getHomeLayoutId()
Bug:
29069470
Change-Id: I19078f293c85470caac8d372d80a7a8605842c61
Jorim Jaggi [Thu, 2 Jun 2016 01:57:54 +0000 (18:57 -0700)]
Fix unminimizing dock stack for AppTask.moveToFront
Some apps call AppTask.moveToFront instead of startActivity from
their trampoline activity. We need to handle this case also and
need to do all the post processing after starting an activity
so the docked stack gets unminimized.
Change-Id: I8400995bf1d1a4a4467d01fd55fca7e5800b4645
Fixes:
28722017
Chris Wren [Thu, 2 Jun 2016 19:11:48 +0000 (15:11 -0400)]
Give the auto-merger somthing to hang on to.
Bug:
29001173
Change-Id: Ie244f79f1569e2b32be4046d111919120ce6111e
Dianne Hackborn [Thu, 2 Jun 2016 18:50:24 +0000 (18:50 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
am:
5a6cf3ac9a
* commit '
5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
Work on issue #
29042642: Watchdog going off
Change-Id: I2a3b120648aef7401bb6d4c2460f868cdc16c1a0
TreeHugger Robot [Thu, 2 Jun 2016 18:36:08 +0000 (18:36 +0000)]
Merge "Changing user switching messages for demo mode" into nyc-mr1-dev
Dianne Hackborn [Thu, 2 Jun 2016 18:31:15 +0000 (18:31 +0000)]
Merge "Work on issue #
29042642: Watchdog going off" into nyc-dev
Julia Reynolds [Thu, 2 Jun 2016 18:04:31 +0000 (14:04 -0400)]
Hide alarm condition if there's no alarm.
Change-Id: Iba8c9eb2bd3033683c25c5cf145fc52f9ac0f0d2
Fixes:
27698976
Amith Yamasani [Thu, 2 Jun 2016 17:51:51 +0000 (17:51 +0000)]
Merge "Setup user restrictions for demo user" into nyc-mr1-dev
Makoto Onuki [Fri, 27 May 2016 20:24:28 +0000 (13:24 -0700)]
ShortcutManager: Implement max # of shortcuts
- Each activity (launcher icon) can have at most 5 dynamic +
manifest shortcuts.
Bug
28536066
Change-Id: Id34371d51c4a1c5e3df7debe3b71b535eb157b6c
David Brazdil [Thu, 2 Jun 2016 16:41:12 +0000 (16:41 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
am:
c4f1bc4032
* commit '
c4f1bc40326c10fde55f07230e3fe3067d70fbfa':
Do not update packages in encrypted state
Change-Id: I84c2c77fb8ff2cc12095f5217c6960a156f2faf3
Mady Mellor [Thu, 2 Jun 2016 16:41:09 +0000 (16:41 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
am:
09ca7e73c0
* commit '
09ca7e73c0e3384a57e4e4fc7c25fd52ca540d98':
Parent notifications should always be normal notification color
Change-Id: I81160e649188e21d4c763abd8d222fa83608322d
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:41:06 +0000 (16:41 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
am:
2002061f34
* commit '
2002061f349edfbf583b115af647f0ca34cf749e':
Only reset global restriction owner on DO->PO for the right user
Change-Id: If1782d4b767ec46b14e8c1e31245fd9f99a93bf0
Selim Cinek [Thu, 2 Jun 2016 16:41:03 +0000 (16:41 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
am:
8e2a2fa98c
* commit '
8e2a2fa98c9ca077681acf13abfb6252c3859e0f':
Fixed that volume buttons were not working on the pin input
Change-Id: If75f4fef934ab26353803dcbeeed0569f1f2d9bf
Selim Cinek [Thu, 2 Jun 2016 16:41:00 +0000 (16:41 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
am:
c152dacc37
* commit '
c152dacc37bd850b06a37e18fba77308e8c9f939':
Fixed a crash with notification groups
Change-Id: I6f36c1dae68de0e4741ee74910696869c21b86ec
David Brazdil [Thu, 2 Jun 2016 16:16:25 +0000 (16:16 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
Chris Wren [Thu, 2 Jun 2016 16:15:35 +0000 (12:15 -0400)]
resolve merge conflicts of
43c3a7e5 to nyc-mr1-dev
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
Mady Mellor [Thu, 2 Jun 2016 16:09:15 +0000 (16:09 +0000)]
Merge "Parent notifications should always be normal notification color" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:59:23 +0000 (15:59 +0000)]
Merge "Only reset global restriction owner on DO->PO for the right user" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:41:19 +0000 (15:41 +0000)]
Merge "Fixed that volume buttons were not working on the pin input" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:41:08 +0000 (15:41 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
TreeHugger Robot [Thu, 2 Jun 2016 15:08:02 +0000 (15:08 +0000)]
Merge "make the notification enqueue rate threshold a setting" into nyc-dev
Chris Wren [Tue, 31 May 2016 21:14:12 +0000 (17:14 -0400)]
make the notification enqueue rate threshold a setting
Bug:
28693065
Change-Id: I08bd2ed342d5347c0075183b239558c50ada4a0a
Ricky Wai [Thu, 2 Jun 2016 15:06:18 +0000 (15:06 +0000)]
Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev
am:
390a0ca025
* commit '
390a0ca025ce9b0849150a0c87641c33b292cc35':
Do not use cached tile specs value in QSTileHost.addTile()
Change-Id: I0363a9c64960b82b3b74a79de3e4998d0a03b550
Clara Bayarri [Wed, 1 Jun 2016 16:28:14 +0000 (17:28 +0100)]
DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice
By using a local boolean we were missing out on when the system dismisses
the window with the back key.
Bug:
28910518
Change-Id: I87b21c11830eaf81e3fd9586be6e3a7bb59c8a1f
(cherry picked from commit
3ac0ae076e4baee06804e93adb7b5573d5de67de)
Julia Reynolds [Thu, 2 Jun 2016 14:57:02 +0000 (10:57 -0400)]
Fix leak on density change.
Bug:
29064258
Change-Id: I9d579cc17fe4554a6a4aa57c409cef72bdee74bd
Ricky Wai [Thu, 2 Jun 2016 14:56:50 +0000 (14:56 +0000)]
Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev
David Brazdil [Thu, 2 Jun 2016 14:31:30 +0000 (15:31 +0100)]
Do not update packages in encrypted state
SystemServer used to run PMS.updatePackagesIfNeeded even when the
device is booting in encrypted state only with core packages
available. This is redundant because the packages are prebuilts
(OAT files always up to date) and the data partition is not mounted
yet, so we are only wasting time opening the OAT files and testing
checksums. Additionally, the attempt to update these packages gets
reported to TRON stats as time spent in the Optimizing Apps dialog
and skews the results.
This patch does not call updatePackagesIfNeeded when in the device
is in encrypted state.
Bug:
28833829
Change-Id: I8641d07a8840948ffe261dfb8f99f70de7341972
Ricky Wai [Thu, 2 Jun 2016 10:42:16 +0000 (11:42 +0100)]
Do not use cached tile specs value in QSTileHost.addTile()
As addTile() can be run multiple times before listener receives
the update, addTile() should always use the latest updated value
from settings but not from the cache value.
Bug:
28185436
Change-Id: I8c840343b797b00373a6f40cc5ea125efe68a6e1
Android Build Merger (Role) [Thu, 2 Jun 2016 10:28:55 +0000 (10:28 +0000)]
Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am:
e67a29a037" into nyc-mr1-dev
Mudumba Ananth [Mon, 29 Feb 2016 10:14:36 +0000 (02:14 -0800)]
HFP 1.7 profile update (3/4)
-> Android Framework changes to add support for
an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
of the supported HF indicators and their values (if received)
Bug:
19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
Calin Juravle [Thu, 2 Jun 2016 10:18:06 +0000 (10:18 +0000)]
Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev
am:
e67a29a037
* commit '
e67a29a037d11d242d6afba6aff5a0feb60e289b':
Don't create or check permissions on profiles during app startup
Change-Id: I43d0c4af8e20fabd3f752ce8ad97f4ad1f28dd1b
Calin Juravle [Thu, 2 Jun 2016 10:10:35 +0000 (10:10 +0000)]
Merge "Don't create or check permissions on profiles during app startup" into nyc-dev
Suprabh Shukla [Thu, 2 Jun 2016 06:19:06 +0000 (23:19 -0700)]
Changing user switching messages for demo mode
Bug:
27280140
Change-Id: I803ba8cf9dbf23b4a66cca8af57441faa2b354b6
Lajos Molnar [Thu, 2 Jun 2016 03:57:47 +0000 (03:57 +0000)]
media: fix issues with video profile levels
am:
2fc9c6925a
* commit '
2fc9c6925a51b18452e8080d5ac2d50babd0c866':
media: fix issues with video profile levels
Change-Id: I2b1307b5b7cf3128d4cc17b810f61c7f8e2847c3
Lajos Molnar [Wed, 1 Jun 2016 05:35:27 +0000 (22:35 -0700)]
media: fix issues with video profile levels
Support additional corner cases in level ordering:
- MPEG4Level1 only implies support for MPEG4Level0
- HEVC high tier levels are only supported by other high tier levels
H263 unusual level definitions:
- levels 45/50+ define minimum requirements that codecs can extend
- levels 10-45 define minimum size
- restrict to QCIF and CIF only if codecs only supports levels 10-40
(or 45 in profiles 0 and 2)
MPEG4 max width/height/frame rate:
- Only specified for MPEG4Level0/0b
- Using arbitrary 2:1 aspect ratio and 60fps for other levels
This is sure to include typical sizes for levels
Fix level limits:
- MPEG2LevelML max 25fps for D1 PAL
- H263Level20 max 30fps, but only 15fps for CIF
- H263Level45 max 15fps
- H263Level45+ min alignment is 4
- MPEG4Level0b max 15fps
- add support for VP9 HDR profiles
- fix HEVC overflow for Level62 calculations
Bug:
28671284
Change-Id: Ie75ae1d19f20d5c6eb40807d03c3b487854eb9a0
Jorim Jaggi [Thu, 2 Jun 2016 01:12:46 +0000 (18:12 -0700)]
Also update setMinLines
If we switch to single-line, the min lines property gets overriden
so we need to manually call setMinLines to reset the state to the
initial state.
Change-Id: I1b47a093981045c2c0d176c831e37f8e9431ae1c
Fixes:
29056442
sergeyv [Thu, 2 Jun 2016 01:44:16 +0000 (01:44 +0000)]
Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev
am:
e4e240f13f
* commit '
e4e240f13f6c64049ef346b27d1cf78699fa800e':
HWUI: do not call glCopyTexSubImage2D on empty area.
Change-Id: I937a56237844281af77b3018418378acc7f3eba7
Sergei Vasilinetc [Thu, 2 Jun 2016 01:36:34 +0000 (01:36 +0000)]
Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev
Dianne Hackborn [Thu, 2 Jun 2016 01:19:24 +0000 (18:19 -0700)]
Work on issue #
29042642: Watchdog going off
Have FastPrintWriter note all cases where an exception is
thrown, and stop trying to push more data into the output
stream when this happens.
Change-Id: I51a1eeb26578f02b2a6f45ef7bc2513dfde702a2
Philip P. Moltmann [Thu, 2 Jun 2016 00:35:22 +0000 (00:35 +0000)]
Merge "Handle the uncommon case that a name is null" into nyc-dev
am:
80354c4dfe
* commit '
80354c4dfeae62fc120977d4fbdb8818f505b253':
Handle the uncommon case that a name is null
Change-Id: Ia3ace5db78f7400998f51875a48c33f5208c324d
Philip P. Moltmann [Thu, 2 Jun 2016 00:28:50 +0000 (00:28 +0000)]
Merge "Handle the uncommon case that a name is null" into nyc-dev
Amith Yamasani [Tue, 31 May 2016 16:12:20 +0000 (09:12 -0700)]
Setup user restrictions for demo user
Prevent certain actions by demo user
Also eliminate immersive mode confirmation when device is
in demo mode.
Bug:
27280140
Change-Id: I6955b7bb5c1ae13e1df36cef822b6fd39cb51e46
Jae Seo [Thu, 2 Jun 2016 00:11:39 +0000 (00:11 +0000)]
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
am:
bd2b9e0d53
* commit '
bd2b9e0d53a211d0a5093b8bf24ac32e1a72ffea':
TIF: Release an existing audio patch before creating a new one
Change-Id: I7153cff902f0fc9e2c3af98e182c3ca2d5e19a50
Jae Seo [Thu, 2 Jun 2016 00:11:32 +0000 (00:11 +0000)]
Merge "Fix documentation for channel types" into nyc-dev
am:
cf7b33426e
* commit '
cf7b33426e6db0abab94895c3c89c76869f0a8c6':
Fix documentation for channel types
Change-Id: I51bf4118a43999a599dadcee0b8129a8a1ead92f
Philip P. Moltmann [Thu, 2 Jun 2016 00:05:44 +0000 (00:05 +0000)]
Merge "Use text input to deal with fullscreen IME" into nyc-dev
am:
ddf5c44567
* commit '
ddf5c445673bab848b3d9c8af4de8978daf9b56b':
Use text input to deal with fullscreen IME
Change-Id: I5fc7ddf35ce6696824558029f09f8e7cd9ac6fbd
Jae Seo [Thu, 2 Jun 2016 00:04:16 +0000 (00:04 +0000)]
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev
Jae Seo [Thu, 2 Jun 2016 00:03:52 +0000 (00:03 +0000)]
Merge "Fix documentation for channel types" into nyc-dev
Philip P. Moltmann [Wed, 1 Jun 2016 23:57:19 +0000 (23:57 +0000)]
Merge "Use text input to deal with fullscreen IME" into nyc-dev
sergeyv [Wed, 1 Jun 2016 21:53:35 +0000 (14:53 -0700)]
HWUI: do not call glCopyTexSubImage2D on empty area.
Previous check .isEmpty() is not sufficient, because getWidth() may have
value 0.5, so technically it is not empty, but when this size is passed
to texture calls it is converted to uint_32 and it becomes zero.
bug:
28941093
Change-Id: Ia7c2bf0340466d5376f235fb5da54ad2ddfa0a03
Lajos Molnar [Wed, 1 Jun 2016 23:44:11 +0000 (23:44 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
am:
9061b26f1e
* commit '
9061b26f1ecba936f6f912398a9238c21dfa789c':
media: avoid NPE in CodecCapabilities.createFromProfileLevel
Change-Id: I04a42c8f40c8802eeba3ca9e2acc9ef87d4be403
TreeHugger Robot [Wed, 1 Jun 2016 23:29:48 +0000 (23:29 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
Jeff Sharkey [Wed, 1 Jun 2016 23:28:06 +0000 (23:28 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
am:
9bdf289f0a
* commit '
9bdf289f0a1874d151684497cb3acd8f96fbd58d':
Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.
Change-Id: I70e69653da834c1ef0e8160cb75826043fffe9e6
TreeHugger Robot [Wed, 1 Jun 2016 23:15:19 +0000 (23:15 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev
Annie Chin [Wed, 1 Jun 2016 23:13:59 +0000 (23:13 +0000)]
Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev
sreevanis [Wed, 1 Jun 2016 23:03:58 +0000 (23:03 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am:
2d6015b18b am:
441209abc7
am:
82c9562d3c
* commit '
82c9562d3c35df6569fcb04e7cd999fdc11d5d99':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I5642adf704dec6f6c8522d638504da68c0a80bb0
David Sehr [Wed, 1 Jun 2016 23:03:50 +0000 (23:03 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev
am:
7c5bcfc21a
* commit '
7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
Installer connection support for dump_profiles
Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
Jeff Sharkey [Wed, 1 Jun 2016 23:03:38 +0000 (23:03 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev
am:
380f3b12a4
* commit '
380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
Release AssetManagers when ejecting storage.
Change-Id: I54282cfcf53279f87e66cc1263ae9663fe94bc04
Sreevani Sreejith [Wed, 1 Jun 2016 22:54:06 +0000 (22:54 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am:
2d6015b18b
am:
441209abc7
* commit '
441209abc78b8c6bcbcc6b1eb08d2f41219ce344':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I761a39db759030d4f07cb6e77326fc45db215677
sreevanis [Wed, 1 Jun 2016 22:46:44 +0000 (22:46 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs
am:
2d6015b18b
* commit '
2d6015b18ba0bf52ebe402503c7c66ddae23d8bd':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: I76168738a10e3f379134a88a89667a63d818323d
Makoto Onuki [Wed, 1 Jun 2016 22:44:09 +0000 (22:44 +0000)]
Merge "ShortcutManager: API rename" into nyc-mr1-dev
Chia-I Wu [Wed, 1 Jun 2016 22:31:01 +0000 (22:31 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev
am:
2957d9d604
* commit '
2957d9d604a1d6cda9be33ba75ba1ad7d7185a22':
Fix clipRect transform rounding errors
Change-Id: I61a04e944d607f2271f5184de7504ed04867ef7f
Alex Klyubin [Wed, 1 Jun 2016 22:29:49 +0000 (22:29 +0000)]
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev
am:
7fe19060cf
* commit '
7fe19060cfaf09e8756f6488c5f2d6c7bbdd92ea':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: Ieb7d6d212fe26ffa61aa6714ed8315b2c98bfe3d
David Sehr [Wed, 1 Jun 2016 22:16:03 +0000 (22:16 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev
TreeHugger Robot [Wed, 1 Jun 2016 22:14:56 +0000 (22:14 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev
Chia-I Wu [Wed, 1 Jun 2016 22:11:37 +0000 (22:11 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev