OSDN Git Service
Adrian Roos [Fri, 3 Jun 2016 15:53:09 +0000 (15:53 +0000)]
Merge "Fix BigText transitions" into nyc-dev
am:
2ab4f451dc
* commit '
2ab4f451dc79c18089fa0bdbba7cdccf5c3c9d47':
Fix BigText transitions
Change-Id: Ia211d3d625f2e28e7b756aadaab7b5594bbdb005
TreeHugger Robot [Fri, 3 Jun 2016 15:36:10 +0000 (15:36 +0000)]
Merge "Fix BigText transitions" into nyc-dev
Julia Reynolds [Fri, 3 Jun 2016 13:33:11 +0000 (13:33 +0000)]
Don\'t leak guts.
am:
cdf98e1964
* commit '
cdf98e1964489916c68e240bd92c2e0bedab3c2d':
Don't leak guts.
Change-Id: I4396a379812941015e8a8cdf4e9426f8503bce70
Julia Reynolds [Thu, 2 Jun 2016 20:04:56 +0000 (16:04 -0400)]
Don't leak guts.
Change-Id: I7a9080ce4d360ed67b884eb9cbd8597496388389
Fixes:
29064258
Tony Mak [Fri, 3 Jun 2016 10:43:37 +0000 (10:43 +0000)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am:
33d03a9e43
* commit '
33d03a9e435eb474e3bdd3e958943e0057866477':
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
Tony Mak [Thu, 2 Jun 2016 14:01:16 +0000 (15:01 +0100)]
OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.
Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.
Bug:
29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
Eric Schmidt [Fri, 3 Jun 2016 03:06:49 +0000 (03:06 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8 am:
76297d719d
am:
9ad88ce3fe
* commit '
9ad88ce3fe653ddd6cc52c82b15ed7285de08ac6':
docs: Fixed background optmizations code snippet
Change-Id: Ib5aeb12e19841f86c8d625d4ea2b1a3f0df4e766
Eric Schmidt [Fri, 3 Jun 2016 02:59:57 +0000 (02:59 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs am:
0b8eb8c1e8
am:
76297d719d
* commit '
76297d719d5bbe2dcce65c357591c22b1a1d3293':
docs: Fixed background optmizations code snippet
Change-Id: I66a1141d843dedb78b3abbbfa7820367779087b9
Eric Schmidt [Fri, 3 Jun 2016 02:52:51 +0000 (02:52 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
am:
0b8eb8c1e8
* commit '
0b8eb8c1e833d3f16aaf6e44f256c23537ae0500':
docs: Fixed background optmizations code snippet
Change-Id: I5fd02424afc2f99c7bd63f47e3cece88356546a1
Eric Schmidt [Fri, 3 Jun 2016 02:41:45 +0000 (02:41 +0000)]
Merge "docs: Fixed background optmizations code snippet" into mnc-io-docs
Andrii Kulian [Fri, 3 Jun 2016 02:07:11 +0000 (02:07 +0000)]
Merge "Fix task selection logic" into nyc-dev
am:
265bd89c3c
* commit '
265bd89c3cb6f99d38d2f126a88c12fc6502431c':
Fix task selection logic
Change-Id: If3b8b7d80885b7e5573b03f83f2cb31cfc0e6670
Andrii Kulian [Fri, 3 Jun 2016 01:37:50 +0000 (01:37 +0000)]
Merge "Fix task selection logic" into nyc-dev
Pavlin Radoslavov [Fri, 3 Jun 2016 01:00:34 +0000 (01:00 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
am:
0bc61eb176
* commit '
0bc61eb176644e243b0e131a29a5f66a4303d9b0':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: I8953c12b4df0a60bd3649a055a4dbe03c93534e5
Pankaj Kanwar [Fri, 3 Jun 2016 00:55:48 +0000 (00:55 +0000)]
Merge "Delay handleEnable() until Bluetooth state is OFF" into nyc-dev
Sanket Padawe [Thu, 2 Jun 2016 23:15:57 +0000 (23:15 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
am:
b68601d247
* commit '
b68601d247ef557fd3fd7e1cf6dcbe35030d1532':
Add carrier config variables for overriding carrier name from carrierconf.
Change-Id: I3a83554dd14fe424706ec14853480f52569ff431
Sanket Padawe [Thu, 2 Jun 2016 23:11:21 +0000 (23:11 +0000)]
Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev
Svetoslav Ganov [Thu, 2 Jun 2016 22:43:41 +0000 (22:43 +0000)]
Merge "Properly set default voice interactor" into nyc-dev
am:
e34bb5a1ff
* commit '
e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
Properly set default voice interactor
Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
Philip P. Moltmann [Thu, 2 Jun 2016 22:37:22 +0000 (22:37 +0000)]
Merge "Do not rotate PDFPrinter pages." into nyc-dev
am:
5d6a4f582e
* commit '
5d6a4f582e0e1d6e8aee88fc16b3a7f4850dbd56':
Do not rotate PDFPrinter pages.
Change-Id: I1f24415c1f7245f5bee5fb24f7d642c0e22a3bdd
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: I8cb3702db22d24de2aa64360e8e22577f320d00d
Billy Lamberta [Thu, 2 Jun 2016 22:10:08 +0000 (22:10 +0000)]
docs: work minisite post-launch fixes am:
9fec73a47c am:
84903c24ed
am:
a092b6cdb9
* commit '
a092b6cdb94e0dfb73927a399d6aa5b07bb85560':
docs: work minisite post-launch fixes
Change-Id: I39f4ea830be553013e8c9ce7989581b31fcbd994
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
Pavlin Radoslavov [Thu, 2 Jun 2016 05:25:18 +0000 (22:25 -0700)]
Delay handleEnable() until Bluetooth state is OFF
During shutdown of the Bluetooth stack, if a request to
enable Bluetooth is received, the request is processed immediately.
As a result, we don't let the Bluetooth service to shutdown cleanly,
and the Bluetooth process with the native backend doesn't go away.
This creates various issues in the native backend stack.
Now, after an enable request is received, if necessary we delay
acting on it, until the Bluetooth state is OFF.
Bug:
17723234
Change-Id: I55db4bbd4f45227aa49eae996dcc328f76557a9b
Andrii Kulian [Thu, 2 Jun 2016 20:18:01 +0000 (13:18 -0700)]
Fix task selection logic
When task was selected for activity launched with flag FLAG_ACTIVITY_NEW_TASK
first matching task was omitted if there was another match lower in stack.
This lead to task shuffling in same stack.
Bug:
28848683
Change-Id: I94e55693fc7ed926fc151ba988d257bd2417dd45
Philip P. Moltmann [Thu, 2 Jun 2016 21:25:33 +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: I255f9f21bdcc97b2a53fddd276ae71233b8d3193
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:34 +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: I7d8702f3761ed71b1c06f1eedaa5740cfc2e799e
Chong Zhang [Thu, 2 Jun 2016 21:06:00 +0000 (21:06 +0000)]
Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
am:
b1e24209f1
* commit '
b1e24209f16621fd095dacb615364bfd15dfe721':
Fix scroll amount calculation in ViewRootImpl
Change-Id: Idb326fa8e459aaf3a97d841c91b3ccefc48dad81
TreeHugger Robot [Thu, 2 Jun 2016 21:05:55 +0000 (21:05 +0000)]
Merge "Fix memory leak via ZenModeController callbacks." into nyc-dev
Chong Zhang [Thu, 2 Jun 2016 20:58:05 +0000 (20:58 +0000)]
Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
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
Christopher Tate [Thu, 2 Jun 2016 20:49:27 +0000 (20:49 +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: Ia04215f6597dc3221bda438feb4921d53c1725fc
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
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
Adrian Roos [Thu, 2 Jun 2016 20:15:09 +0000 (13:15 -0700)]
Fix BigText transitions
Fixes a bug where BigText would never transition
between the expanded and collapsed version because
padding was wrongly taken into account when checking
the view height.
Change-Id: I4df242b4133dacdff77b78cc2d4ff3954b75b8a7
Fixes:
29042222
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:09 +0000 (19:45 +0000)]
Merge "Also update setMinLines" into nyc-dev
am:
79c0b2bcbb
* commit '
79c0b2bcbbf2677de9a05c4baaa07c6796ea1583':
Also update setMinLines
Change-Id: I34792f349b421e20849ad1db2a28d2751c994189
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:31:11 +0000 (19:31 +0000)]
Merge "Fix leak on density change." into nyc-dev
am:
a31ac7ddfb
* commit '
a31ac7ddfbccdb602aebb05686fcdb582ba74752':
Fix leak on density change.
Change-Id: I8c474e29100543668a2348baca5f34b868cf8893
Julia Reynolds [Thu, 2 Jun 2016 19:30:52 +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: Ib6c339aa3d00639fcad3bc15791787a52010a84f
Julia Reynolds [Thu, 2 Jun 2016 19:29:16 +0000 (15:29 -0400)]
Fix memory leak via ZenModeController callbacks.
Bug:
29064258
Change-Id: Ie817ec50206ce23561775fc0ac178754b946f030
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
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
Dianne Hackborn [Thu, 2 Jun 2016 18:49:29 +0000 (18:49 +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: Ic0c08c2ab1c0e7b1cc195928492ab4c0eaef782f
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
David Brazdil [Thu, 2 Jun 2016 16:21:27 +0000 (16:21 +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: Icdba2e72de1dbc284780df7f59cbdc56ff061ba1
David Brazdil [Thu, 2 Jun 2016 16:16:25 +0000 (16:16 +0000)]
Merge "Do not update packages in encrypted state" into nyc-dev
Mady Mellor [Thu, 2 Jun 2016 16:14:53 +0000 (16:14 +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: I581aed7e42200d5b78a5e7ac396c76eed883450c
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
Zoltan Szatmary-Ban [Thu, 2 Jun 2016 16:02:56 +0000 (16:02 +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: Ifb8b333ff367cbcd24333e3b46aa060060b384ed
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
Selim Cinek [Thu, 2 Jun 2016 15:47:45 +0000 (15:47 +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: I6deb8c3a706c69bebeb29f46aab10c32f8f705af
Selim Cinek [Thu, 2 Jun 2016 15:47:41 +0000 (15:47 +0000)]
Merge "Fixed a crash with notification groups" into nyc-dev
am:
c152dacc37
* commit '
c152dacc37bd850b06a37e18fba77308e8c9f939':
Fixed a crash with notification groups
Change-Id: I6b76008e357e6459abc2775f992d95bd6a706e68
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
Chris Wren [Thu, 2 Jun 2016 15:13:43 +0000 (15:13 +0000)]
Merge "make the notification enqueue rate threshold a setting" into nyc-dev
am:
43c3a7e5a7
* commit '
43c3a7e5a781640b862cf6f51805b3823f46fd02':
make the notification enqueue rate threshold a setting
Change-Id: I3e8c37aead7e1f2d5dc9fc89b72f82294bd16cfe
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
Ricky Wai [Thu, 2 Jun 2016 15:08:03 +0000 (15:08 +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: I5933bba5ef093cb9593673d708030de275797539
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
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
Shubham Ajmera [Thu, 2 Jun 2016 12:29:40 +0000 (13:29 +0100)]
Track lilbcore change
3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
Bug:
27331465
(cherry-picked from commit
0652d1c024818901cbbd58000910871b1ab5ebae)
Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b
Shubham Ajmera [Thu, 2 Jun 2016 10:55:04 +0000 (10:55 +0000)]
Shubham Ajmera [Thu, 2 Jun 2016 10:45:45 +0000 (10:45 +0000)]
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
Shubham Ajmera [Thu, 2 Jun 2016 10:35:40 +0000 (10:35 +0000)]
Calin Juravle [Thu, 2 Jun 2016 10:18:13 +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: I1b8f9e4dc894d50041d06e195753116593326af0
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
Lajos Molnar [Thu, 2 Jun 2016 03:57:49 +0000 (03:57 +0000)]
media: fix issues with video profile levels
am:
2fc9c6925a
* commit '
2fc9c6925a51b18452e8080d5ac2d50babd0c866':
media: fix issues with video profile levels
Change-Id: Id691f951f7b27aded9d2e9d996cd01ebc172d7cf
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:06 +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: Ica6dcf88c3fea43f07352f460343d97599280cdc
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:40:35 +0000 (00:40 +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: I2569b9c4a049698e1885d829f36fef15db22269c
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
Jae Seo [Thu, 2 Jun 2016 00:10:39 +0000 (00:10 +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: I85a8f3e89feb7953100b9a56cf4306aef78cd530
Jae Seo [Thu, 2 Jun 2016 00:10:33 +0000 (00:10 +0000)]
Merge "Fix documentation for channel types" into nyc-dev
am:
cf7b33426e
* commit '
cf7b33426e6db0abab94895c3c89c76869f0a8c6':
Fix documentation for channel types
Change-Id: I4d70f850761d639d4f9ceeff1fe3d33483267415
Philip P. Moltmann [Thu, 2 Jun 2016 00:10:26 +0000 (00:10 +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: I0aadae2eac2b0bbf81658525aeda70ca2512337c
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:12 +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: I3cd969d6e686714cd7d9fa49eec70e9d810df36b
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:27:00 +0000 (23:27 +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: I50f93b3e867140199f1de253f283c220c1df211e
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
sreevanis [Wed, 1 Jun 2016 23:04:35 +0000 (23:04 +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: Iedcb96181b7a4e6a7b6ac94eb73bcb466ae19139
David Sehr [Wed, 1 Jun 2016 23:04:25 +0000 (23:04 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev
am:
7c5bcfc21a
* commit '
7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
Installer connection support for dump_profiles
Change-Id: I4085587ad80b04bc99efbe51c4480f193186a872
Jeff Sharkey [Wed, 1 Jun 2016 23:04:09 +0000 (23:04 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev
am:
380f3b12a4
* commit '
380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
Release AssetManagers when ejecting storage.
Change-Id: I92c0fcbe38dd242cb8a0a3792381de81a7c0384c
Chia-I Wu [Wed, 1 Jun 2016 23:04:00 +0000 (23:04 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev
am:
2957d9d604
* commit '
2957d9d604a1d6cda9be33ba75ba1ad7d7185a22':
Fix clipRect transform rounding errors
Change-Id: I723039f1930ac2289e4015322e744cdf937dbea2
Alex Klyubin [Wed, 1 Jun 2016 23:03:51 +0000 (23:03 +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: I5f93eac591446733fe7188e149ad5c4d970a1ba3
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