OSDN Git Service
John Reck [Wed, 31 Aug 2016 04:59:40 +0000 (04:59 +0000)]
Merge "Cherry pick TextureView fixes" into nyc-dev am:
8eaa65b867 am:
25c6b37613 am:
24a082cd49 am:
8960d573f2
am:
2952597e7f
Change-Id: I2ffc729c026575b42787977e58a26ac94b13fa46
Chris Craik [Wed, 31 Aug 2016 04:59:36 +0000 (04:59 +0000)]
Cherry pick TextureView fixes am:
2e8a8a2432 am:
05cb60846c am:
2e5e9feaef am:
726728d148
am:
e57c721c12
Change-Id: I320f641971f152773016aadbdbb01482593cbf87
Pankaj Kanwar [Wed, 31 Aug 2016 04:53:48 +0000 (04:53 +0000)]
Merge "Allow getResponseCode to block if response hasn't been received from remote" into nyc-mr1-dev am:
8a4db04893 am:
ce53fb13c8
am:
5ba225652a
Change-Id: I4293e1ae0ee04595c11189f995a65f609a89fc71
Ajay Panicker [Wed, 31 Aug 2016 04:53:45 +0000 (04:53 +0000)]
Allow getResponseCode to block if response hasn't been received from remote am:
c3ae4db069 am:
ffabe1cf7d
am:
fb91f41e04
Change-Id: Idd0dfbf7b75533ea8b65849b40da55583d84dac1
Philip P. Moltmann [Wed, 31 Aug 2016 04:53:42 +0000 (04:53 +0000)]
Merge "Hold no locks when calling RemotePrintSpooler" into nyc-mr1-dev am:
23f6f13eab am:
da2ea93dbe
am:
197fbeebce
Change-Id: Ic248f01fb0846ba4a778412f8804c74a7ccebb03
Philip P. Moltmann [Wed, 31 Aug 2016 04:53:39 +0000 (04:53 +0000)]
Hold no locks when calling RemotePrintSpooler am:
1d6e7cc536 am:
684aa472cd
am:
ed30002d12
Change-Id: Ief32708f5f2745e1f27c15b5d174acc0f97f9719
Yohei Yukawa [Wed, 31 Aug 2016 04:53:35 +0000 (04:53 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-dev am:
b7efddfc41 am:
15946bd93c am:
04e7bc8ea4 am:
7dd5f81c42
am:
deb91b89f9
Change-Id: I3d0c5ee63fc1101f2d39b6c10cacb36df3a65a03
Yohei Yukawa [Wed, 31 Aug 2016 04:37:32 +0000 (04:37 +0000)]
Make sure IME focus is synced to View focus am:
8eb07090a4 -s ours am:
ef53c0f5ec am:
74e5244fde am:
e79b052f51
am:
7142f1cd62
Change-Id: Ic51af041777ce8c517cf17560a77d5bd6ce4e2f3
Ben Lin [Wed, 31 Aug 2016 04:37:23 +0000 (04:37 +0000)]
Merge "Push delete notification when Bug reports are deleted." into nyc-mr1-dev am:
cd97d925c0 am:
993f368dc5
am:
c0b3b23f43
Change-Id: I30c8aae1517ff217f12c709176a5f58b4aa30a38
Ben Lin [Wed, 31 Aug 2016 04:37:16 +0000 (04:37 +0000)]
Push delete notification when Bug reports are deleted. am:
86805aa3af am:
64146c5d24
am:
b01be62d58
Change-Id: I8e1b6dc42e44307feef1ba912a3465c2d25594e1
Chet Haase [Wed, 31 Aug 2016 04:37:09 +0000 (04:37 +0000)]
Merge "ChooserActivity: Cannot start app that the icon overflows the layout" into nyc-dev am:
59fb472858 am:
6a8b5585aa am:
d987f227e1 am:
e0426bc12a
am:
ff65f5e37a
Change-Id: I6fcf22a7a17772a780a12097e77015e3e2883e85
Yuichi Biwa [Wed, 31 Aug 2016 04:37:05 +0000 (04:37 +0000)]
ChooserActivity: Cannot start app that the icon overflows the layout am:
cb3e1237b5 am:
96ecd77dc8 am:
d728854401 am:
94cdd1c23e
am:
a52f1b4116
Change-Id: I72a926eb8b13e6fbe4656f9d0f01c392d66a10e2
Chet Haase [Wed, 31 Aug 2016 04:31:15 +0000 (04:31 +0000)]
Merge "Set up view state before attaching, jump drawables if needed" into nyc-dev am:
22e006214c am:
26849eca9c am:
20c29b0c9b am:
1861b0b4d0
am:
7536a773cc
Change-Id: I8165af88d024cbf7059bf47def81f3b444993bdb
Alan Viverette [Wed, 31 Aug 2016 04:31:09 +0000 (04:31 +0000)]
Set up view state before attaching, jump drawables if needed am:
c328f042a6 -s ours am:
54e7cbe563 am:
257d8ea408 am:
baa4e40740
am:
cb19d9637e
Change-Id: Ia0b18ac7341167133dbaa0ac912276a148e97b01
Chet Haase [Wed, 31 Aug 2016 04:31:01 +0000 (04:31 +0000)]
Merge "Force AlertDialogLayout to have gravity start|top" into nyc-dev am:
a1bbb76806 am:
373f7c04fd am:
d89f74710c am:
950217589f
am:
f9357c4aa5
Change-Id: I1e55b278fadd2985b8d755ebd20fa18bb027c48f
Adam Powell [Wed, 31 Aug 2016 04:30:57 +0000 (04:30 +0000)]
Force AlertDialogLayout to have gravity start|top am:
00c4f7ba65 am:
96bdf5ca7b am:
5d7e5ef0ef am:
357487c9ea
am:
7ed976de65
Change-Id: Ifea1942f4e3a7f00a0af1cd062e0a4ebbebe67a6
Chet Haase [Wed, 31 Aug 2016 04:30:53 +0000 (04:30 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-dev am:
c80a4d7ae3 am:
6ff5fafeca am:
73b9053643 am:
8ee346bf4b
am:
c570e9ea76
Change-Id: I1df4ca39ab6bc95d2bbf02a36f5f5a1d2ae55801
Abodunrinwa Toki [Wed, 31 Aug 2016 04:25:43 +0000 (04:25 +0000)]
FloatingActionMode: Fix screen coordinates. am:
99c340cad9 am:
cba50af05e am:
7571fabd8a am:
c89b73f43a
am:
7ab6386e04
Change-Id: I31983c296013ce7367033d14eeee4e05821b8f30
Fei Wu [Wed, 31 Aug 2016 04:25:36 +0000 (04:25 +0000)]
Merge "Use png for switch in SwitchPreference on watch" into cw-f-dev am:
40d869222f
am:
8bea286a0c
Change-Id: If8632e9c3059ad9854ca9299857a00bd97f295f9
FEI WU [Wed, 31 Aug 2016 04:25:29 +0000 (04:25 +0000)]
Use png for switch in SwitchPreference on watch am:
798e2ba605
am:
0eac3bb98e
Change-Id: Id3f90e96ed5b6bacfb0618a2ac16a111bc226da4
Christopher Tate [Wed, 31 Aug 2016 04:25:24 +0000 (04:25 +0000)]
Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev am:
2bbfe98062 am:
e9ca3ec441 am:
69bac672b4 am:
7cdeaf53bb
am:
4d7e5602a6
Change-Id: I708076932a95f6112ddddd4fb3925be7562124bd
Christopher Tate [Wed, 31 Aug 2016 04:25:19 +0000 (04:25 +0000)]
Eliminate next-alarm-clock broadcast flapping am:
c60da1edc1 am:
ef05b70110 am:
4da1432fe6 am:
c786c2663e
am:
528f552d59
Change-Id: I2ba4fc51a4b0c6902c74981a70bb607d12dac771
Philip P. Moltmann [Wed, 31 Aug 2016 04:17:48 +0000 (04:17 +0000)]
Merge "Size print destination to support font sizing" into nyc-mr1-dev am:
47758a178a am:
3db1001247
am:
19e6ab4749
Change-Id: I1e3bcf7b214951f7f702c75684da013ac78d6b6a
Philip P. Moltmann [Wed, 31 Aug 2016 04:17:38 +0000 (04:17 +0000)]
Size print destination to support font sizing am:
cb1926afba am:
c0bbf28dca
am:
daf21fa96e
Change-Id: I049ba545e75d5345fe67d000553388f36d36a128
Pankaj Kanwar [Wed, 31 Aug 2016 04:17:27 +0000 (04:17 +0000)]
Merge "Update InCallService#onConnectionEvent comments." into nyc-dr1-dev am:
d5b8c80b51 am:
30fc10364a am:
1715ca3f15
am:
b0235d3c9f
Change-Id: Ia1a1caef85f8713f99988353dd8ba452bd8ea71b
Tyler Gunn [Wed, 31 Aug 2016 04:17:17 +0000 (04:17 +0000)]
Update InCallService#onConnectionEvent comments. am:
06f3fa66b7 am:
e3222569c2 am:
837186e18f
am:
a71f7d76dd
Change-Id: Idbf160bf09ad99ed13824b1a811edde6afd28d9a
Andrii Kulian [Wed, 31 Aug 2016 04:17:07 +0000 (04:17 +0000)]
Merge "DO NOT MERGE -- Fix finishing activity in non-focused stack" into nyc-dev am:
c8417676ed am:
2f1662f524 am:
6f200e6933 am:
26d5345d30
am:
70bf1579bb -s ours
Change-Id: I93527b07f1e63b6ad013e679deed93f7f77ea39f
Andrii Kulian [Wed, 31 Aug 2016 04:14:00 +0000 (04:14 +0000)]
DO NOT MERGE -- Fix finishing activity in non-focused stack am:
772c598f66 am:
35c3c8ee8d am:
6a4d45f796 am:
2560a6cd2d
am:
1295b46950 -s ours
Change-Id: I2397ec0b246cc712698596b27a99b5c5b92e017d
Jorim Jaggi [Wed, 31 Aug 2016 04:13:56 +0000 (04:13 +0000)]
Merge "Fix flicker while booting" into nyc-mr1-dev am:
02405fb349 am:
1236822121
am:
e0097c8413
Change-Id: I9721d1c38b6e8f9b845c67b16348c9d524a54e3d
Jorim Jaggi [Wed, 31 Aug 2016 04:13:53 +0000 (04:13 +0000)]
Fix flicker while booting am:
77cbe79b74 am:
49e5c88eda
am:
46a8341458
Change-Id: Ia20d301b9f7e4fe921b8c467002fd2759983e581
Tao Bao [Wed, 31 Aug 2016 04:13:48 +0000 (04:13 +0000)]
Merge "Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4 am:
c5a17fc39f am:
18f9533910 am:
40d926f4d4 am:
7b0db6bf48" into nyc-mr1-dev-plus-aosp
am:
4ace626354
Change-Id: I17125450764f769fa6eb3f06589f4a282f027ab7
Tao Bao [Wed, 31 Aug 2016 04:13:45 +0000 (04:13 +0000)]
Bump up the uncrypt timeout to 30 min. am:
8abcfed8a4 am:
c5a17fc39f am:
18f9533910 am:
40d926f4d4 am:
7b0db6bf48
am:
184ff7a1ee
Change-Id: I2dccbba658d504c93a4f09383b329e6d7d69fba6
Andrii Kulian [Wed, 31 Aug 2016 04:13:35 +0000 (04:13 +0000)]
Merge "Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9 am:
934da4e400 am:
199d4902e2 am:
e77dfe6c74" into nyc-mr1-dev-plus-aosp
am:
c3db6a332d -s ours
Change-Id: Ib60ec5041c31a18688f6add8f3f04ef5a0a6969a
Andrii Kulian [Wed, 31 Aug 2016 04:13:33 +0000 (04:13 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack" into nyc-dev am:
128a4419e9 am:
934da4e400 am:
199d4902e2 am:
e77dfe6c74
am:
61dd3e6964 -s ours
Change-Id: I7032dc3bbc9df49f31dd2d9d8e396a0ddced7448
Andrii Kulian [Wed, 31 Aug 2016 04:05:30 +0000 (04:05 +0000)]
Merge "DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f -s ours am:
febd5c027c am:
8428bfa6e5 am:
91c0b43734" into nyc-mr1-dev-plus-aosp
am:
081c553b15 -s ours
Change-Id: Id245690113e9201905073e226c7243facdaa90ba
Andrii Kulian [Wed, 31 Aug 2016 04:05:26 +0000 (04:05 +0000)]
DO NOT MERGE -- Correctly finish activity in non-focused stack am:
620040db3f -s ours am:
febd5c027c am:
8428bfa6e5 am:
91c0b43734
am:
fe4a9ab428 -s ours
Change-Id: I8c67999bc3c5777bbccc06ea3a503625db665dac
Jason Monk [Wed, 31 Aug 2016 04:05:16 +0000 (04:05 +0000)]
Merge "Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10 am:
db2d30e1b9 am:
1a5a746fa3 am:
566f34f617" into nyc-mr1-dev-plus-aosp
am:
fe72269d88
Change-Id: I781f061a9eb3f96bfbebd3c1fff02b31393cb6dd
Jason Monk [Wed, 31 Aug 2016 04:05:12 +0000 (04:05 +0000)]
Merge "Fix double status bar icons" into nyc-dev am:
2b4e612b10 am:
db2d30e1b9 am:
1a5a746fa3 am:
566f34f617
am:
5d5d2a3992
Change-Id: I1a2838cf6d296e84745df1657b9fe06f9d5ce237
Jason Monk [Wed, 31 Aug 2016 04:04:59 +0000 (04:04 +0000)]
Merge "Fix double status bar icons am:
12124d7eca am:
447991c67a am:
9570287870 am:
5f3ddc7d6d" into nyc-mr1-dev-plus-aosp
am:
1cc92e1297
Change-Id: I46e97039e930496e5af731c6f03629833d996e11
Jason Monk [Wed, 31 Aug 2016 04:04:55 +0000 (04:04 +0000)]
Fix double status bar icons am:
12124d7eca am:
447991c67a am:
9570287870 am:
5f3ddc7d6d
am:
29b285c080
Change-Id: I6c5bd606b62322d0aa0df95888534fcdeb5baa86
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Andreas Gampe [Wed, 31 Aug 2016 02:46:24 +0000 (19:46 -0700)]
resolve merge conflicts of
725b4e6 to master
Change-Id: I79018a9586b8f7b5f69c8e54c8ce78b3acd81d35
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
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
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
Jorim Jaggi [Wed, 31 Aug 2016 01:06:35 +0000 (18:06 -0700)]
resolve merge conflicts of
d33f893 to master
Change-Id: I5851917387af16425f6c4c633931ba75937ffb26
Adam Lesinski [Wed, 31 Aug 2016 00:55:51 +0000 (00:55 +0000)]
Merge "AAPT2 tools: Fix logging in resource file fixer"
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
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
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
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
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
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
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