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

Sergei Vasilinetc [Fri, 3 Feb 2017 01:08:23 +0000 (01:08 +0000)]

Merge "Check if layer is created in detachSurfaceTexture"

Jeff Sharkey [Fri, 3 Feb 2017 00:56:31 +0000 (00:56 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: 3985bf958e
am: 635ebe5d2c -s ours

Change-Id: I30e5d2fbe96d4c25bdeac139537f9575fe9c8cb6

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:55:28 +0000 (00:55 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b am: 9285808f9d
am: 3f68664be2 -s ours

Change-Id: I19c59253ddf20ec3d5d8fed6075408919d9ab06b

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:54:28 +0000 (00:54 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b am: d4eff25f9f
am: 9c3cc88067 -s ours

Change-Id: Idbd485ae40ffb78dea134903fbcbb52bcca89b52

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:53:36 +0000 (00:53 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 am: 190511955f
am: 8fa9048477 -s ours

Change-Id: Ia27d7b8170386df35a895c917d235bdd312827ca

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:47:40 +0000 (00:47 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315
am: 3985bf958e

Change-Id: Ib79d5010b4de507e66cb9a301c152d2f3c81d706

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:46:49 +0000 (00:46 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b
am: 9285808f9d

Change-Id: Ifde04e3733d5aa69968a21a1af7dbc4b0094797d

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:39:31 +0000 (00:39 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6
am: 609145c315

Change-Id: I212139b16c6b00a3a1b61a851bb7f7099ecf2120

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:38:43 +0000 (00:38 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe
am: e25ab62f5b

Change-Id: Id801fbb628423a239da2db2a058ed7a9dcf1c46a

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:34:07 +0000 (00:34 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d
am: 6db504c6f6

Change-Id: I4d1e712d09daae9621c5acf336b9ead190920e98

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:33:14 +0000 (00:33 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b
am: e79d2be2fe

Change-Id: I1d9b46d67928221e3d06a5f17031e8ca63067280

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:24:43 +0000 (00:24 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b
am: d4eff25f9f

Change-Id: I9676c155e718b25830980da5792b49e25c1ccecd

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:23:44 +0000 (00:23 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481
am: 190511955f

Change-Id: I0a4149d160f990357e4e8ee7229bfbdf68b67a68

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:32 +0000 (00:22 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31
am: 5536402f6d

Change-Id: I90da8f03fecb6307cfae5bd4a8fec48a6136d29f

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 00:22:03 +0000 (00:22 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours am: cda0f97790 -s ours am: 339dd0a4b2 -s ours
am: ee718b32b8 -s ours

Change-Id: Ie343d1a241ef0554eb844aa51e115dc6c340148b

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:21:19 +0000 (00:21 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d
am: d819c2386b

Change-Id: I6f5d0680a0cd60a02060851bcdbb0d1fa2494688

commit | commitdiff | tree

Selim Cinek [Fri, 3 Feb 2017 00:20:56 +0000 (00:20 +0000)]

Merge "Fixed that the HUN layout could be visible on Keyguard" into nyc-mr2-dev am: 9c95a9ccc6
am: bbed7fcf51 -s ours

Change-Id: Ie7a9edce4b25f439653e9caaa3997a722c84296c

commit | commitdiff | tree

Selim Cinek [Fri, 3 Feb 2017 00:19:57 +0000 (00:19 +0000)]

Fixed that the HUN layout could be visible on Keyguard am: b5aa599eec
am: f402af2081 -s ours

Change-Id: Ief66ace14aba3896d3b23701476fa6fab55b49c5

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:19:25 +0000 (00:19 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36
am: 806307106b

Change-Id: Ia5544d9edc2a5e2eb9582423afc164d56049d754

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:18:38 +0000 (00:18 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3
am: 30a4388481

Change-Id: I5088038dbd457b7d2314a014da11ebd14192a211

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:12:19 +0000 (00:12 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
am: 0354b89d31

Change-Id: I186f3fc1530e8a554916f83bf8e9fb98adceb507

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:12:15 +0000 (00:12 +0000)]

DO NOT MERGE. No direct Uri grants from system.
am: 3e2652a55d

Change-Id: I19c72afa1d6407786b4a02d232f8489c42ea700d

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:10:09 +0000 (00:10 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
am: 6b8ae05e36

Change-Id: I3390fac08bf7047fce526b2553c1fb2908c4167c

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)]

DO NOT MERGE. No direct Uri grants from system.
am: b61338ecb3

Change-Id: I56e937265e43bc9dd0adbe24167ae52b5bc0b818

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 00:09:52 +0000 (00:09 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours am: cda0f97790 -s ours
am: 339dd0a4b2 -s ours

Change-Id: I71476a462b787607bdfb4c5bfef46869d5ed2ded

commit | commitdiff | tree

Manu Cornet [Fri, 3 Feb 2017 00:09:51 +0000 (00:09 +0000)]

Merge "2D Recents: fix toggling behavior" into nyc-mr2-dev am: f69e421f48
am: 661c6399de

Change-Id: I038c4d531ae669fcc33d3a4b6653d3906adc5219

commit | commitdiff | tree

Manu Cornet [Fri, 3 Feb 2017 00:08:45 +0000 (00:08 +0000)]

2D Recents: fix toggling behavior am: a96a617a4e
am: 7a1a3d4529

Change-Id: I0945901cd50e98b9dc4e7b10a23077fbd1e0350c

commit | commitdiff | tree

Selim Cinek [Fri, 3 Feb 2017 00:08:17 +0000 (00:08 +0000)]

Merge "Fixed that the HUN layout could be visible on Keyguard" into nyc-mr2-dev
am: 9c95a9ccc6

Change-Id: I1166fd47e50396f2a5c1159d35f8c27b8e4170bb

commit | commitdiff | tree

Selim Cinek [Fri, 3 Feb 2017 00:08:06 +0000 (00:08 +0000)]

Fixed that the HUN layout could be visible on Keyguard
am: b5aa599eec

Change-Id: Ieb75c720899a8d120df8d45ec5a6beab476cec19

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 00:07:29 +0000 (00:07 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours am: 58d9af0c77 -s ours am: 90b3d5a55d -s ours
am: 6f5506141d -s ours

Change-Id: I9195d4891c5f9d2e41e9c9e511ac60b3509f33b6

commit | commitdiff | tree

Manu Cornet [Fri, 3 Feb 2017 00:02:28 +0000 (00:02 +0000)]

Merge "2D Recents: fix toggling behavior" into nyc-mr2-dev
am: f69e421f48

Change-Id: Ia082e5415644fdda4bb60d05465d99767fa8dd7f

commit | commitdiff | tree

Manu Cornet [Fri, 3 Feb 2017 00:02:22 +0000 (00:02 +0000)]

2D Recents: fix toggling behavior
am: a96a617a4e

Change-Id: I8978e8ae81e3566e83ca3d7819b95d54c5861b67

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 00:02:16 +0000 (00:02 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours
am: cda0f97790 -s ours

Change-Id: Icdd1d73aed0798a98d960c931dfb36ed9f350212

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 00:01:25 +0000 (00:01 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours am: 58d9af0c77 -s ours
am: 90b3d5a55d -s ours

Change-Id: I02ba8bf9bb3cf8c7ebbf6f94f93ef161c919f873

commit | commitdiff | tree

Jeff Sharkey [Thu, 2 Feb 2017 23:59:37 +0000 (23:59 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev

commit | commitdiff | tree

Jeff Sharkey [Thu, 2 Feb 2017 23:59:37 +0000 (23:59 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev

commit | commitdiff | tree

Selim Cinek [Thu, 2 Feb 2017 23:59:05 +0000 (23:59 +0000)]

Merge "Increased the collapsed size of messaging notifications"

commit | commitdiff | tree

Selim Cinek [Thu, 2 Feb 2017 23:58:19 +0000 (23:58 +0000)]

Merge "Fixed that the HUN layout could be visible on Keyguard" into nyc-mr2-dev

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:57:44 +0000 (23:57 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours
am: 6b398f72cb -s ours

Change-Id: Idbbf54525fa0b14db3ff710e3e50958c8e80a515

commit | commitdiff | tree

Manu Cornet [Thu, 2 Feb 2017 23:56:17 +0000 (23:56 +0000)]

Merge "2D Recents: fix toggling behavior" into nyc-mr2-dev

commit | commitdiff | tree

Selim Cinek [Thu, 2 Feb 2017 23:55:56 +0000 (23:55 +0000)]

Merge "Fixed that the HUN layout could be visible on Keyguard"

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:54:43 +0000 (23:54 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours
am: 58d9af0c77 -s ours

Change-Id: I0d4b2eb0150fab973c721ad59524ccf9a97aa778

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:53:23 +0000 (23:53 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours
am: bcc2e70d40 -s ours

Change-Id: I9fd4eab1c0c4728965678e47cffe1c5bfa0b3638

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:49:45 +0000 (23:49 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours
am: e3d5ea3a18 -s ours

Change-Id: Ia68ce30d01f44d47f5edd1c7200912179f84efaf

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:48:18 +0000 (23:48 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours
am: 32c6684a67 -s ours

Change-Id: I0db97d059b78d12aba30255cfc357f51018d5548

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:46:06 +0000 (23:46 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428 am: 710a7e40dc am: 138c99e8c0
am: 5f491c1572 -s ours

Change-Id: Ibe9fb9ebc06fd8336e289714a35aa89b3411836c

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:45:40 +0000 (23:45 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours
am: 56be9656f7 -s ours

Change-Id: I017e9d54ab618f9955787cfa4374868b94b3d8d7

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:43:18 +0000 (23:43 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:41:24 +0000 (23:41 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428 am: 710a7e40dc
am: 138c99e8c0

Change-Id: I19d78d0d7625ab2ff3897c93b693dc73cd6741fa

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:41:18 +0000 (23:41 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours
am: 6b1fd0f9cf -s ours

Change-Id: Ia8301b1e589f87a4cb428cd7644ee6b5944f54a5

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:37:25 +0000 (23:37 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:36:21 +0000 (23:36 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd am: 7314106770
am: 9665145f5b -s ours

Change-Id: I1fe1db3803622ddb831c9e2a42f17f4a1d698a51

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:35:42 +0000 (23:35 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428
am: 710a7e40dc

Change-Id: Ifbb162d177ef475d7abd7a97d632493fee5f4085

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:35:42 +0000 (23:35 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:35:23 +0000 (23:35 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b am: 3411150115 am: d176e0a508
am: 475fb1fbab -s ours

Change-Id: I3997eb84b06c2e94be7108f44e549067fec102ae

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:31:51 +0000 (23:31 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8
am: 67a4d3e428

Change-Id: I5f41628b921b53ba4cd5588404fe28c4b77b29ea

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:31:41 +0000 (23:31 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:31:09 +0000 (23:31 +0000)]

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb am: f565a487bb am: e06c03d843 am: d7aa4db998
am: 34722d7c01

Change-Id: I1c0a2044c2eaf09ce3385fce89d425a2befd7dc4

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:26:38 +0000 (23:26 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours
am: 64e2b4f825 -s ours

Change-Id: Ic1a85765c15ba86b594f7ba654d4a211db91e3a2

commit | commitdiff | tree

Hakan Seyalioglu [Thu, 2 Feb 2017 23:26:26 +0000 (23:26 +0000)]

Merge "DO NOT MERGE - Check exported status in chooser" into nyc-mr2-dev am: a5a296e661
am: 8be3372bd6 -s ours

Change-Id: I90becc70fea2674d28d7ffb28e523f2f96f9a05f

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:26:21 +0000 (23:26 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733
am: dcc633f1f8

Change-Id: I0249dfa725ca30353d557396b3ffe1b1f5169dad

commit | commitdiff | tree

Hakan Seyalioglu [Thu, 2 Feb 2017 23:25:21 +0000 (23:25 +0000)]

DO NOT MERGE - Check exported status in chooser am: e3286c3145
am: 531def93f0 -s ours

Change-Id: I6ab080f26174b48c4efba25395869e4dafedc9c6

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:24:38 +0000 (23:24 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours
am: c1a0e6db4c -s ours

Change-Id: Ide2acd4e61618be87ad4c32d735a4cd7f3781d0b

Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d am: 281fae21f8 am: eeeb10c645
am: 637c407d78 -s ours

Change-Id: Ia36702e0d637666344b2adbf813d348404b410c7

commit | commitdiff | tree

Manu Cornet [Thu, 2 Feb 2017 23:22:56 +0000 (23:22 +0000)]

Merge "2D Recents: Less drastic scale reduction for dismiss animation" into nyc-mr2-dev am: c01308a03c
am: ce4606a05f

Change-Id: I81be1f4cf1056fbcfbef49556906c770e7b41840

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:22:54 +0000 (23:22 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58 am: b2cdb4e2dd
am: 7314106770

Change-Id: Ib906f8ca2b1b7c03ca1ea93941d9708b109f232f

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:21:56 +0000 (23:21 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b am: 3411150115
am: d176e0a508

Change-Id: I524217495255a77580e33ccb07563fcb65607a6e

commit | commitdiff | tree

Manu Cornet [Thu, 2 Feb 2017 23:21:56 +0000 (23:21 +0000)]

2D Recents: Less drastic scale reduction for dismiss animation am: 8ea36af22b
am: 69f9c6073d

Change-Id: I60cc6ab90e224c82524a36bc2d5123d0cda95fa0

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:21:37 +0000 (23:21 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours
am: 3f7ed73fdd -s ours

Change-Id: I42ed0e37dc68919a2a3e6b9b6aaa5030a90eca77

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:20:59 +0000 (23:20 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 4ffe72dcc8 am: ab8d3febd3 am: 2e6bdbeaab am: 588411fc7c -s ours am: 773f85ec60 am: 029364c505 am: 2f1b2d82ca am: ac8f44e387 am: 674cefc5f5
am: fd8ccd934a -s ours

Change-Id: Ic0d5b6c9a31227b5650fa25244fc3a2a553b1359

commit | commitdiff | tree

Manu Cornet [Thu, 2 Feb 2017 23:20:06 +0000 (23:20 +0000)]

Merge "2D Recents: Fix issues with thumbnail scaling transitions" into nyc-mr2-dev am: f41a8c5a3d
am: 10b7963547

Change-Id: Ie00ba28ca5ac20a579231892d37abd1f3580ecab

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:19:12 +0000 (23:19 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours
am: f1e045b733

Change-Id: I6cfa97f2f4fd113cafcca5440eafd6c5bf70698b

commit | commitdiff | tree

Manu Cornet [Thu, 2 Feb 2017 23:19:05 +0000 (23:19 +0000)]

2D Recents: Fix issues with thumbnail scaling transitions am: 57b6149f8b
am: 6f5bb1f340

Change-Id: I0556939ca9c94965865ac050a98981a347f6d0aa

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:18:07 +0000 (23:18 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours
am: bf1c88f34e -s ours

Change-Id: I75d702680bc6ef22e0f60a3c165cd310bf2bb6cf

commit | commitdiff | tree

Makoto Onuki [Thu, 2 Feb 2017 23:18:05 +0000 (23:18 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc am: 963cba5b5b am: f1e276384d -s ours am: 3d45f12cad -s ours
am: 40c83c5b0f -s ours

Change-Id: I4425ab8e2b6a7c51d1da2f7da52ae0e498648f9c

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:17:40 +0000 (23:17 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58
am: b2cdb4e2dd

Change-Id: I304954cb2b7d67030714b4b43098aaab4d61c67e

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:17:06 +0000 (23:17 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours
am: a3685e4bb5 -s ours

Change-Id: If22ee3dec4879f8324a66dea910bb65c9f6eda14

commit | commitdiff | tree

Philip P. Moltmann [Thu, 2 Feb 2017 23:16:47 +0000 (23:16 +0000)]

Merge "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms" into nyc-mr2-dev am: 65924030d6
am: 962db24548 -s ours

Change-Id: I5542b89150066d5b10bac38fd05a42237b60bbd5

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:16:39 +0000 (23:16 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b
am: 3411150115

Change-Id: I735a0801698f926c6230311c887c58f6fcf86576

commit | commitdiff | tree

Philip P. Moltmann [Thu, 2 Feb 2017 23:15:53 +0000 (23:15 +0000)]

[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms am: 2fc44947dd
am: 416a36a83b -s ours

Change-Id: Ic800b08f1aca058084538b0e862c2255ab96fdb0

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:14:43 +0000 (23:14 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a
am: 55176e2d5a -s ours

Change-Id: If9f0a189981a49d36662ad4e90d3278be35148d0

commit | commitdiff | tree

Paul Lawrence [Thu, 2 Feb 2017 23:14:22 +0000 (23:14 +0000)]

Merge "Install seccomp into zygote not init" am: ba9bbd8517 am: dcf63748fc am: 5a389e7e44
am: 299227693c

Change-Id: Iaf077a1adfc25c5b3eff91058f35f58155438fbe

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:13:03 +0000 (23:13 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours
am: d9c8155943 -s ours

Change-Id: I9dfff7471440739580e7827cdb4484fad6900048

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:12:32 +0000 (23:12 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0
am: 5a2e7e2e58

Change-Id: I336ce9f979c74df32ea80cd43253485ce184d0c0

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb am: f565a487bb am: e06c03d843
am: d7aa4db998

Change-Id: I7b72fc5e77b69dc03f788ccaf1320f6c68e5197d

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:12:05 +0000 (23:12 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours
am: 051f01700e -s ours

Change-Id: Idcf3ce991369a6e41a3c2bd3aa9cd16d909eea13

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:11:34 +0000 (23:11 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e
am: a293067f0b

Change-Id: Idf95cea3331afbab3f6c69ced3341a7fa1dac2e1

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:10:10 +0000 (23:10 +0000)]

commit | commitdiff | tree

Paul Lawrence [Thu, 2 Feb 2017 23:08:50 +0000 (23:08 +0000)]

Merge "resolve merge conflicts of fde0a41065eb to master"

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:07:36 +0000 (23:07 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
am: af85feef36 -s ours

Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:07:34 +0000 (23:07 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 14ed611912 -s ours

Change-Id: I1645d15febdfffd76cd2c592241549c507db1185

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb am: f565a487bb
am: e06c03d843

Change-Id: I4a42274fe5646f41364abf144e39110522d48db4

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:06:08 +0000 (23:06 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc
am: 73d19fc1a0

Change-Id: I3d09ae3d8683f9f4a2c68321eb4fdd9490c9355b

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:05:10 +0000 (23:05 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf
am: 642912652e

Change-Id: Ie6d665f3cb2aae6e8043b4bde28005a2aaa94953

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:05:09 +0000 (23:05 +0000)]

Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb
am: f565a487bb

Change-Id: Ia8861b784be1b25dae59cea5b2eb288ec739e346

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:01:14 +0000 (23:01 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours
am: ea91d2d0cc

Change-Id: I4f5ae380b111b21838744c83eda1e3772d705692

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:00:10 +0000 (23:00 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours
am: 5fce769ecf

Change-Id: I903e7a49df102aaa442cfb49040cd99bb2e7f0f2

commit | commitdiff | tree

Suprabh Shukla [Thu, 2 Feb 2017 23:00:07 +0000 (23:00 +0000)]