git.osdn.net Git - android-x86/frameworks-base.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jae Seo [Thu, 2 Jun 2016 00:10:33 +0000 (00:10 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Philip P. Moltmann [Thu, 2 Jun 2016 00:05:44 +0000 (00:05 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Jae Seo [Thu, 2 Jun 2016 00:03:52 +0000 (00:03 +0000)]

Merge "Fix documentation for channel types" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Lajos Molnar [Wed, 1 Jun 2016 23:44:11 +0000 (23:44 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 1 Jun 2016 23:29:48 +0000 (23:29 +0000)]

Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Wed, 1 Jun 2016 23:27:00 +0000 (23:27 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Annie Chin [Wed, 1 Jun 2016 23:13:59 +0000 (23:13 +0000)]

Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dianne Hackborn [Wed, 1 Jun 2016 23:12:13 +0000 (23:12 +0000)]

Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7
am: 56b70d51f4

* commit '56b70d51f45ecf101222d90a993f6f6da044ae65':
Fix issue #29058724: Improve JobScheduler API demo

Change-Id: Ib1eeb21537446f7c7b7b99f30acf8713f07dd57f

commit | commitdiff | tree

Dianne Hackborn [Wed, 1 Jun 2016 23:12:07 +0000 (23:12 +0000)]

Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7
am: 0acb155338

* commit '0acb155338f8eec7f15069e5133519a6ad31a00f':
Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I74edc775e4fce077a7d4a933d6c025b9398db5fb

commit | commitdiff | tree

Julia Reynolds [Wed, 1 Jun 2016 23:11:53 +0000 (23:11 +0000)]

Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f
am: f2f7bc0454

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

Change-Id: Idf7f1411cb70eba191748db3a3389062fe1d4baf

commit | commitdiff | tree

Erik Wolsheimer [Wed, 1 Jun 2016 23:11:46 +0000 (23:11 +0000)]

Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev
am: d7b9669b54

* commit 'd7b9669b5421ae3718afd3d7c1b1dfa59537fb08':
Show crash/ANR dialogs on userdebug watch builds

Change-Id: I74d48e3c6df115d6c2e94d3e4924a17bee6edc66

commit | commitdiff | tree

Adrian Roos [Wed, 1 Jun 2016 23:11:38 +0000 (23:11 +0000)]

Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada
am: 06a49b1e93

* commit '06a49b1e931a76503836a437d27138fa3cee20d0':
Fix DirectReply bug when reapply fails

Change-Id: Ib8f15ecea44c1a896c3fe3237a8c015161cceeea

commit | commitdiff | tree

Annie Chin [Wed, 1 Jun 2016 23:10:04 +0000 (23:10 +0000)]

Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev
am: 54c3213304

* commit '54c321330404857535a28cba6a5beaacb79c7617':
Introduce ButtonInterface and getHomeId()

Change-Id: Ib6ca0123400b40aa120462977e08911e2fac7522

commit | commitdiff | tree

Selim Cinek [Wed, 1 Jun 2016 23:09:53 +0000 (23:09 +0000)]

Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf
am: 7b7b17ab80

* commit '7b7b17ab804b81b9dac709012e2e40aa128430ec':
Fixes a few bugs on the keyguard with font density changes

Change-Id: Ief94128ae895fdfadb4aab3ea1d03f12a4257d7f

commit | commitdiff | tree

Felipe Leme [Wed, 1 Jun 2016 23:09:47 +0000 (23:09 +0000)]

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a
am: 9a1dfc9dab

* commit '9a1dfc9dabdb69a2100448af43a72a02eeee411e':

Change-Id: Id84838ce714853f1ac200c11bae2f994a0ac1459

commit | commitdiff | tree

Chong Zhang [Wed, 1 Jun 2016 23:09:45 +0000 (23:09 +0000)]

Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9
am: 2ae97b4cf2

* commit '2ae97b4cf23736f3e8796dd5dadaaf666af76841':
Do not sanitize override config for fullscreen

Change-Id: I68c9388de4a43e8ae03f057b26e0a8caab48afa6

commit | commitdiff | tree

Jorim Jaggi [Wed, 1 Jun 2016 23:09:38 +0000 (23:09 +0000)]

Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2
am: a036c209db

* commit 'a036c209db568bb0e0a962f58e1edb0cb628f09d':

Change-Id: I99a1ca15d0df084bfbed8c95bf322e48e59f532e

commit | commitdiff | tree

Eric Schmidt [Wed, 1 Jun 2016 23:09:29 +0000 (23:09 +0000)]

Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b
am: 7ed7f324f6

* commit '7ed7f324f69712175f8ede8d2504fa28269f0060':

Change-Id: Ida1d4582b66e65ccfdd644bec14153f2735871c2

commit | commitdiff | tree

Adrian Roos [Wed, 1 Jun 2016 23:09:18 +0000 (23:09 +0000)]

Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf
am: 2bad55cb1b

* commit '2bad55cb1b90a0154a32f4fecf75fe14fd9e8744':

Change-Id: Ia127442c7441efdbcbde2065fbd87ecc75263246

commit | commitdiff | tree

Dianne Hackborn [Wed, 1 Jun 2016 23:06:20 +0000 (23:06 +0000)]

Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7
am: 7aaeb394a9

* commit '7aaeb394a92688bc1578ca8e71a470ecd35b3903':
Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I6b9333d374af8815c27db4c927c5b8442d2949c9

commit | commitdiff | tree

Dianne Hackborn [Wed, 1 Jun 2016 23:06:15 +0000 (23:06 +0000)]

Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7
am: 6f2181f251

* commit '6f2181f251cd6377ef438f9d9c832caf2d251882':
Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I18cfcd873ae2cdf7b844c6f785edf1eb180d2ec0

commit | commitdiff | tree

Selim Cinek [Wed, 1 Jun 2016 23:06:10 +0000 (23:06 +0000)]

Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf
am: 4f2264ed9d

* commit '4f2264ed9d781681e09a0edffa089edc905e4340':
Fixes a few bugs on the keyguard with font density changes

Change-Id: I50b0addaa7dbb0e77cbe0a08b93e47e71c515386

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 Jun 2016 23:05:14 +0000 (23:05 +0000)]

Merge "Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a am: d116e0fc14" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 Jun 2016 23:05:04 +0000 (23:05 +0000)]

Merge "Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 am: 859465c105" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 Jun 2016 23:04:54 +0000 (23:04 +0000)]

Merge "Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b am: 65436b097a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 Jun 2016 23:04:22 +0000 (23:04 +0000)]

Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf am: 62eb79e6c8" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 1 Jun 2016 23:04:08 +0000 (23:04 +0000)]

Merge "cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae am: 8b1df8f382" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

sreevanis [Wed, 1 Jun 2016 23:03:58 +0000 (23:03 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

David Sehr [Wed, 1 Jun 2016 23:03:50 +0000 (23:03 +0000)]

commit | commitdiff | tree

Jeff Sharkey [Wed, 1 Jun 2016 23:03:38 +0000 (23:03 +0000)]

commit | commitdiff | tree

Felipe Leme [Wed, 1 Jun 2016 23:02:47 +0000 (23:02 +0000)]

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a
am: d116e0fc14

* commit 'd116e0fc1447470a1d7ca1d6f25f56b4e598f996':
Move DownloadsManager to permanent whitelist.

Change-Id: Icbe617b4a5f894930b15923fe2a104d1957bb17a

commit | commitdiff | tree

Jorim Jaggi [Wed, 1 Jun 2016 23:02:11 +0000 (23:02 +0000)]

Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2
am: 859465c105

* commit '859465c105215cc7d0e152ad2280419c4f820598':
Don't crash activity manager when supplying invalid URI

Change-Id: I0e7a036384d4e30a6bfedcefb3eb18774a55538d

commit | commitdiff | tree

Eric Schmidt [Wed, 1 Jun 2016 23:02:01 +0000 (23:02 +0000)]

Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b
am: 65436b097a

* commit '65436b097a9e513d8628ed3cfa187de226a75efb':
docs: Fixed 'MessageStyle' typo

Change-Id: If678f140004aa846bc83c2a2aefbfd428dc9123d

commit | commitdiff | tree

Adrian Roos [Wed, 1 Jun 2016 23:01:55 +0000 (23:01 +0000)]

Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf
am: 62eb79e6c8

* commit '62eb79e6c80960636982d056c89b97a0c95d9987':
AppError: Change "close" to "close app"

Change-Id: Ib622156c3af13a6cec611f2613f0729b839ed3db

commit | commitdiff | tree

Kevin Hufnagle [Wed, 1 Jun 2016 23:01:46 +0000 (23:01 +0000)]

cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae
am: 8b1df8f382

* commit '8b1df8f3825c3f80b6151265be106e21591843ef':
cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: I6076f1c21cee15def105a503469e0c5207cfa87f

commit | commitdiff | tree

Kevin Hufnagle [Wed, 1 Jun 2016 22:56:38 +0000 (22:56 +0000)]

cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae
am: 810913f943

* commit '810913f943004211313f8b2338508865a67df4f1':
cherry-pick: docs: Added note that <application> at end of manifest.

Change-Id: Ia16f73bf25261d7ea842c6b615dcc9c04ffe06a6

commit | commitdiff | tree

Julia Reynolds [Wed, 1 Jun 2016 22:56:34 +0000 (22:56 +0000)]

Merge "Radio buttons belong in a radio group." into nyc-dev am: d05a7b5972
am: 9eaa3bc7a8

* commit '9eaa3bc7a806081d0bfc39cae0e61dbce581da54':

Change-Id: I0f33d6db53ffa344e3a25b42a402c39fad2c12fb

commit | commitdiff | tree

Ian Rogers [Wed, 1 Jun 2016 22:56:30 +0000 (22:56 +0000)]

Merge "Fix call to equals that could never succeed." into nyc-dev am: 748620e9f0
am: ecc799a076

* commit 'ecc799a0761f60237bcd6da516e32a28f5951b5a':

Change-Id: If26f115ccd0661536afced9165fcc149d62d3946

commit | commitdiff | tree

Jason Monk [Wed, 1 Jun 2016 22:56:25 +0000 (22:56 +0000)]

Merge "QS: Fix single expanded frame from layout" into nyc-dev am: 4215ae0100
am: 937e0e3e61

* commit '937e0e3e61dcf9cef1de92d6fb80bb5491f88489':

Change-Id: I0d6d2ae4b6f2ca962c55eccdacb4ec17df00ff77

commit | commitdiff | tree

Jason Monk [Wed, 1 Jun 2016 22:56:20 +0000 (22:56 +0000)]

Merge "QS: Followup to scroll fixes" into nyc-dev am: 1ceef7c0fa
am: 13edc468d6

* commit '13edc468d6ac2a8ac2ccafcd06053af883a248f6':

Change-Id: I2ca7c1e8739e218cae4336039f43fd829ed39906