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

Suprabh Shukla [Fri, 3 Feb 2017 01:25:19 +0000 (01:25 +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: 7c6d80e66c

Change-Id: Ia28ea9874cabde49ce481000e1bdba3d709eaecb

commit | commitdiff | tree

Jack Yu [Fri, 3 Feb 2017 01:19:39 +0000 (01:19 +0000)]

resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp
am: 5c6041843d

Change-Id: I7f0cd240b6054f57616e223f31d09a4152fe34e9

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:17:18 +0000 (01:17 +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: Ie622523996134026550caa6af4c5a858aeb04a60

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3 am: 1eb2ded281
am: badef8c88a

Change-Id: I4fe568d6b43e5a5c06aee6339f6fe4618865c2c6

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:04:21 +0000 (01:04 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3
am: 1eb2ded281

Change-Id: I7b51f2a51a15ca961e345e8540f2f0ff517494d4

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:02:56 +0000 (01:02 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29 am: e6f2767d54
am: c2a168d0ea

Change-Id: Ieb81e3872efd636a632ced390e41e2cd5156c81f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:01:51 +0000 (01:01 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3 am: 1e9b978dc7
am: 4a11140df3

Change-Id: I5706916619ea4498a6a8b681e57b6a4ee1a0d10d

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7
am: e6060558b3

Change-Id: I3c1874a0178425fe0d23659af68d924ade910c65

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29
am: e6f2767d54

Change-Id: I658d46b2c675ecedb08c32275d0cfbb6b84c1f77

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6 am: 2e3a277175
am: 758dede2d8

Change-Id: I8995e6ad4211353c28ac0d97e6908c343f1c8808

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3
am: 1e9b978dc7

Change-Id: I665006f7ec40f409489bfdfa586cab9dfd0222e6

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf
am: ee958351b7

Change-Id: I0413429b94182ce3c7500c3332f110137dceeda7

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c am: 76ce0386db
am: 8f53070436

Change-Id: I8d71d9d8eb575b1b5ed043605b2bf2dce5f939b7

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b
am: fd855eeb29

Change-Id: I7c7a9ef89e04e5420655d4ecba55c37cfacaf84b

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 am: 8501b686f7
am: 5647953584

Change-Id: I9bb45562a4d0b30e2a173d3377101c42a7a58f8f

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4
am: 7a6bd686a3

Change-Id: I30d3bad3c7c6e6779d5c2b964ae4aa5b68b82bbd

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6
am: 2e3a277175

Change-Id: I24b189c0e0c006a06c4c08e64a1de911fa7cc32c

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:47:35 +0000 (00:47 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320
am: 928574895b

Change-Id: I308132391fced2c9de04e8bcfe9784edc5cacb55

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c
am: 76ce0386db

Change-Id: I85d3cd8cb4d67258132cb89f1dbdb4dc75bc8d1b

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:46:45 +0000 (00:46 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472
am: a7388f1ed4

Change-Id: I92e758c2f2a5d978b9fcd4779e486711f7b1ebe3

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9
am: 8501b686f7

Change-Id: Id2cece709462063fd7211dbb04c1f27edf7d64ef

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:45:48 +0000 (00:45 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7
am: d30514edc6

Change-Id: Id0d93a1acb0d2a6d33643a8074b575beac97cee4

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours
am: f19cea14cf

Change-Id: I80e9b340be8824005055d2fc9ab9effa49a3e5d2

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:42:27 +0000 (00:42 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours
am: 1a9c03f320

Change-Id: I22e7edcb7c6f287da63dfd636ffc777453d2b957

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:41:20 +0000 (00:41 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473
am: 86a0c4d4d7

Change-Id: Ia7727ded9f86932d3f31469e40e63bee0a035c59

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:41:16 +0000 (00:41 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours
am: f68199a472

Change-Id: Icea5f48ca2c969328210a000ffe88dc94e70a0c8

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56
am: 06b98e6b3c

Change-Id: I7b9172df8b14f15e0bf6baba2ede19230ac14d30

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5
am: 1007b773b9

Change-Id: I654882046c5024d2cbe939bd2727f15550ba4cef

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:37:48 +0000 (00:37 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours
am: 09d230d473

Change-Id: I058f4db80418f939c2f1e3e6f2b61c40b2a3fd91

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8
am: 2848738526 -s ours

Change-Id: I7c56e83a5de15ec7d3432e3ca4ec385499069f40

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:34:04 +0000 (00:34 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53
am: 4942836d3c -s ours

Change-Id: I72d83bb758c1b70a46eb244d93b932ea2dcf1cb4

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201
am: 33cd012e56

Change-Id: I8444b378a3554ded73e914e332c55e4e0ce36098

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:32:57 +0000 (00:32 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223
am: 8469d52d41 -s ours

Change-Id: Ib3b38a9c4dacf09aeec385e46b464598c0214a76

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846
am: 9f70b6d4c5

Change-Id: I7b5776f73bc99210f018e8e9530f91b032a57d40

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306
am: bdb0c8fc17 -s ours

Change-Id: I2d00e5bd394e93e8b2ac218056f30225580f681b

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c
am: 7c0ea478a8

Change-Id: I5b1974499b3dba96134a14ab5b00a8942a02fe6f

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115
am: b5740f8c53

Change-Id: Ieca522b743bf9d1840b657b19a5a4f4ffe80a8fd

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

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours
am: 0e09e8c201

Change-Id: I07157359ef396832b3c20b745dc09c32b3e85db6

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119
am: fa22018223

Change-Id: Ifb220fbac07f4dcbb455080107ebc765611cf022

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f
am: 8f4f4daf2c

Change-Id: I049f66856f9354432f722fd29248720d76e6c5e1

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

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

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours
am: 4d90982846

Change-Id: I1defb93e1af42c503f94c0af2ad8dbdb361be6ab

commit | commitdiff | tree

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

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

Change-Id: I1dae5df31fbd29f96a3f8adf898fd6c7c716f56e

commit | commitdiff | tree

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

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

Change-Id: I19ff97bb24c7cf985c8877b0c365f6eb4624fe80

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:45 +0000 (00:12 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
am: e6be8d765f

Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897

commit | commitdiff | tree

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

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

Change-Id: I87dbe96e14c68b5d99b43bf7ad3d653d5fb33a61

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
am: 1f007d1471 -s ours

Change-Id: I5fb0f4d1ebf169c8e1309c1d7549d34b362c8328

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system.
am: 021747a076 -s ours

Change-Id: Id5d516b36b7cafc364d49109813d12f73ddb4684

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:12:11 +0000 (00:12 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
am: 7115ad7119

Change-Id: Ib9e5a56a4bac34dbf9ef3fc4122d4a2ac1e0bb7e

commit | commitdiff | tree

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

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

Change-Id: Ia946b314e7c12c5a04f6c117a9b2e2537fc006e9

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

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

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:40 +0000 (23:59 +0000)]

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-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-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: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

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: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)]

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

Change-Id: Ic815923ff5d6cafced9d155d7188acc4ba8c4d6a

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: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)]

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

Change-Id: I59f0209f21655e63bc06429861188aea1b2d16ee

commit | commitdiff | tree

Jack Yu [Thu, 2 Feb 2017 23:32:36 +0000 (15:32 -0800)]

resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp

Test: Manual test
Change-Id: I13f288c5056b672eec00f850f9d2ee6db73b7a44

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)]

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

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

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

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