OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 01:07:09 +0000 (01:07 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43  -s ours
am: 43f79eec8b

Change-Id: I46242f1ea9d7a2e63267c1d3d77c6ab3c5957435

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfaf...
Jeff Sharkey [Fri, 3 Feb 2017 01:06:20 +0000 (01:06 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7  -s ours
am: 65b0a6f596

Change-Id: Icf99c3f53e7281792db74ba5902ebf168bf07944

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
Jeff Sharkey [Fri, 3 Feb 2017 01:05:28 +0000 (01:05 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e  -s ours
am: bafa3c1d3b

Change-Id: Ifacdf34a063571d521dc635003ddabb3228460d4

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s...
Jeff Sharkey [Fri, 3 Feb 2017 01:04:24 +0000 (01:04 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0  -s ours
am: cdb996355e

Change-Id: I5129414295d369564a603da928f19ee6b74d2d9f

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 00:59:32 +0000 (00:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3
am: 4d1c25ec43  -s ours

Change-Id: I3a65198bb51f19e7b655d1da0a081fafbae066fd

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfaf...
Jeff Sharkey [Fri, 3 Feb 2017 00:58:38 +0000 (00:58 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642
am: bf16fab4e7  -s ours

Change-Id: Ie048d01183ce63035cfa63ab54414b40f0b2b2c7

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
Jeff Sharkey [Fri, 3 Feb 2017 00:57:39 +0000 (00:57 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b
am: 394357761e  -s ours

Change-Id: I8330da471c2770612f2898339f567b05853a2479

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s...
Jeff Sharkey [Fri, 3 Feb 2017 00:56:34 +0000 (00:56 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b
am: 56131cf7c0  -s ours

Change-Id: I2ca1c4bc0585eee8759d74c5e2a0b90afcd987dc

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 00:53:49 +0000 (00:53 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours am: 4b0164b27c am: 00af0a6d2c
am: b4c5c522e3

Change-Id: Iae12207ee70e0212fce0f04a34891b7e20f7aeb0

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfaf...
Jeff Sharkey [Fri, 3 Feb 2017 00:50:28 +0000 (00:50 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours am: 9346bec730 am: c0cc8695a5
am: f51e8e8642

Change-Id: I94a2e244e7ab2d9571632f2d79fcce0ed38e3320

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
Jeff Sharkey [Fri, 3 Feb 2017 00:49:28 +0000 (00:49 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173
am: 4b3c59005b

Change-Id: Ibc4221c090b1dab98c085486733c987d96c99210

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s...
Jeff Sharkey [Fri, 3 Feb 2017 00:48:41 +0000 (00:48 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours am: 05749525a5 am: bd2bec9164
am: 1ddaf2f96b

Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 00:43:16 +0000 (00:43 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours am: 4b0164b27c
am: 00af0a6d2c

Change-Id: I367da25f89c5c982f6eacaa1929dbbcbf15801f0

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfaf...
Jeff Sharkey [Fri, 3 Feb 2017 00:42:23 +0000 (00:42 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours am: 9346bec730
am: c0cc8695a5

Change-Id: Ia0e1987122659a913145fc86a6626e0dd1890f24

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
Jeff Sharkey [Fri, 3 Feb 2017 00:40:52 +0000 (00:40 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074
am: 8c9ff68173

Change-Id: Iaa739f638e66376a2aa145a465255f738f9b3f1b

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s...
Jeff Sharkey [Fri, 3 Feb 2017 00:40:04 +0000 (00:40 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours am: 05749525a5
am: bd2bec9164

Change-Id: I9d9889577061ada5de8c0213ec73d257469466e8

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 00:35:19 +0000 (00:35 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d am: d20b04a41d  -s ours
am: 4b0164b27c

Change-Id: I4dda89507d1003f82af6e204c9983732b36927da

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfaf...
Jeff Sharkey [Fri, 3 Feb 2017 00:34:33 +0000 (00:34 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours
am: 9346bec730

Change-Id: I456a98abbdcb7d6f7d959a791da726f56f55edf8

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5...
Jeff Sharkey [Fri, 3 Feb 2017 00:33:40 +0000 (00:33 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours
am: f82c373074

Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s...
Jeff Sharkey [Fri, 3 Feb 2017 00:32:49 +0000 (00:32 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours
am: 05749525a5

Change-Id: Id298d130a52b44ad9252f8a65c88bb63fbb86f7f

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 00:30:04 +0000 (00:30 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours am: b058dc139d
am: d20b04a41d  -s ours

Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb
Jeff Sharkey [Fri, 3 Feb 2017 00:29:13 +0000 (00:29 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb
am: 61e9179646  -s ours

Change-Id: Ibfdb4128b1db25db478f9b4cb987d0754ddd9124

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530
Jeff Sharkey [Fri, 3 Feb 2017 00:23:24 +0000 (00:23 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530
am: 5d65931af5  -s ours

Change-Id: I14933edb3f93eea4156698bb2669938849c30697

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73
Jeff Sharkey [Fri, 3 Feb 2017 00:22:28 +0000 (00:22 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73
am: 73f95823f8  -s ours

Change-Id: I1361483ca420b86bf1adedfe297d4dcdf5121a18

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f...
Jeff Sharkey [Fri, 3 Feb 2017 00:22:15 +0000 (00:22 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f  -s ours
am: b058dc139d

Change-Id: Idd1aeb4749741aa8bae76cf43ce3f2bdceff077d

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours
Jeff Sharkey [Fri, 3 Feb 2017 00:21:13 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours
am: 4a4b6bfafb

Change-Id: Id479b2d27fd8396047312fe7259971c167b8d705

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
Jeff Sharkey [Fri, 3 Feb 2017 00:12:10 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
am: 6d3573e530

Change-Id: I501ff6230b9b5fa5d7232e52cfe326320c7edf65

7 years agoDO NOT MERGE. No direct Uri grants from system.
Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am: 6f13f73b73

Change-Id: I28627832c3ec765d6761afbf3fc508d1069c9582

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
Jeff Sharkey [Fri, 3 Feb 2017 00:10:17 +0000 (00:10 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
am: 3e4faac39f  -s ours

Change-Id: If1ea6da6679874ca13379222a28c529421c80b23

7 years agoDO NOT MERGE. No direct Uri grants from system.
Jeff Sharkey [Fri, 3 Feb 2017 00:10:16 +0000 (00:10 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am: 2dfdf662d0  -s ours

Change-Id: Id06fac9dd096c1d821a1af7451db388446e9b156

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:42 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:43 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
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

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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
Suprabh Shukla [Thu, 2 Feb 2017 23:37:25 +0000 (23:37 +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

Change-Id: I15bd6695657f5bf7b802ad5b1119b63f669fc669

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
Suprabh Shukla [Thu, 2 Feb 2017 23:31:41 +0000 (23:31 +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

Change-Id: I976532a5bc3d21d637da69e2f508eeb532ec1996

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
Suprabh Shukla [Thu, 2 Feb 2017 23:31:09 +0000 (23:31 +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

Change-Id: I91a75624e85cf6f32538de378bac43367f118672

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 23:10:10 +0000 (23:10 +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

Change-Id: I4b7d8869ecb9f1d8a52a0cccf59f8dee1f6c31dc

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 23:05:09 +0000 (23:05 +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

Change-Id: I7dcba06623c993f0539729be69d97d338be2393f

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 23:00:07 +0000 (23:00 +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

Change-Id: I112366734c02695d69251e159fb97c523a9c0cf4

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
Suprabh Shukla [Thu, 2 Feb 2017 22:58:45 +0000 (22:58 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 22:56:23 +0000 (22:56 +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

Change-Id: I1cfa1298cf0a1f4f53358242d639ff7f072bc273

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:56:15 +0000 (22:56 +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

Change-Id: I2d8425f5da49ba7b1bd451f9ce5e15cfd423b7eb

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:55:08 +0000 (22:55 +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

Change-Id: Ie8ed7d0a8f45d4ad2ccd9f0db56499aa492b8cb8

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:51:09 +0000 (22:51 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1
am: 73056d5feb

Change-Id: Id542f20e2e11baae9b6281af86d8f0dbe12d08b3

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 22:50:32 +0000 (22:50 +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

Change-Id: I065ff3640f19985157cd63c529019167c135489a

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:49:26 +0000 (22:49 +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

Change-Id: I6594a2922340e20d226752f0b4a1e99aed7448cb

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:48:34 +0000 (22:48 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1  -s ours am: 3a09dac9c4 am: 50c6d2ff56
am: db40505c42

Change-Id: I97bba19262c03c223faf56505534c29f603d7671

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:45:43 +0000 (22:45 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6
am: 37d3b12aa1

Change-Id: I751c29efc17d371905f5d70460e65744c63ec1fc

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 22:45:36 +0000 (22:45 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e  -s ours
am: ec3e2b9dcb  -s ours

Change-Id: I76bf4d69d98374a90da3cd4c74f0c2d892504a40

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:43:58 +0000 (22:43 +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

Change-Id: I4998929bae9f510de4dc5828e136921a033ff98e

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:43:00 +0000 (22:43 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1  -s ours am: 3a09dac9c4
am: 50c6d2ff56

Change-Id: I53ba07ec6cfa0c8617eae87a671d292a6b28f519

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b
Suprabh Shukla [Thu, 2 Feb 2017 22:41:38 +0000 (22:41 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b
am: b278ed787e  -s ours

Change-Id: Ib70440bdd1c60ed5eaa9b8c8152a4745f44cacd6

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:41:34 +0000 (22:41 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69
am: fab95f8ad6

Change-Id: I7c8ac34bfb4bf1bcf6323163ef872d83ee58bfcc

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:39:22 +0000 (22:39 +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

Change-Id: Ib5e1e997168d33810e36510bebe6783382211059

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:38:31 +0000 (22:38 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1  -s ours
am: 3a09dac9c4

Change-Id: I7c001da58aee7ea4784a8fb8c8a2a2498bfba533

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:36:03 +0000 (22:36 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746
am: 426f454b69

Change-Id: I063d17c3eeb6f5b6ec32c261b22ccea273c572ea