Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Seigo Nonaka
29b98b5204 Introduce initial perf test for framework/base/core. 
Bug: 28980976
Change-Id: Ib2ccbad8d6657dcae08c2aafa9a63bcc52b88a04
 2016-06-02 18:51:45 +09:00
Suprabh Shukla
ff0939ba7d Changing user switching messages for demo mode 
Bug: 27280140
Change-Id: I803ba8cf9dbf23b4a66cca8af57441faa2b354b6
 2016-06-01 23:28:12 -07: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
Jorim Jaggi
b6650bf02d 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
 2016-06-02 01:52:02 +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
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
14afcc803f Merge "Handle the uncommon case that a name is null" into nyc-dev am: 80354c4dfe am: da96c949ac 
am: 0152c3391d

* commit '0152c3391d8145aa8db2a94f1b3d14968c007754':

Change-Id: Idc7bffaab242513854980199562235a96c5d353a
 2016-06-02 01:27:47 +00:00
Philip P. Moltmann
8584142c2f Merge "Handle the uncommon case that a name is null" into nyc-dev am: 80354c4dfe am: f6070c15f3 
am: 4e074fe333

* commit '4e074fe3335db6180748b56a8bcf9762a90bb55a':
  Handle the uncommon case that a name is null

Change-Id: I7e85eedbdbcbfc7eb90e724ef8cd6d1dee7da5a9
 2016-06-02 01:27:44 +00:00
Dianne Hackborn
9b78db41a0 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
 2016-06-01 18:19:24 -07:00
Jae Seo
c2f7941fc7 Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev am: bd2b9e0d53 am: 08e5d0596e 
am: b0dcc39b53

* commit 'b0dcc39b53acb97ad9030a2eb8e43bae05bea055':

Change-Id: Ia9760fe015fbf4448ff4922281cd9cfa705580ef
 2016-06-02 01:05:06 +00:00
Jae Seo
db411254c0 Merge "Fix documentation for channel types" into nyc-dev am: cf7b33426e am: 5bb08ad9e0 
am: 629c992414

* commit '629c992414a15ca3d6620bdfac782d1416b4dd44':

Change-Id: Ice5d03e4c48df44ab190282c6b6604cdf5745724
 2016-06-02 01:05:01 +00:00
Jae Seo
020d4fffe7 Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev am: bd2b9e0d53 am: 5e0f4e2e29 
am: 3f1bd14d0b

* commit '3f1bd14d0b7dc0ecbcd73381a02dd27a143d2c2f':
  TIF: Release an existing audio patch before creating a new one

Change-Id: Ie35f25cbf9c65d573b1d7720eefa1815d5186dc6
 2016-06-02 01:04:56 +00:00
Jae Seo
5f81e70da9 Merge "Fix documentation for channel types" into nyc-dev am: cf7b33426e am: e96afc7bc2 
am: 4c7db55141

* commit '4c7db55141a353fcc1894a6b19e04cdec3dbf9f7':
  Fix documentation for channel types

Change-Id: Ibb73cdfafc247157a62d3f509634886de09335b4
 2016-06-02 01:04:51 +00:00
Philip P. Moltmann
8309a04afb Merge "Use text input to deal with fullscreen IME" into nyc-dev am: ddf5c44567 am: 76fb4412b7 
am: a212c0363e

* commit 'a212c0363e98c2a98326830ed59456ea93ef84b3':

Change-Id: I8d0c414c4d39a4845ae60df26b185abd9f74579e
 2016-06-02 01:01:30 +00:00
Philip P. Moltmann
30271925d4 Merge "Use text input to deal with fullscreen IME" into nyc-dev am: ddf5c44567 am: 75300f64e7 
am: 41996ea784

* commit '41996ea7841e411bffac5368025d6e588d353389':
  Use text input to deal with fullscreen IME

Change-Id: I08b91aa4ea9614028b6a3f31bf9961667c8bb372
 2016-06-02 01:01:25 +00:00
Lajos Molnar
6fc5217eaf Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e am: 3d41fc67c0 
am: 2d22b6709d

* commit '2d22b6709de5c0a339774ae3ad8a37bb1b4bdbde':

Change-Id: Ia1877a3eb504945a1d10d5432460f59c6463c618
 2016-06-02 01:01:20 +00:00
Lajos Molnar
eeba92a884 Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e am: 12273862c3 
am: d1991f03de

* commit 'd1991f03de6e2fa25f7e3f6d8cc5a6b25ce6ff7e':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: Icbd327f57fbadacadf70c47f8c60dcfb6bdeeaef
 2016-06-02 01:01:13 +00:00
Jeff Sharkey
5401efc49b Merge "Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am: 9bdf289f0a am: 67d9f72659" into nyc-mr1-dev-plus-aosp 
am: 13205c022b

* commit '13205c022b73464957cdb9be97d5a26fab8d2411':

Change-Id: Ic0702d9da60e3f41c7063307adb72d821e0b97e2
 2016-06-02 01:01:06 +00:00
Annie Chin
41ec20fa5e Merge "Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev am: a48f9cb72f" into nyc-mr1-dev-plus-aosp 
am: 40ac62d0fa

* commit '40ac62d0fa3b4882c62c129b394d162bd06d300d':
  Add createAssistManager() method to SystemUIFactory

Change-Id: Ia5a76d69a6081ed084b658f867142bf87515df0d
 2016-06-02 00:54:20 +00:00
Sreevani Sreejith
8e3e1f2b56 Merge "Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7 am: 82c9562d3c am: 4137a97b30" into nyc-mr1-dev-plus-aosp 
am: 540510b7f4

* commit '540510b7f43564b327d9c012b312765a0dd18e41':

Change-Id: If9d9391ef0ca8f941179105950957ce36492138b
 2016-06-02 00:54:16 +00:00
David Sehr
7396239d7b Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: 2855609944" into nyc-mr1-dev-plus-aosp 
am: 73c7c63f1f

* commit '73c7c63f1fefe70651faa0542735d26d8a500054':

Change-Id: I7f08157d0442adda0ca0319a488eae41fcc74500
 2016-06-02 00:54:12 +00:00
Jeff Sharkey
8cd655ea41 Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am: 9bdf289f0a am: cc80f0a955 
am: 2383d08b82

* commit '2383d08b8217520fe68ab616aa1da9112ab45926':
  Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.

Change-Id: I8670010ccc2c6d30ea9a8a578ad75a91030f0075
 2016-06-02 00:54:08 +00:00
Jeff Sharkey
69f389e0e4 Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 am: f02954ccd5 
am: 5ec2c4aeb7

* commit '5ec2c4aeb7074dfb867c556d0bdcc9b5093e9112':

Change-Id: Icb1ab521cac550fe83b124bef3b4fd70ae44bd53
 2016-06-02 00:54:05 +00:00
Doris Liu
02f03120a9 Add additional type check for animating along a path 
BUG: 29009391
Change-Id: I58c98e64f89d0e4e5e2d800a16e71ef853ecd5f6
 2016-06-01 17:52:33 -07:00
Makoto Onuki
9a968df828 Merge "ShortcutManager: API rename" into nyc-mr1-dev am: 60585d12e7 
am: facbcba617

* commit 'facbcba617766402b03c2b1ecc889dfc0fd9c4a2':
  ShortcutManager: API rename

Change-Id: If7da8f53354762bb7e035ab8a9c66e73886545ec
 2016-06-02 00:50:25 +00:00
Chia-I Wu
e3bfa0f242 Merge "Fix clipRect transform rounding errors" into nyc-dev am: 2957d9d604 am: aa53fde78e 
am: 2c63aef816

* commit '2c63aef816ae34eee3b205e40dead1dd08e3fe64':

Change-Id: I96b4a705a2d5b34b0cb7ae6dbae4fe95f2db7a5a
 2016-06-02 00:50:21 +00:00
Alex Klyubin
66af4401a9 Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf am: 5a347de60f 
am: 7df666da5f

* commit '7df666da5f589655e0ec835c798468333e9eee1a':

Change-Id: I7d771910e3dfedf6ceb9ea5a98263c0248dd2f6d
 2016-06-02 00:50:15 +00:00
Philip P. Moltmann
0152c3391d Merge "Handle the uncommon case that a name is null" into nyc-dev am: 80354c4dfe 
am: da96c949ac

* commit 'da96c949acb479f9b48babe85ae506533dc9e1fd':

Change-Id: I84b720ea47a5322f181a3fa81cd550f3ac8e4271
 2016-06-02 00:46:52 +00:00
Philip P. Moltmann
4e074fe333 Merge "Handle the uncommon case that a name is null" into nyc-dev am: 80354c4dfe 
am: f6070c15f3

* commit 'f6070c15f32af68caa1b97e91690a62eac2619cc':
  Handle the uncommon case that a name is null

Change-Id: Ib518d8bb0314d54924eeda9c0c353be14f8ba1ea
 2016-06-02 00:41:28 +00:00
Ta-wei Yen
9e4df538ef Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev am: 912e2b2c80 
am: cbf3aa8789

* commit 'cbf3aa8789341c60b1db6cfaaa7033e3623db810':
  Add support for source-specific VVM state in VoicemailContract

Change-Id: I196ff66863f852808ffbe2d67e5878f049b15a75
 2016-06-02 00:41:02 +00:00
Sreevani Sreejith
a3a16dd629 Merge "Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7 am: 82c9562d3c am: 9fc3d3deeb" into nyc-mr1-dev-plus-aosp 
am: 7208412352

* commit '72084123521b31ac923ccda8bb9d32f4be580c3c':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: Ib843739e996f018e1f9ea47bfa86b9bdf6f1e6a6
 2016-06-02 00:40:38 +00:00