Commit Graph

266162 Commits

Author SHA1 Message Date
Philip P. Moltmann
c859cd068b Fix up issues in PdfRenderer found by test.
Change-Id: I56e403fd425e4b4353383c43077de5c47ff22b5c
2016-06-07 17:04:25 -07:00
Ricky Wai
b8e44517a8 Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am: 390a0ca025 am: 0a4127c583
am: 9b14b62f5d

* commit '9b14b62f5dd01498198bab2c76532cca3e1ef1ed':

Change-Id: I0db37c1778e0efac3de7ca36abb8cc2fb6c493d4
2016-06-02 15:25:38 +00:00
Ricky Wai
64d66427bb Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am: 390a0ca025 am: 140fe982df
am: 4886275b94

* commit '4886275b948660f3b3cb7bfa8bdbd57b6eb80cf5':
  Do not use cached tile specs value in QSTileHost.addTile()

Change-Id: Ifa36b6e5f7fa11a3b17db4f722d7fabe8af058f7
2016-06-02 15:20:37 +00:00
Clara Bayarri
7560e32a3f DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice am: 9fe1077b05
am: 43ee92589a  -s ours

* commit '43ee92589a130577ddee01a5d674cde237b9b1e9':
  DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice

Change-Id: Id6d22862adab1dde272b6bd07931079495f7e994
2016-06-02 15:20:33 +00:00
Ricky Wai
9b14b62f5d Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am: 390a0ca025
am: 0a4127c583

* commit '0a4127c58359a374b7dae6846527f8b61e7ace9b':

Change-Id: I49f9bebb59312b852520ac247f8843e1b14363bf
2016-06-02 15:18:55 +00:00
Ricky Wai
4886275b94 Merge "Do not use cached tile specs value in QSTileHost.addTile()" into nyc-dev am: 390a0ca025
am: 140fe982df

* commit '140fe982df7c78e104b93f79d2bbe395e23259ec':
  Do not use cached tile specs value in QSTileHost.addTile()

Change-Id: If46d5f353b7ca93177eeb455c09922414bc80fab
2016-06-02 15:13:36 +00:00
Clara Bayarri
43ee92589a DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice
am: 9fe1077b05

* commit '9fe1077b0506f7b425ae3ca355dbc4c62df16aad':
  DO NOT MERGE Fix Keyboard Shortcut Helper requires pressing META+/ twice

Change-Id: I6cdb2a8206baa3334542f2bdbaa2001d38890b98
2016-06-02 15:09:34 +00:00
Ricky Wai
140fe982df 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
2016-06-02 15:08:03 +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
Clara Bayarri
a3c2c6cb97 Merge "Fix Keyboard Shortcut Helper requires pressing META+/ twice" 2016-06-02 14:05:23 +00:00
Shubham Ajmera
b8b56b9b79 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5 am: 85a5fa0e76
am: ecdcc0ab43

* commit 'ecdcc0ab4320a2d911180178fb84365d00d67d3b':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: I58845028d4df05e5d68d0d757ed9e004520a0b8c
2016-06-02 12:47:21 +00:00
Shubham Ajmera
ecdcc0ab43 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
am: 85a5fa0e76

* commit '85a5fa0e76edd5e1e54cee08abe4fbc4052d7893':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: Id99dd689652359a481f605349b01282c5178d302
2016-06-02 12:41:13 +00:00
Shubham Ajmera
85a5fa0e76 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
Bug: 27331465
(cherry-picked from commit 0652d1c024)
Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b
2016-06-02 12:34:04 +00:00
Shubham Ajmera
63f480a1c9 Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5
Bug: 27331465
(cherry-picked from commit 0652d1c024)
Change-Id: I1a3dd1a550b081535eb8bf79b43edff46da58d6b
2016-06-02 13:29:40 +01:00
Calin Juravle
c30136039d Merge "Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037" into nyc-mr1-dev am: 2fd085bb4f" into nyc-mr1-dev-plus-aosp
am: c1164964bd

* commit 'c1164964bd9df8d86ae24572232c8948be818029':

Change-Id: I2c2408aa88caf3ad251bf7f03c022045ec5cfdc5
2016-06-02 11:36:10 +00:00
Shubham Ajmera
69e94d5b46 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461 am: 4b44cb24b4 am: 99296c2100
am: 2952abb081

* commit '2952abb0814e749e2b5f2c2d1e7eee8c132420cb':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: Ic1f2c09c9ce73ef95cd2f703696c38015adff2df
2016-06-02 11:36:02 +00:00
Calin Juravle
e73843941d Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp
am: 1d28af445b

* commit '1d28af445b716520b972827a61ed4ccf19aeb087':
  Don't create or check permissions on profiles during app startup

Change-Id: Icf5cb939565f2aae88f51c9cb55ff13a02351d65
2016-06-02 11:21:02 +00:00
Android Build Merger (Role)
c1164964bd Merge "Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037" into nyc-mr1-dev am: 2fd085bb4f" into nyc-mr1-dev-plus-aosp 2016-06-02 11:08:33 +00:00
Shubham Ajmera
2952abb081 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461 am: 4b44cb24b4
am: 99296c2100

* commit '99296c2100e3062fe8d3663d2d373d1112441ad5':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: I90079797eadabcd3b0b06a55c79e3944e3c347b2
2016-06-02 11:07:46 +00:00
Calin Juravle
6e13e93773 Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037" into nyc-mr1-dev
am: 2fd085bb4f

* commit '2fd085bb4fbad2046549914992b45237ce40217b':

Change-Id: I13d1daa31387f48d5fa6b07b05a57a17c993aede
2016-06-02 10:55:24 +00:00
Shubham Ajmera
99296c2100 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" am: 4d14e9d461
am: 4b44cb24b4

* commit '4b44cb24b4d8bb938451321d26216bc2a01d6411':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: I08c901400757ca6cd3525083bb43840947306039
2016-06-02 10:55:04 +00:00
Mudumba Ananth
be69ff0aa8 HFP 1.7 profile update (3/4) am: 0d98ebf997
am: 4bf18e1663

* commit '4bf18e1663a44045176ab2b55f66246482a7505a':
  HFP 1.7 profile update (3/4)

Change-Id: I9bff61dd2c8c68c76160ec19960ab07696844f84
2016-06-02 10:52:32 +00:00
Android Build Merger (Role)
1d28af445b Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp 2016-06-02 10:46:32 +00:00
Shubham Ajmera
4b44cb24b4 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5"
am: 4d14e9d461

* commit '4d14e9d461fe60c38c8ec4348a21f7b27de06814':
  Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5

Change-Id: I038bfd7ebe010766a90168495bff4f47f425b547
2016-06-02 10:45:45 +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
Calin Juravle
afb21eee20 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037
am: dd2fc463f1

* commit 'dd2fc463f1f0a92f613930f372c58af10e58e64c':
  Don't create or check permissions on profiles during app startup

Change-Id: I00890adeda97295c0d5630efd7e497d7f0ece8b8
2016-06-02 10:36:40 +00:00
Shubham Ajmera
4d14e9d461 Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5" 2016-06-02 10:35:41 +00:00
Mudumba Ananth
4bf18e1663 HFP 1.7 profile update (3/4)
am: 0d98ebf997

* commit '0d98ebf997b24e96d0328b4195a22832f9ae2664':
  HFP 1.7 profile update (3/4)

Change-Id: I1594696d1d341026b7bd7f0a65c5cdac7049492e
2016-06-02 10:33:44 +00: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
dd2fc463f1 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
2016-06-02 10:18:13 +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
1fcee63a9c Merge "media: fix issues with video profile levels am: 2fc9c6925a am: 49f982ec7b" into nyc-mr1-dev-plus-aosp
am: 48f203e2be

* commit '48f203e2bee9bbf98f6d8eb32f16575c6f5ecb0c':

Change-Id: I3b62d4bfe09eda447fe312fa6b057fb31e6ccef0
2016-06-02 04:10:12 +00:00
Lajos Molnar
a6ff95dff3 media: fix issues with video profile levels am: 2fc9c6925a am: 9e56ec51b0
am: 8ce6dee142

* commit '8ce6dee142d05f904b6948e8ae72bcbfadd14c51':
  media: fix issues with video profile levels

Change-Id: I375e0d59f7ce3a4bd26fd87a59f223aa8954cf9e
2016-06-02 04:10:07 +00:00
Android Build Merger (Role)
48f203e2be Merge "media: fix issues with video profile levels am: 2fc9c6925a am: 49f982ec7b" into nyc-mr1-dev-plus-aosp 2016-06-02 04:04:32 +00:00
Lajos Molnar
b1cb329aac media: fix issues with video profile levels am: 2fc9c6925a
am: 49f982ec7b

* commit '49f982ec7baee5174795d90659b242abd575c909':
  media: fix issues with video profile levels

Change-Id: Ief74eecbfe1926e69c091a5861ad4dcf1a10d98a
2016-06-02 04:04:05 +00:00
Lajos Molnar
8ce6dee142 media: fix issues with video profile levels am: 2fc9c6925a
am: 9e56ec51b0

* commit '9e56ec51b09803982f2c60075ab6523b69bd0933':
  media: fix issues with video profile levels

Change-Id: I15f18757181186524c63185e26536deddb774eb5
2016-06-02 04:03:58 +00:00
Lajos Molnar
49f982ec7b media: fix issues with video profile levels
am: 2fc9c6925a

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

Change-Id: Id691f951f7b27aded9d2e9d996cd01ebc172d7cf
2016-06-02 03:57:49 +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
Sergei Vasilinetc
7e4b6a6ba8 Merge "Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f am: f1eb9c63ee" into nyc-mr1-dev-plus-aosp
am: a5a7d1d200

* commit 'a5a7d1d200e82b73c6595f06bd10aeda0456ad59':

Change-Id: I57653636b5807d8c6924ff9bd4e247f4919e1235
2016-06-02 01:58:33 +00:00
sergeyv
91ae5e8209 Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f am: e136aba4ad
am: e105927fa4

* commit 'e105927fa4f71e74051bf13f87186c2905a14a4b':
  HWUI: do not call glCopyTexSubImage2D on empty area.

Change-Id: I5fe170f0ec7ac82f4502b545fb756cc9df51f0fb
2016-06-02 01:58:15 +00:00
Android Build Merger (Role)
a5a7d1d200 Merge "Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f am: f1eb9c63ee" into nyc-mr1-dev-plus-aosp 2016-06-02 01:51:22 +00:00
Sergei Vasilinetc
df35dc4db6 Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f
am: f1eb9c63ee

* commit 'f1eb9c63ee1eeff9aa4126cde0f0fbe7fbf72efd':
  HWUI: do not call glCopyTexSubImage2D on empty area.

Change-Id: I7e28da73c43fd45a9c417a4bf1d9c4d4ee80a8bf
2016-06-02 01:50:58 +00:00
Sergei Vasilinetc
e105927fa4 Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am: e4e240f13f
am: e136aba4ad

* commit 'e136aba4adcef06eea4d237eb18b031704c37f59':
  HWUI: do not call glCopyTexSubImage2D on empty area.

Change-Id: I7a79fdcf6058dc8867c94ef2d66b6f7b5c3ab1ea
2016-06-02 01:50:45 +00: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
sergeyv
e136aba4ad 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
2016-06-02 01:44:06 +00:00