OSDN Git Service
Clara Bayarri [Thu, 2 Jun 2016 15:09:34 +0000 (15:09 +0000)]
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
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)
Shubham Ajmera [Thu, 2 Jun 2016 12:41:13 +0000 (12:41 +0000)]
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
Android Build Merger (Role) [Thu, 2 Jun 2016 11:08:32 +0000 (11:08 +0000)]
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
Shubham Ajmera [Thu, 2 Jun 2016 11:07:46 +0000 (11:07 +0000)]
Calin Juravle [Thu, 2 Jun 2016 10:55:24 +0000 (10:55 +0000)]
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
Shubham Ajmera [Thu, 2 Jun 2016 10:55:04 +0000 (10:55 +0000)]
Android Build Merger (Role) [Thu, 2 Jun 2016 10:46:30 +0000 (10:46 +0000)]
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
Shubham Ajmera [Thu, 2 Jun 2016 10:45:45 +0000 (10:45 +0000)]
Calin Juravle [Thu, 2 Jun 2016 10:36:40 +0000 (10:36 +0000)]
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
Shubham Ajmera [Thu, 2 Jun 2016 10:35:40 +0000 (10:35 +0000)]
Mudumba Ananth [Thu, 2 Jun 2016 10:33:44 +0000 (10:33 +0000)]
HFP 1.7 profile update (3/4)
am:
0d98ebf997
* commit '
0d98ebf997b24e96d0328b4195a22832f9ae2664':
HFP 1.7 profile update (3/4)
Change-Id: I1594696d1d341026b7bd7f0a65c5cdac7049492e
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: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: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
Android Build Merger (Role) [Thu, 2 Jun 2016 04:04:31 +0000 (04:04 +0000)]
Merge "media: fix issues with video profile levels am:
2fc9c6925a am:
49f982ec7b" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Thu, 2 Jun 2016 04:04:05 +0000 (04:04 +0000)]
media: fix issues with video profile levels am:
2fc9c6925a
am:
49f982ec7b
* commit '
49f982ec7baee5174795d90659b242abd575c909':
media: fix issues with video profile levels
Change-Id: Ief74eecbfe1926e69c091a5861ad4dcf1a10d98a
Lajos Molnar [Thu, 2 Jun 2016 04:03:58 +0000 (04:03 +0000)]
media: fix issues with video profile levels am:
2fc9c6925a
am:
9e56ec51b0
* commit '
9e56ec51b09803982f2c60075ab6523b69bd0933':
media: fix issues with video profile levels
Change-Id: I15f18757181186524c63185e26536deddb774eb5
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 [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
Android Build Merger (Role) [Thu, 2 Jun 2016 01:51:20 +0000 (01:51 +0000)]
Merge "Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev am:
e4e240f13f am:
f1eb9c63ee" into nyc-mr1-dev-plus-aosp
Sergei Vasilinetc [Thu, 2 Jun 2016 01:50:58 +0000 (01:50 +0000)]
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
Sergei Vasilinetc [Thu, 2 Jun 2016 01:50:45 +0000 (01:50 +0000)]
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
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
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
Philip P. Moltmann [Thu, 2 Jun 2016 00:46:52 +0000 (00:46 +0000)]
Merge "Handle the uncommon case that a name is null" into nyc-dev am:
80354c4dfe
am:
da96c949ac
* commit '
da96c949acb479f9b48babe85ae506533dc9e1fd':
Change-Id: I84b720ea47a5322f181a3fa81cd550f3ac8e4271
Philip P. Moltmann [Thu, 2 Jun 2016 00:41:28 +0000 (00:41 +0000)]
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
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: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
Jae Seo [Thu, 2 Jun 2016 00:26:45 +0000 (00:26 +0000)]
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev am:
bd2b9e0d53
am:
08e5d0596e
* commit '
08e5d0596e1c5711a94c026b7dbd67ff1662b5c1':
Change-Id: I59807f8daf0574086375db52e9c57a03ea7e9346
Jae Seo [Thu, 2 Jun 2016 00:26:41 +0000 (00:26 +0000)]
Merge "Fix documentation for channel types" into nyc-dev am:
cf7b33426e
am:
5bb08ad9e0
* commit '
5bb08ad9e0ae2b6300dc33ad1472cbfcdf249a1b':
Change-Id: Ic488c93f8e064d86c0943314dcc3feb8a698a3af
Jae Seo [Thu, 2 Jun 2016 00:17:21 +0000 (00:17 +0000)]
Merge "TIF: Release an existing audio patch before creating a new one" into nyc-dev am:
bd2b9e0d53
am:
5e0f4e2e29
* commit '
5e0f4e2e29e5dcdfae67049511aeaf2f7409806f':
TIF: Release an existing audio patch before creating a new one
Change-Id: I5dec46babcd88685c37f2754d5eb1179f4061cbb
Jae Seo [Thu, 2 Jun 2016 00:17:17 +0000 (00:17 +0000)]
Merge "Fix documentation for channel types" into nyc-dev am:
cf7b33426e
am:
e96afc7bc2
* commit '
e96afc7bc29dc25346676a4453b34fa560330ab6':
Fix documentation for channel types
Change-Id: Ie354b33f527898c1b860c9915bd809b8013868c4
Philip P. Moltmann [Thu, 2 Jun 2016 00:17:12 +0000 (00:17 +0000)]
Merge "Use text input to deal with fullscreen IME" into nyc-dev am:
ddf5c44567
am:
76fb4412b7
* commit '
76fb4412b71c0d4509839c887a82b6ef1796c7cf':
Change-Id: I7053911dcd1c96b77a415f9da2f9ceaae025dd3e
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
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
Philip P. Moltmann [Thu, 2 Jun 2016 00:10:24 +0000 (00:10 +0000)]
Merge "Use text input to deal with fullscreen IME" into nyc-dev am:
ddf5c44567
am:
75300f64e7
* commit '
75300f64e7db8f5a26ecfb0e373de5d01f245103':
Use text input to deal with fullscreen IME
Change-Id: I4bc72f296be562b2f162c375dc90ac7b023e473c
Lajos Molnar [Thu, 2 Jun 2016 00:10:18 +0000 (00:10 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am:
9061b26f1e
am:
3d41fc67c0
* commit '
3d41fc67c0f44c055cd6d1fc1063bb8ef46205e8':
Change-Id: I489dd5ca7e54466c596f154135e2aa228da354c0
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
Lajos Molnar [Thu, 2 Jun 2016 00:00:30 +0000 (00:00 +0000)]
Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am:
9061b26f1e
am:
12273862c3
* commit '
12273862c3530d261ddb92ce087c4be9751de48d':
media: avoid NPE in CodecCapabilities.createFromProfileLevel
Change-Id: I6f0c0b97a027998a22cba5109ecc70f53cba6ea9
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
Android Build Merger (Role) [Wed, 1 Jun 2016 23:44:14 +0000 (23:44 +0000)]
Merge "Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am:
9bdf289f0a am:
67d9f72659" into nyc-mr1-dev-plus-aosp
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
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
Android Build Merger (Role) [Wed, 1 Jun 2016 23:43:56 +0000 (23:43 +0000)]
Merge "Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev am:
a48f9cb72f" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:43:41 +0000 (23:43 +0000)]
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
Android Build Merger (Role) [Wed, 1 Jun 2016 23:43:33 +0000 (23:43 +0000)]
Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am:
7c5bcfc21a am:
2855609944" into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 1 Jun 2016 23:42:32 +0000 (23:42 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am:
9bdf289f0a
am:
67d9f72659
* commit '
67d9f726593d7b7e0cc0c6ba1e4296614e5f67b7':
Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.
Change-Id: Ic44db23ff7792a7d38e430b72f10bfd9ea922630
Annie Chin [Wed, 1 Jun 2016 23:40:30 +0000 (23:40 +0000)]
Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev
am:
a48f9cb72f
* commit '
a48f9cb72f062ede5ed5d9ceb6fa345f5b194d1b':
Add createAssistManager() method to SystemUIFactory
Change-Id: I9551ceff98c3e238c72c158e4ab23a6bc65559c4
Sreevani Sreejith [Wed, 1 Jun 2016 23:40:12 +0000 (23:40 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am:
2d6015b18b am:
441209abc7 am:
82c9562d3c
am:
4137a97b30
* commit '
4137a97b3004a46f56d97a90f962f1fa519472ff':
Change-Id: I5fe977bd1dfcefd48a7ec048df5a855e0b8f4c63
David Sehr [Wed, 1 Jun 2016 23:40:05 +0000 (23:40 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev am:
7c5bcfc21a
am:
2855609944
* commit '
2855609944f0683efec2985f88ee167c9b7941d9':
Change-Id: I8e6826d3e0692eed0a9d444db500119a641e92eb
Jeff Sharkey [Wed, 1 Jun 2016 23:39:24 +0000 (23:39 +0000)]
Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev am:
9bdf289f0a
am:
cc80f0a955
* commit '
cc80f0a955812a903ddb0dd3c7e0b54cacdf30b9':
Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND.
Change-Id: I66e3af5f084adf6c03a972c37e8c870be2265092
Jeff Sharkey [Wed, 1 Jun 2016 23:32:34 +0000 (23:32 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev am:
380f3b12a4
am:
f02954ccd5
* commit '
f02954ccd5f536577fa4564ede76c5ec61fbbf88':
Change-Id: I1f5b24cd5d08a512e65ef428e03e6033c55896da
Makoto Onuki [Wed, 1 Jun 2016 23:32:22 +0000 (23:32 +0000)]
Merge "ShortcutManager: API rename" into nyc-mr1-dev
am:
60585d12e7
* commit '
60585d12e717d6dd02c89cf177159dbb1c7b4fc9':
ShortcutManager: API rename
Change-Id: Ieca236424835edf8b141706733b3bc98657547ab
Chia-I Wu [Wed, 1 Jun 2016 23:32:13 +0000 (23:32 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev am:
2957d9d604
am:
aa53fde78e
* commit '
aa53fde78e3c7d8e0794587e58b2c5d32567aa39':
Change-Id: Ie481ce0a44ccdd4b1521983a5b2ca6238e8825aa
Alex Klyubin [Wed, 1 Jun 2016 23:32:04 +0000 (23:32 +0000)]
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am:
7fe19060cf
am:
5a347de60f
* commit '
5a347de60fc2c34bcf2b50f9363715e2f1e092f7':
Change-Id: Ib71c8fd0f288113d154d31afb7e3f3182b108685
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
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
Ta-wei Yen [Wed, 1 Jun 2016 23:26:31 +0000 (23:26 +0000)]
Merge "Add support for source-specific VVM state in VoicemailContract" into nyc-mr1-dev
am:
912e2b2c80
* commit '
912e2b2c80ba7641f649ae7e130d9febc4caac44':
Add support for source-specific VVM state in VoicemailContract
Change-Id: I0d0555fc9d2d4dfcee9a8cfb29acfe3a109be094
Android Build Merger (Role) [Wed, 1 Jun 2016 23:17:10 +0000 (23:17 +0000)]
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
Android Build Merger (Role) [Wed, 1 Jun 2016 23:17:02 +0000 (23:17 +0000)]
Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am:
7c5bcfc21a am:
fc536cb862" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:16:52 +0000 (23:16 +0000)]
Merge "Merge "Release AssetManagers when ejecting storage." into nyc-dev am:
380f3b12a4 am:
20340d0fc8" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:16:44 +0000 (23:16 +0000)]
Merge "Merge "Fix clipRect transform rounding errors" into nyc-dev am:
2957d9d604 am:
0c63355719" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:16:35 +0000 (23:16 +0000)]
Merge "Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am:
7fe19060cf am:
815c681f42" into nyc-mr1-dev-plus-aosp
Sreevani Sreejith [Wed, 1 Jun 2016 23:15:59 +0000 (23:15 +0000)]
Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am:
2d6015b18b am:
441209abc7 am:
82c9562d3c
am:
9fc3d3deeb
* commit '
9fc3d3deeb19111bb42a5454a8c8c24a2df9d9fe':
docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.
Change-Id: If9c9d88e386d6ba09bf915af77808c3202656483
David Sehr [Wed, 1 Jun 2016 23:15:53 +0000 (23:15 +0000)]
Merge "Installer connection support for dump_profiles" into nyc-dev am:
7c5bcfc21a
am:
fc536cb862
* commit '
fc536cb862c67d91eaa7fa94557cdc2f0f415678':
Installer connection support for dump_profiles
Change-Id: I6f8dbd362f6accc2d90409b91e96efed531820d9
Jeff Sharkey [Wed, 1 Jun 2016 23:15:49 +0000 (23:15 +0000)]
Merge "Release AssetManagers when ejecting storage." into nyc-dev am:
380f3b12a4
am:
20340d0fc8
* commit '
20340d0fc82bccf883898e9523f3c8aca8c9ac04':
Release AssetManagers when ejecting storage.
Change-Id: I8053660edc7088f26c94fb2a3174a743a8d60636
Chia-I Wu [Wed, 1 Jun 2016 23:15:44 +0000 (23:15 +0000)]
Merge "Fix clipRect transform rounding errors" into nyc-dev am:
2957d9d604
am:
0c63355719
* commit '
0c63355719d45986b3ce24046a0338f26a00cf3b':
Fix clipRect transform rounding errors
Change-Id: I3c24c9407c053c8b764989bb8b6e7352a758b3c2
Alex Klyubin [Wed, 1 Jun 2016 23:15:40 +0000 (23:15 +0000)]
Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am:
7fe19060cf
am:
815c681f42
* commit '
815c681f4243486693830929bf1be472ae1f467b':
Use correct cert chain from PKCS#7 SignedData block.
Change-Id: I01cb9b5f0fb409d5f03120b6cdfca9077b7bceb2
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
Android Build Merger (Role) [Wed, 1 Jun 2016 23:15:06 +0000 (23:15 +0000)]
Merge "Merge "Only call finish on operations that have started." into nyc-dev am:
6df8a9a89f am:
f2f7bc0454" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:14:54 +0000 (23:14 +0000)]
Merge "Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev am:
d7b9669b54" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:14:44 +0000 (23:14 +0000)]
Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am:
6510bdeada am:
06a49b1e93" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:14:32 +0000 (23:14 +0000)]
Merge "Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev am:
54c3213304" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:14:19 +0000 (23:14 +0000)]
Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am:
65f1973ba9 am:
2ae97b4cf2" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:14:11 +0000 (23:14 +0000)]
Merge "Merge "Only call finish on operations that have started." into nyc-dev am:
6df8a9a89f am:
e24e9a0333" into nyc-mr1-dev-plus-aosp
Annie Chin [Wed, 1 Jun 2016 23:13:59 +0000 (23:13 +0000)]
Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 1 Jun 2016 23:13:58 +0000 (23:13 +0000)]
Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am:
6510bdeada am:
053ffa6d7c" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:13:50 +0000 (23:13 +0000)]
Merge "Merge "Fix issue #
29058724: Improve JobScheduler API demo" into nyc-dev am:
61721ee3d7 am:
7aaeb394a9" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:13:43 +0000 (23:13 +0000)]
Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am:
65f1973ba9 am:
47797a7653" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:13:34 +0000 (23:13 +0000)]
Merge "Merge "Fix issue #
29058724: Improve JobScheduler API demo" into nyc-dev am:
61721ee3d7 am:
56b70d51f4" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:13:25 +0000 (23:13 +0000)]
Merge "Merge "Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am:
3e05055af7 am:
6f2181f251" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:13:22 +0000 (23:13 +0000)]
Merge "Merge "Fix issue #
29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am:
3e05055af7 am:
0acb155338" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 1 Jun 2016 23:12:57 +0000 (23:12 +0000)]
Merge "Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am:
42621023cf am:
4f2264ed9d" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Wed, 1 Jun 2016 23:12:27 +0000 (23:12 +0000)]
Merge "Only call finish on operations that have started." into nyc-dev am:
6df8a9a89f
am:
e24e9a0333
* commit '
e24e9a033308d33da0f2517bb4e7b0bbade7efe2':
Only call finish on operations that have started.
Change-Id: I3679e6e9fb68fe804b4ff645d0fbe4e0b3aff29a
Adrian Roos [Wed, 1 Jun 2016 23:12:21 +0000 (23:12 +0000)]
Merge "Fix DirectReply bug when reapply fails" into nyc-dev am:
6510bdeada
am:
053ffa6d7c
* commit '
053ffa6d7c897215fecc4fa85be50f2e82a39640':
Fix DirectReply bug when reapply fails
Change-Id: I2e415fef0edb01944be4dfdc6f0067fa9e2ead5f
Chong Zhang [Wed, 1 Jun 2016 23:12:17 +0000 (23:12 +0000)]
Merge "Do not sanitize override config for fullscreen" into nyc-dev am:
65f1973ba9
am:
47797a7653
* commit '
47797a765327af3d3688b6993d85e727ddcf4aa0':
Do not sanitize override config for fullscreen
Change-Id: Ib531f36a2526d4d7b2f3c09ece16ca0bb745447f
OSDN Git Service
