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

Selim Cinek [Wed, 31 Aug 2016 04:04:42 +0000 (04:04 +0000)]

Merge "Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: c9c0bcf6a9 am: df8c802677 am: ee8d1394e3" into nyc-mr1-dev-plus-aosp
am: 0a502573fb

Change-Id: Ifb13e4fb6fd8290c7f8cbf505e45d64334d8b959

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 04:04:37 +0000 (04:04 +0000)]

Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: c9c0bcf6a9 am: df8c802677 am: ee8d1394e3
am: ea1b06b0ad

Change-Id: I993be517e322fc22c9f44da66d917825eba98c2d

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 04:04:22 +0000 (04:04 +0000)]

Merge "Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e am: ed596e6836 am: 169a18d87e" into nyc-mr1-dev-plus-aosp
am: dd5d19e4b5

Change-Id: I2009c935abc6f762b1d2d162831bd0dd309e6fe0

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 04:04:18 +0000 (04:04 +0000)]

Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e am: ed596e6836 am: 169a18d87e
am: 3b1a53290b

Change-Id: I5cb0cead84ce161183881366eb6c2f24582b672f

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 03:58:14 +0000 (03:58 +0000)]

Merge "Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: c52edb4f24 am: b35ae808c0 am: a17beb7869" into nyc-mr1-dev-plus-aosp
am: 6833b79b67

Change-Id: I2d50f975c5bb91de2c2af785c0c74250e9facca1

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 03:58:11 +0000 (03:58 +0000)]

Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: c52edb4f24 am: b35ae808c0 am: a17beb7869
am: 2d3872ee0f

Change-Id: I87886fa55dca4bd9050f0d7c33faf2c8b96c6b86

commit | commitdiff | tree

Vineeta Srivastava [Wed, 31 Aug 2016 03:58:01 +0000 (03:58 +0000)]

Merge "Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc am: dd51fb20f3 am: 15f24a36d5" into nyc-mr1-dev-plus-aosp
am: b6533c3207

Change-Id: Ic5354cf764424754964a3b75f272145602f2c8d0

commit | commitdiff | tree

Vineeta Srivastava [Wed, 31 Aug 2016 03:57:56 +0000 (03:57 +0000)]

Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc am: dd51fb20f3 am: 15f24a36d5
am: 8b42909e46

Change-Id: I07ac16e04c78546b3ea619d02490f3963e4e620b

commit | commitdiff | tree

Vineeta Srivastava [Wed, 31 Aug 2016 03:57:41 +0000 (03:57 +0000)]

Merge "whitelist sms code for TMO-DE and TMO-MK. am: 6af315af94 am: f4be3d2927 am: 30c49a0a1b -s ours" into nyc-mr1-dev-plus-aosp
am: 34ce85f36e

Change-Id: Idf389b93b02edee4b9f573a227f776d4039c8f92

commit | commitdiff | tree

Vineeta Srivastava [Wed, 31 Aug 2016 03:57:37 +0000 (03:57 +0000)]

whitelist sms code for TMO-DE and TMO-MK. am: 6af315af94 am: f4be3d2927 am: 30c49a0a1b -s ours
am: f7cca24d9d

Change-Id: I3f99a1c8a88fb3b2a689043f74c9789a2fe77124

commit | commitdiff | tree

Todd Kennedy [Wed, 31 Aug 2016 03:57:22 +0000 (03:57 +0000)]

Merge "update shared libraries for system apps" into nyc-dev am: 689c92db9d am: 30a8917720
am: 0a1647d8ee

Change-Id: I8023ef52245f08ff778783255ed1a80683101640

commit | commitdiff | tree

Todd Kennedy [Wed, 31 Aug 2016 03:57:16 +0000 (03:57 +0000)]

update shared libraries for system apps am: 85a91def5c am: caf42418f6
am: 69c771bb67

Change-Id: I739bb9f94631f155da378f9ecbf15db7e82a6199

commit | commitdiff | tree

Mitchell Wills [Wed, 31 Aug 2016 03:47:37 +0000 (03:47 +0000)]

DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
am: 722de5f9d0 -s ours

Change-Id: Ic63cc762aa0a73af972539e5d08ef5a691babff7

commit | commitdiff | tree

John Reck [Wed, 31 Aug 2016 03:47:33 +0000 (03:47 +0000)]

Merge "Cherry pick TextureView fixes" into nyc-dev am: 8eaa65b867 am: 8f0de55375
am: a6a95328dd

Change-Id: I2c7bde569f077f21125927dc66d5aa2e8b41fe81

commit | commitdiff | tree

Chris Craik [Wed, 31 Aug 2016 03:47:30 +0000 (03:47 +0000)]

Cherry pick TextureView fixes am: 2e8a8a2432 am: dbf69818a2
am: 8f64067da7

Change-Id: I498cdcd0be1f3a4843a2995d364bc619277fb2e0

commit | commitdiff | tree

Yohei Yukawa [Wed, 31 Aug 2016 03:47:25 +0000 (03:47 +0000)]

Merge "Make sure IME focus is synced to View focus" into nyc-dev am: b7efddfc41 am: 438c37a1dc
am: 05d01dc73c

Change-Id: Id2ff66326aff43b5f27eb4a3d44d051d5dab6ab3

commit | commitdiff | tree

Yohei Yukawa [Wed, 31 Aug 2016 03:47:21 +0000 (03:47 +0000)]

Make sure IME focus is synced to View focus am: 8eb07090a4 am: 87b9a88c32 -s ours
am: 824155f77a

Change-Id: I363ccee5ffa66c1f3517102ae2fb44fd27d32d55

commit | commitdiff | tree

Chet Haase [Wed, 31 Aug 2016 03:37:16 +0000 (03:37 +0000)]

Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am: 59fb472858 am: db7f35fed6
am: 2bcd492ca4

Change-Id: I0df6967d261e2ac8406181882055a1daa8f76c67

commit | commitdiff | tree

Yuichi Biwa [Wed, 31 Aug 2016 03:37:12 +0000 (03:37 +0000)]

ChooserActivity: Cannot start app that the icon overflows the layout am: cb3e1237b5 am: 98a824dbb7
am: 5e7c2b96b0

Change-Id: Ib3f67b4658657691007fb1e64222c96cee7ade64

commit | commitdiff | tree

Chet Haase [Wed, 31 Aug 2016 03:37:08 +0000 (03:37 +0000)]

Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am: 22e006214c am: c562501eb1
am: 498860a688

Change-Id: I9c7912b60f3b7ffde5a321b5913d0ffabf1a3054

commit | commitdiff | tree

Alan Viverette [Wed, 31 Aug 2016 03:37:05 +0000 (03:37 +0000)]

Set up view state before attaching, jump drawables if needed am: c328f042a6 am: 01ba422091 -s ours
am: 586e59e661

Change-Id: I84e482ada6bf088fba43f7baacc67e6eb834cc85

commit | commitdiff | tree

Chet Haase [Wed, 31 Aug 2016 03:37:02 +0000 (03:37 +0000)]

Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am: a1bbb76806 am: df46861131
am: 47b0ecd20f

Change-Id: Ib42474a76db7d254078f59f27be7b4081b54335b

commit | commitdiff | tree

Adam Powell [Wed, 31 Aug 2016 03:31:59 +0000 (03:31 +0000)]

Force AlertDialogLayout to have gravity start|top am: 00c4f7ba65 am: 426750d9c6
am: 465347132b

Change-Id: I071d23678a8acd5a6e073fa8636a13a99afcbfce

commit | commitdiff | tree

Chet Haase [Wed, 31 Aug 2016 03:31:55 +0000 (03:31 +0000)]

Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am: c80a4d7ae3 am: 55c66ce844
am: 17677c85a0

Change-Id: Icd81bdd46f8927e3447a03dc2443e323884df17b

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 31 Aug 2016 03:31:51 +0000 (03:31 +0000)]

FloatingActionMode: Fix screen coordinates. am: 99c340cad9 am: 6507b8b333
am: 7886d0d6ee

Change-Id: I3cf532f5f4144c8e3ecb2e49bc110eb83e0dc718

commit | commitdiff | tree

Christopher Tate [Wed, 31 Aug 2016 03:31:47 +0000 (03:31 +0000)]

Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am: 2bbfe98062 am: ea14c09012
am: fed21a73d2

Change-Id: Idd5959cab13d27697e90ebb622e9b2531b953ee3

commit | commitdiff | tree

Christopher Tate [Wed, 31 Aug 2016 03:31:44 +0000 (03:31 +0000)]

Eliminate next-alarm-clock broadcast flapping am: c60da1edc1 am: b593999965
am: 2648a12325

Change-Id: Ia6615699929df0182931492ebeada88bd84e41bb

commit | commitdiff | tree

Andrii Kulian [Wed, 31 Aug 2016 03:17:59 +0000 (03:17 +0000)]

Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am: c8417676ed am: bdbf13e989
am: 3c0dd6392c -s ours

Change-Id: Ic7e05e2e8f36d0ffbb8765ccb6bd617c02cf4f78

commit | commitdiff | tree

Andrii Kulian [Wed, 31 Aug 2016 03:17:55 +0000 (03:17 +0000)]

DO NOT MERGE -- Fix finishing activity in non-focused stack am: 772c598f66 am: 3701296a70
am: 936e29d56e -s ours

Change-Id: I3920be75af57f349e185cb6825473d0b009c864d

commit | commitdiff | tree

Tao Bao [Wed, 31 Aug 2016 03:17:48 +0000 (03:17 +0000)]

Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4 am: c5a17fc39f am: 8c682f8441
am: ae71436bb0

Change-Id: I09edf5ac8289347e977b273156a7b5f85906a097

commit | commitdiff | tree

Felipe Leme [Wed, 31 Aug 2016 03:17:43 +0000 (03:17 +0000)]

Merge "Fixed statuses on Battery Saver column." am: 21e0701f76 am: bb205d5e3e am: 6a1dd43194
am: 712038cbc6

Change-Id: I4f7a836a94f16671b8ec98dbcc948de0405a4a97

commit | commitdiff | tree

Andrii Kulian [Wed, 31 Aug 2016 03:17:38 +0000 (03:17 +0000)]

Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am: 128a4419e9 am: 819de103db
am: 389bc3796e -s ours

Change-Id: I5b0aa963962ef06d1bfad8a0f77537d08d894743

commit | commitdiff | tree

Andrii Kulian [Wed, 31 Aug 2016 03:11:56 +0000 (03:11 +0000)]

DO NOT MERGE -- Correctly finish activity in non-focused stack am: 620040db3f am: d1fb246dad -s ours
am: 4b79c79fee -s ours

Change-Id: I22d50239a90bb118ebd21be932efade2c83c8086

commit | commitdiff | tree

Jason Monk [Wed, 31 Aug 2016 03:11:52 +0000 (03:11 +0000)]

Merge "Fix double status bar icons" into nyc-dev am: 2b4e612b10 am: 67566858af
am: 53621f20ee

Change-Id: I2fae9e8a0603dee3b6546db53b4182cd76365c4e

commit | commitdiff | tree

Jason Monk [Wed, 31 Aug 2016 03:11:49 +0000 (03:11 +0000)]

Fix double status bar icons am: 12124d7eca am: 829548a3cb
am: 3441716284

Change-Id: Idcb49a929d84ada47f2c9e1c52f633e8ff6cd222

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 03:11:45 +0000 (03:11 +0000)]

Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: 96b67bcd1c
am: 0d68c55d17

Change-Id: Ibcd0f4507e98bc6af8cd3252c78b197b698dd2b0

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 03:11:41 +0000 (03:11 +0000)]

Fixed a bug where notifications could reappear am: f3b64692a3 am: b7f50bedb1
am: 4d2bb1b89e

Change-Id: Iddea69d3c5bb237a9e0254d45966e4b45352ef6c

commit | commitdiff | tree

Selim Cinek [Wed, 31 Aug 2016 03:05:15 +0000 (03:05 +0000)]

Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: ad235b03fb
am: cae9a8bf41

Change-Id: I4c8258f61ab17f601e09c0f80338493a564bc7f0

commit | commitdiff | tree

Greg Kaiser [Wed, 31 Aug 2016 03:05:10 +0000 (03:05 +0000)]

Merge "ContextHubService: Allow cancelling load/unload" into nyc-mr1-dev am: 40e6194148 am: 4db7ca82d4
am: 4aa9e58f94

Change-Id: I862c7a9cbcc6b8c48dc87b361e1f153fd0b630d1

commit | commitdiff | tree

Greg Kaiser [Wed, 31 Aug 2016 03:05:01 +0000 (03:05 +0000)]

ContextHubService: Allow cancelling load/unload am: 29e868071d am: a0d483e410
am: cb310cc217

Change-Id: Ib6c4aa93368d7acaa94f4bc94d151bfb3fc9454a

commit | commitdiff | tree

Greg Kaiser [Wed, 31 Aug 2016 03:04:50 +0000 (03:04 +0000)]

Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev am: 143aaa6d05 am: 2c168b28f9
am: d3179e2f6d

Change-Id: If3f0925586c552d7bc999485a7e35e222ba0ebd0

commit | commitdiff | tree

Greg Kaiser [Wed, 31 Aug 2016 03:04:41 +0000 (03:04 +0000)]

ContextHubService: Hack in Google vendor value am: 5817ce0c13 am: 3d2f2a4305
am: ee483f7d78

Change-Id: I8ca30026b44d6ccea7cefa4b6671b4f286c352b5

commit | commitdiff | tree

Amith Yamasani [Wed, 31 Aug 2016 02:57:53 +0000 (02:57 +0000)]

Merge "Add logging to CursorWindow JNI code to track #31046363" into nyc-mr1-dev am: 81f876e795 am: 5914b96565
am: 2289349ad9

Change-Id: I51b7cc49340aaff3c86257aad6183641b80d8284

commit | commitdiff | tree

Amith Yamasani [Wed, 31 Aug 2016 02:57:49 +0000 (02:57 +0000)]

Add logging to CursorWindow JNI code to track #31046363 am: 0903ec5017 am: 99a6d16639
am: 154a9823c6

Change-Id: I5759d4fa8daf040d8b198aba87fb973cf8d2d228

commit | commitdiff | tree

Pablo Ceballos [Wed, 31 Aug 2016 02:57:29 +0000 (02:57 +0000)]

Merge "Fail createVirtualDisplay with single-buffered Surface" into nyc-mr1-dev am: 23784fd6d9 am: ed8f06673a
am: 4c7918ea16

Change-Id: Ic716dc188d326186680fa79d41991a1ba8ef5eca

commit | commitdiff | tree

Pablo Ceballos [Wed, 31 Aug 2016 02:56:35 +0000 (02:56 +0000)]

Fail createVirtualDisplay with single-buffered Surface am: aff2f94939 am: d387b20dcb
am: 658f26634f

Change-Id: I499988d911ffd5ccd4b5bc10c75f3e0ed9a897c8

commit | commitdiff | tree

Narayan Kamath [Wed, 31 Aug 2016 02:56:17 +0000 (02:56 +0000)]

Fix clang build breakage (-Werror -Wformat). am: b334c33d65 am: 2cf3cc82e3
am: f9a73de875

Change-Id: Ie3194a7cafb8058d162fbd9a3d62111d2f2ed250

commit | commitdiff | tree

Andreas Gampe [Wed, 31 Aug 2016 02:46:24 +0000 (19:46 -0700)]

resolve merge conflicts of 725b4e6 to master

Change-Id: I79018a9586b8f7b5f69c8e54c8ce78b3acd81d35

commit | commitdiff | tree

Yi Kong [Wed, 31 Aug 2016 01:54:22 +0000 (01:54 +0000)]

Merge "Track getxattr API change" am: c4c4a1e76e am: f897e1c3b6 am: 2b5a0d299d
am: be5137f4cb

Change-Id: I6a9f9b807b8dfc4aed83fe7d2610033dc63e4269

commit | commitdiff | tree

Felipe Leme [Wed, 31 Aug 2016 01:54:14 +0000 (01:54 +0000)]

Removed screen on/off callbacks from NPMS. am: b79f06a476 am: a4defc17c7 am: 2c6a1fb0e1
am: dbac6566f8

Change-Id: I954e4f2bd39332db2146f11e0afe525190029e76

commit | commitdiff | tree

Jorim Jaggi [Wed, 31 Aug 2016 01:54:07 +0000 (01:54 +0000)]

Merge "Fix invalid divider state while rotating" into nyc-mr1-dev am: a2316b3041 am: 9cb567c9ad
am: 89097e65ca

Change-Id: I7c51092028e9b18057f2724bbb1cb663fb505f7f

commit | commitdiff | tree

Jorim Jaggi [Wed, 31 Aug 2016 01:06:35 +0000 (18:06 -0700)]

resolve merge conflicts of d33f893 to master

Change-Id: I5851917387af16425f6c4c633931ba75937ffb26

commit | commitdiff | tree

Adam Lesinski [Wed, 31 Aug 2016 00:55:51 +0000 (00:55 +0000)]

Merge "AAPT2 tools: Fix logging in resource file fixer"

commit | commitdiff | tree

Daniel Chapin [Wed, 31 Aug 2016 00:54:08 +0000 (00:54 +0000)]

Merge "Fixes for ImageView drawable visibility dispatch" into nyc-dr1-dev am: 7c02d7adaa am: 26aec7300d am: 38fef6a38b
am: 19b96b58fa

Change-Id: I946eaf4cbf4179fc766aca6f2378945a1060c5fe

commit | commitdiff | tree

Adam Powell [Wed, 31 Aug 2016 00:54:04 +0000 (00:54 +0000)]

Fixes for ImageView drawable visibility dispatch am: 06f9eb8b62 am: fd86f7fdfd am: ee2f4d890e
am: 393279da8f

Change-Id: I7e42805b096de31e388cd86ee87b44f312841aed

commit | commitdiff | tree

Chih-Hung Hsieh [Wed, 31 Aug 2016 00:37:25 +0000 (00:37 +0000)]

Merge "Fix misc-macro-parentheses warnings in hwui/tests." am: e2732e5e38 am: e33f3472f3 am: 007c463e64
am: 4529b6300e

Change-Id: I8bd575002330360a3bb2fe06fc31d8d4e08e6e3e

commit | commitdiff | tree

Chong Zhang [Wed, 31 Aug 2016 00:37:19 +0000 (00:37 +0000)]

Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev am: 19628b251d am: 80c031cbd4 am: 233b85b79b
am: 9a7dccf534 -s ours

Change-Id: If1ed9f64b6cae04c47f4e5bfd001b78af6ae5553

commit | commitdiff | tree

Chong Zhang [Wed, 31 Aug 2016 00:37:16 +0000 (00:37 +0000)]

DO NOT MERGE -- Only use saved surface if started by launcher or moved to front am: 813be138ae am: 9f92bc2602 am: 8673e303a7
am: 818b7218c5 -s ours

Change-Id: I6c201932b9c563a0c681b65215957600e2160e5d

commit | commitdiff | tree

Todd Kennedy [Wed, 31 Aug 2016 00:37:13 +0000 (00:37 +0000)]

Enable web action apps based on system setting am: efc1c4d501 am: 742f4de6cf
am: 66db34fbe2

Change-Id: Ic1726786e0baeaf758381f3a9a9324ea39b921be

commit | commitdiff | tree

Tyler Gunn [Wed, 31 Aug 2016 00:37:09 +0000 (00:37 +0000)]

Merge changes from topic 'am-51f46b0037de4a44a6855ff5a0be6dfa' into nyc-mr1-dev-plus-aosp
am: 8ef6b75d1e

Change-Id: Ie2347a0959e2452482424e119b8e2426e8bb693d

commit | commitdiff | tree

Tyler Gunn [Wed, 31 Aug 2016 00:37:03 +0000 (00:37 +0000)]

Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev am: 020212c7df am: ffe4d64182
am: 8455068d79

Change-Id: I89a175703e48400c06edef679e39aaec9366af9b

commit | commitdiff | tree

Tyler Gunn [Wed, 31 Aug 2016 00:35:44 +0000 (00:35 +0000)]

Add device config to determine when "allow hold" carrier config is used. am: d81c426e1d am: 6c619a2abb
am: 5b9f1f8b74

Change-Id: I4b156928fb3495c1d898bb492f4b3bf797771899

commit | commitdiff | tree

Todd Kennedy [Wed, 31 Aug 2016 00:34:42 +0000 (00:34 +0000)]

Merge "Implement new ephemeral resolver design" into nyc-mr1-dev am: 80855e154e am: 2265267555
am: ed19b46db0

Change-Id: I4e43a30b1b41727d6f57539f70c86fcf5f6ce31d

commit | commitdiff | tree

Todd Kennedy [Wed, 31 Aug 2016 00:33:54 +0000 (00:33 +0000)]

Implement new ephemeral resolver design am: fea1b776e9 am: 6485f6eddf
am: 3b0859d6bb

Change-Id: Ib87b511db7f878139f4387447e273b18a01d8a1a

commit | commitdiff | tree

Colin Cross [Wed, 31 Aug 2016 00:29:35 +0000 (00:29 +0000)]

Merge "Replace libziparchive-host with libziparchive" am: 611e205bbe am: 8c8bb25089 am: 63dc310e6a
am: e3cd4b394c

Change-Id: Icc088a0cdd6a2ebc2b7bedb719ad7220d947273d

commit | commitdiff | tree

Adam Lesinski [Tue, 30 Aug 2016 20:11:40 +0000 (13:11 -0700)]

AAPT2 tools: Fix logging in resource file fixer

Change-Id: I5113012229005c94e466f43a30932ebdc74d76fc

commit | commitdiff | tree

Philip P. Moltmann [Tue, 30 Aug 2016 19:43:25 +0000 (19:43 +0000)]

Merge "Hold no locks when calling RemotePrintSpooler"

commit | commitdiff | tree

Felipe Leme [Tue, 30 Aug 2016 19:17:04 +0000 (19:17 +0000)]

Merge "Added missing @Test"

commit | commitdiff | tree

Felipe Leme [Tue, 30 Aug 2016 19:15:09 +0000 (12:15 -0700)]

Added missing @Test

BUG: 28791717
Test: none
Change-Id: Iaa574218d2232b3bd8fbce0a9259d25708baebed

commit | commitdiff | tree

Abodunrinwa Toki [Tue, 30 Aug 2016 19:04:35 +0000 (19:04 +0000)]

Merge "EditText: Proper support for "textIsSelectable"."

commit | commitdiff | tree

Adam Lesinski [Tue, 30 Aug 2016 17:49:11 +0000 (17:49 +0000)]

Merge "AAPT2: Fix merging of styleables the right way"

commit | commitdiff | tree

Felipe Leme [Tue, 30 Aug 2016 17:39:55 +0000 (17:39 +0000)]

Merge "Moar test cases for NetworkPolicyManagerServiceTest."

commit | commitdiff | tree

Jorim Jaggi [Tue, 30 Aug 2016 17:20:17 +0000 (17:20 +0000)]

Play sound on ACTION_DOWN for navigation keys am: 05bce15da9 am: 9bdfbd7c82
am: 214f2fe7b4

Change-Id: I5cd28d2b4c1d903fa76a8bae0edec93d7d047282

commit | commitdiff | tree

Brian Duddie [Tue, 30 Aug 2016 17:20:13 +0000 (17:20 +0000)]

Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev am: 73f511e471 am: 3a41c5b654
am: 1e9d0f17cf

Change-Id: Ib91456a530ba5fd8e67ae92046d52fbfe392bbb1

commit | commitdiff | tree

Greg Kaiser [Tue, 30 Aug 2016 17:20:09 +0000 (17:20 +0000)]

ContextHubManager: Document InstanceInfo bug am: 3be73d3950 am: 6f155aa4bf
am: 7fd9e40381

Change-Id: I0f95997e013d5cb8fb23b18ad82763cc091e38f1

commit | commitdiff | tree

Paul Stewart [Tue, 30 Aug 2016 17:20:05 +0000 (17:20 +0000)]

Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev am: 855210170c am: 1377955965
am: 2154beb07e

Change-Id: I9c0fa23c50528802ad22a2a9de0af0b4660b43db

commit | commitdiff | tree

Paul Stewart [Tue, 30 Aug 2016 17:20:02 +0000 (17:20 +0000)]

Document correct context for obtaining WifiManager am: 0e164b199e am: b09557b3cf
am: 163a135246

Change-Id: I943a2d60461633b9432bdf83c3b25086bba22b94

commit | commitdiff | tree

Allen Hair [Tue, 30 Aug 2016 17:13:10 +0000 (17:13 +0000)]

Merge "Configure code coverage filters." into nyc-mr1-dev am: 6bf296f6dc am: baac84303c
am: 99b8ff8b7d

Change-Id: Ibfe5e6fcd6bb3791b37d13bbc665b54990fb18f3

commit | commitdiff | tree

Allen Hair [Tue, 30 Aug 2016 17:13:01 +0000 (17:13 +0000)]

Configure code coverage filters. am: 02fd609460 am: 15b70213a4
am: 8b931e08d0

Change-Id: If94db4d01eb5ff4a9f463200d529b0054899bcd5

commit | commitdiff | tree

Fyodor Kupolov [Tue, 30 Aug 2016 17:12:54 +0000 (17:12 +0000)]

Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev am: 4be496d2d0 am: 429a0197bf
am: 53fffe11d6

Change-Id: I4148a7c506843d096f26dd177523d33ebeafd7e4

commit | commitdiff | tree

Fyodor Kupolov [Tue, 30 Aug 2016 17:12:50 +0000 (17:12 +0000)]

Fix AccountManagerServiceTest am: d954357860 am: 658b8e7e4b
am: eac40d9949

Change-Id: I27b4175f949e5416943a2a3782b772ce65b846e6

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Aug 2016 17:12:45 +0000 (17:12 +0000)]

Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818 am: 61f52fca96 am: be1a09ef47 am: c49ce72fd8
am: 5d00f19d56

Change-Id: I831a64899605bac06f3a687906d36b3c9e5c6176

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Aug 2016 17:09:59 +0000 (17:09 +0000)]

Fetch ga script over https to avoid mixed content. am: b5760c1fe7 am: 324054e7d4 am: 26901d3715 am: 5e34cccda6
am: b130000df4

Change-Id: I87c1d102b884e8a0c34d74152c7701518540a110

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Aug 2016 17:09:56 +0000 (17:09 +0000)]

Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818 am: 4019963b96
am: 968699da73

Change-Id: Iaaef50a5500469cfb5a66795fe9f87d34fcd5db7

commit | commitdiff | tree

Dirk Dougherty [Tue, 30 Aug 2016 17:09:53 +0000 (17:09 +0000)]

Fetch ga script over https to avoid mixed content. am: b5760c1fe7 am: 9ca38e3379
am: d3a7388469

Change-Id: I22fcacf94b4553379893bdc8ece9ebac4f62c3bd

commit | commitdiff | tree

Brian Duddie [Tue, 30 Aug 2016 17:09:48 +0000 (17:09 +0000)]

Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev am: 6bf3424ccf am: 34230195ab
am: 05f7e7aedf

Change-Id: I145a9a8655bdba5fa2af745db9c8c358d96efe79

commit | commitdiff | tree

Andrew Rossignol [Tue, 30 Aug 2016 17:09:45 +0000 (17:09 +0000)]

ContextHub: Avoid reference leaks am: c35104535c am: e2478c4cb6
am: e2107bfe13

Change-Id: Ice5979ec7e118a74abf4eb66267c7a1238f162b7

commit | commitdiff | tree

Neil Fuller [Tue, 30 Aug 2016 17:01:39 +0000 (17:01 +0000)]

Merge "Track java.lang.reflect.Executable API changes" am: 43ec5716aa am: eefc000601 am: d8d495f1eb
am: d97db3e80e

Change-Id: I01b15ae35aa3c66e4d98938bf1270ea2c4194a4a

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 17:01:33 +0000 (17:01 +0000)]

Merge "Backup system QS tiles" into nyc-dr1-dev am: f498d0d384 am: 68d7519060 am: b481f7ce7d
am: a99df5eee1

Change-Id: I4506095378615a3a92b472187c5a58f1f5604317

commit | commitdiff | tree

Jason Monk [Tue, 30 Aug 2016 14:54:03 +0000 (10:54 -0400)]

resolve merge conflicts of d70ed99 to master

Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a

commit | commitdiff | tree

Victor Chang [Tue, 30 Aug 2016 12:38:51 +0000 (12:38 +0000)]

Merge "forceUpdateUserSetupComplete should have no effect in user build"

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 02:00:04 +0000 (02:00 +0000)]

Merge "Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: c9c0bcf6a9 am: df8c802677 am: ee8d1394e3" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 01:59:56 +0000 (01:59 +0000)]

Merge "Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e am: ed596e6836 am: 169a18d87e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 01:59:47 +0000 (01:59 +0000)]

Merge "Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: c52edb4f24 am: b35ae808c0 am: a17beb7869" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 01:59:38 +0000 (01:59 +0000)]

Merge "Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc am: dd51fb20f3 am: 15f24a36d5" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 30 Aug 2016 01:59:29 +0000 (01:59 +0000)]

Merge "whitelist sms code for TMO-DE and TMO-MK. am: 6af315af94 am: f4be3d2927 am: 30c49a0a1b -s ours" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Tue, 30 Aug 2016 01:58:33 +0000 (01:58 +0000)]

Merge "Fixed a bug where notifications could reappear" into nyc-dev am: 4226dcef1e am: c9c0bcf6a9 am: df8c802677
am: ee8d1394e3

Change-Id: I8e09eb9134050ba04192751ada2bbf7c9f1d89b2

commit | commitdiff | tree

Selim Cinek [Tue, 30 Aug 2016 01:58:20 +0000 (01:58 +0000)]

Fixed a bug where notifications could reappear am: f3b64692a3 am: e90d6d682e am: ed596e6836
am: 169a18d87e

Change-Id: I2445478f1d67d668fc27a71ca33c283b78836fa4

commit | commitdiff | tree

Selim Cinek [Tue, 30 Aug 2016 01:58:12 +0000 (01:58 +0000)]

Fixed a bug where the headsup would be stuck disappearing am: a4155bb7c0 am: c52edb4f24 am: b35ae808c0
am: a17beb7869

Change-Id: I15d5a0c73b7b9c5ec8d19c43548bf85c9a638bc3

commit | commitdiff | tree

Vineeta Srivastava [Tue, 30 Aug 2016 01:58:07 +0000 (01:58 +0000)]

Merge "whitelist sms code for TMO-DE and TMO-MK." into nyc-dr1-dev am: 24b0486cdc am: dd51fb20f3
am: 15f24a36d5

Change-Id: I9a7d834a0841d93a7e2eef59494552fe213a0688