Commit Graph

246267 Commits

Author SHA1 Message Date
Selim Cinek
5432938bf6 Merge "Fixed a crash with notification groups" into nyc-dev
am: c152dacc37

* commit 'c152dacc37bd850b06a37e18fba77308e8c9f939':
  Fixed a crash with notification groups

Change-Id: I6f36c1dae68de0e4741ee74910696869c21b86ec
2016-06-02 16:41:00 +00:00
Chris Wren
d958f83a01 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
2016-06-02 12:15:35 -04:00
TreeHugger Robot
c152dacc37 Merge "Fixed a crash with notification groups" into nyc-dev 2016-06-02 15:41:10 +00:00
TreeHugger Robot
43c3a7e5a7 Merge "make the notification enqueue rate threshold a setting" into nyc-dev 2016-06-02 15:08:03 +00:00
Chris Wren
763a9bb095 make the notification enqueue rate threshold a setting
Bug: 28693065
Change-Id: I08bd2ed342d5347c0075183b239558c50ada4a0a
2016-06-02 15:07:20 +00:00
Ricky Wai
0a4127c583 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
2016-06-02 15:06:18 +00:00
Clara Bayarri
9fe1077b05 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 3ac0ae076e)
2016-06-02 15:04:02 +00:00
Ricky Wai
390a0ca025 Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev 2016-06-02 14:56:51 +00:00
Ricky Wai
b96c1eacaf 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
2016-06-02 11:42:16 +01:00
Android Build Merger (Role)
2fd085bb4f Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037" into nyc-mr1-dev 2016-06-02 10:28:56 +00:00
Mudumba Ananth
0d98ebf997 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
2016-06-02 10:21:55 +00:00
Calin Juravle
ae9f5b6559 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
2016-06-02 10:18:06 +00:00
Calin Juravle
e67a29a037 Merge "Don't create or check permissions on profiles during app startup" into nyc-dev 2016-06-02 10:10:36 +00:00
Lajos Molnar
9e56ec51b0 media: fix issues with video profile levels
am: 2fc9c6925a

* commit '2fc9c6925a51b18452e8080d5ac2d50babd0c866':
  media: fix issues with video profile levels

Change-Id: I2b1307b5b7cf3128d4cc17b810f61c7f8e2847c3
2016-06-02 03:57:47 +00:00
Lajos Molnar
2fc9c6925a 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
2016-06-01 19:08:34 -07:00
sergeyv
f1eb9c63ee 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
2016-06-02 01:44:16 +00:00
Sergei Vasilinetc
e4e240f13f Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev 2016-06-02 01:36:35 +00:00
Philip P. Moltmann
f6070c15f3 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
2016-06-02 00:35:22 +00:00
Philip P. Moltmann
80354c4dfe Merge "Handle the uncommon case that a name is null" into nyc-dev 2016-06-02 00:28:52 +00:00
Jae Seo
08e5d0596e 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
2016-06-02 00:11:39 +00:00
Jae Seo
5bb08ad9e0 Merge "Fix documentation for channel types" into nyc-dev
am: cf7b33426e

* commit 'cf7b33426e6db0abab94895c3c89c76869f0a8c6':
  Fix documentation for channel types

Change-Id: I51bf4118a43999a599dadcee0b8129a8a1ead92f
2016-06-02 00:11:32 +00:00
Philip P. Moltmann
75300f64e7 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
2016-06-02 00:05:44 +00:00
Jae Seo
bd2b9e0d53 Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev 2016-06-02 00:04:17 +00:00
Jae Seo
cf7b33426e Merge "Fix documentation for channel types" into nyc-dev 2016-06-02 00:03:53 +00:00
Philip P. Moltmann
ddf5c44567 Merge "Use text input to deal with fullscreen IME" into nyc-dev 2016-06-01 23:57:20 +00:00
sergeyv
ab3f8c2e32 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
2016-06-01 23:55:32 +00:00
Lajos Molnar
3d41fc67c0 Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev
am: 9061b26f1e

* commit '9061b26f1ecba936f6f912398a9238c21dfa789c':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I04a42c8f40c8802eeba3ca9e2acc9ef87d4be403
2016-06-01 23:44:11 +00:00
TreeHugger Robot
9061b26f1e Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 2016-06-01 23:29:49 +00:00
Jeff Sharkey
67d9f72659 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
2016-06-01 23:28:06 +00:00
TreeHugger Robot
9bdf289f0a Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev 2016-06-01 23:15:20 +00:00
Annie Chin
a48f9cb72f Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev 2016-06-01 23:14:06 +00:00
sreevanis
4137a97b30 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
2016-06-01 23:03:58 +00:00
David Sehr
2855609944 Merge "Installer connection support for dump_profiles" into nyc-dev
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
2016-06-01 23:03:50 +00:00
Jeff Sharkey
f02954ccd5 Merge "Release AssetManagers when ejecting storage." into nyc-dev
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I54282cfcf53279f87e66cc1263ae9663fe94bc04
2016-06-01 23:03:38 +00:00
Sreevani Sreejith
82c9562d3c 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
2016-06-01 22:54:06 +00:00
sreevanis
441209abc7 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
2016-06-01 22:46:44 +00:00
Makoto Onuki
60585d12e7 Merge "ShortcutManager: API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
Chia-I Wu
aa53fde78e Merge "Fix clipRect transform rounding errors" into nyc-dev
am: 2957d9d604

* commit '2957d9d604a1d6cda9be33ba75ba1ad7d7185a22':
  Fix clipRect transform rounding errors

Change-Id: I61a04e944d607f2271f5184de7504ed04867ef7f
2016-06-01 22:31:01 +00:00
Alex Klyubin
5a347de60f 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
2016-06-01 22:29:49 +00:00
David Sehr
7c5bcfc21a Merge "Installer connection support for dump_profiles" into nyc-dev 2016-06-01 22:16:05 +00:00
TreeHugger Robot
380f3b12a4 Merge "Release AssetManagers when ejecting storage." into nyc-dev 2016-06-01 22:14:57 +00:00
Chia-I Wu
2957d9d604 Merge "Fix clipRect transform rounding errors" into nyc-dev 2016-06-01 22:11:39 +00:00
Philip P. Moltmann
9f87935b2e Use text input to deal with fullscreen IME
The full screen "number" keyboard strips all non-numeric letters
out of the text field.

Bug: 29004437
Change-Id: Ic7e79106a7fcf0716a28061592221557b9d62f52
2016-06-01 22:08:13 +00:00
Sreevani Sreejith
2d6015b18b Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs 2016-06-01 21:58:22 +00:00
Alex Klyubin
7fe19060cf Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev 2016-06-01 21:55:05 +00:00
Jeff Sharkey
34618b5869 Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.
When FLAG_WILL_BE_FOREGROUND is set on a job (such as a download), we
need to treat the job as if it had a foreground service running so
it can continue making forward progress.  We already ignore the device
idle state when offering to start the job, so this just avoids the
hiccup of stopping the job only to restart it a minute later.

Bug: 26571724
Change-Id: I348903dd3a7dd7104b0c1bf4310e2a48655d2588
2016-06-01 15:51:50 -06:00
Ta-wei Yen
912e2b2c80 Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev 2016-06-01 21:49:47 +00:00
sreevanis
c92db9eeef docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Bug:29071043
Change-Id: Iac88710234277210997150e2a6725322928276c3
2016-06-01 14:48:41 -07:00
Jeff Sharkey
98bf12f999 Release AssetManagers when ejecting storage.
When ejecting a storage device, the system process needs to rapidly
release any open FDs to prevent itself from being killed by vold.

This change examines all ResourceImpls cached inside the system
process and evicts any that reference the storage device being
ejected.  (ResourcesManager will gladly recreate any evicted entries
when asked again in the future.)

Also replace broken use of WeakHashMap, since we want the values to
be weak references, not the keys.

Bug: 28867548
Change-Id: Ib9cfc66497149b6d3f8d49213e9779408a331d2a
2016-06-01 14:52:27 -06:00
Julia Reynolds
f2f7bc0454 Merge "Only call finish on operations that have started." into nyc-dev
am: 6df8a9a89f

* commit '6df8a9a89fc87649595926592bf895768c861b68':
  Only call finish on operations that have started.

Change-Id: I59f9c9a74cf2beba8f14906820b65ae8d22ed8ce
2016-06-01 20:46:09 +00:00