OSDN Git Service
Fyodor Kupolov [Thu, 9 Mar 2017 20:27:30 +0000 (20:27 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
bb6096d37b -s ours am:
31b54b9803 am:
56020da601 -s ours am:
29104fe5eb am:
831a5ccc5d am:
65d2acbc9d
am:
4f560b5165 -s ours
Change-Id: Iddacd1645893fd4405f851fda1489bb547bda811
Fyodor Kupolov [Thu, 9 Mar 2017 20:21:59 +0000 (20:21 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
1cbfeef9d8 am:
cd1be81d25 -s ours am:
451bcb50c7 am:
656a8b9459 am:
09b7ea0c73
am:
5ad687a85c -s ours
Change-Id: If1fdac3bb2671cd2b4332053eb2c22ed7dbd8a28
Fyodor Kupolov [Thu, 9 Mar 2017 20:21:58 +0000 (20:21 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
bb6096d37b -s ours am:
31b54b9803 am:
56020da601 -s ours am:
29104fe5eb am:
831a5ccc5d
am:
65d2acbc9d
Change-Id: I24c870cce6f3ef352afc3c6a1f6ac8c03a0991e1
Fyodor Kupolov [Thu, 9 Mar 2017 20:16:33 +0000 (20:16 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
1cbfeef9d8 am:
cd1be81d25 -s ours am:
451bcb50c7 am:
656a8b9459
am:
09b7ea0c73
Change-Id: Ie52cf55c32fd2d33830541f43675f64fcab0bbc3
Fyodor Kupolov [Thu, 9 Mar 2017 20:16:24 +0000 (20:16 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
bb6096d37b -s ours am:
31b54b9803 am:
56020da601 -s ours am:
29104fe5eb
am:
831a5ccc5d
Change-Id: I74e3929ed6ee435c897a51607f03705d84423daf
Fyodor Kupolov [Thu, 9 Mar 2017 20:08:22 +0000 (20:08 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
1cbfeef9d8 am:
cd1be81d25 -s ours am:
451bcb50c7
am:
656a8b9459
Change-Id: I86e856148ffa98658daff875705519770aeb0b64
Fyodor Kupolov [Thu, 9 Mar 2017 20:07:54 +0000 (20:07 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
bb6096d37b -s ours am:
31b54b9803 am:
56020da601 -s ours
am:
29104fe5eb
Change-Id: I8cc18e571f1791845aa2add426fa93a9f7520de7
Fyodor Kupolov [Thu, 9 Mar 2017 20:04:44 +0000 (20:04 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am:
07beec953b am:
4707bd455e am:
4fa88b4ddb
am:
697265ac3c -s ours
Change-Id: Ief5a09a0135b09bf0d8b308953684ba01dcb73d7
Fyodor Kupolov [Thu, 9 Mar 2017 20:01:05 +0000 (20:01 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
1cbfeef9d8 am:
cd1be81d25 -s ours
am:
451bcb50c7
Change-Id: Iecaf28d9d8df6d202f67a6393f1255d65c24dd64
Fyodor Kupolov [Thu, 9 Mar 2017 19:58:28 +0000 (19:58 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
bb6096d37b -s ours am:
31b54b9803
am:
56020da601 -s ours
Change-Id: I1117f04043a04adce2fc544052884e96430cc88a
Fyodor Kupolov [Thu, 9 Mar 2017 19:57:49 +0000 (19:57 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am:
07beec953b am:
4707bd455e
am:
4fa88b4ddb
Change-Id: I133348d3f7dd0d9fbc6a24b9e23bd118986fb6d1
Fyodor Kupolov [Thu, 9 Mar 2017 19:51:56 +0000 (19:51 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am:
07beec953b
am:
4707bd455e
Change-Id: I5ad21560d103ccd099c8c82b591bdd432bad50aa
Fyodor Kupolov [Thu, 9 Mar 2017 19:51:55 +0000 (19:51 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
1cbfeef9d8
am:
cd1be81d25 -s ours
Change-Id: Idce25609138797d130d511ea84847ed71fc6dd65
Fyodor Kupolov [Thu, 9 Mar 2017 19:50:39 +0000 (19:50 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
bb6096d37b -s ours
am:
31b54b9803
Change-Id: Idfb4997bc0e44322bcf2db7e111b76ea59244168
Svetoslav Ganov [Thu, 9 Mar 2017 19:44:55 +0000 (19:44 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am:
c8dac8d6f6 am:
84e1238ed6 am:
cc0ec4d292
am:
74ea386b92 -s ours
Change-Id: I3bfc8538811030346ae514f568f85d4aa51562d9
Fyodor Kupolov [Thu, 9 Mar 2017 19:44:01 +0000 (19:44 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr
am:
1cbfeef9d8
Change-Id: Ib2dc9c376b0ad77a0b64ac3a762bc49e4ef6159f
Fyodor Kupolov [Thu, 9 Mar 2017 19:43:55 +0000 (19:43 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev
am:
07beec953b
Change-Id: Ia5853c9741163b5e38a432ca645e4082bfa0a7bb
Fyodor Kupolov [Thu, 9 Mar 2017 19:43:52 +0000 (19:43 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr
am:
bb6096d37b -s ours
Change-Id: Ief3269100fb5c0d425e58b4faf87bd73677251b1
Svetoslav Ganov [Thu, 9 Mar 2017 19:39:51 +0000 (19:39 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am:
c8dac8d6f6 am:
84e1238ed6
am:
cc0ec4d292
Change-Id: Ic65e41e08606715cbbd953b77ef4066a8e047a7f
Fyodor Kupolov [Thu, 9 Mar 2017 19:35:27 +0000 (19:35 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev
Fyodor Kupolov [Thu, 9 Mar 2017 19:34:13 +0000 (19:34 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into nyc-dev
Svetoslav Ganov [Thu, 9 Mar 2017 19:32:59 +0000 (19:32 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am:
c8dac8d6f6
am:
84e1238ed6
Change-Id: I2c912b8363a6ca8a12e1c56ae5f1956a4ba5dc07
Fyodor Kupolov [Thu, 9 Mar 2017 19:31:48 +0000 (19:31 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into nyc-dev
Svetoslav Ganov [Thu, 9 Mar 2017 19:26:50 +0000 (19:26 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev
am:
c8dac8d6f6
Change-Id: I597b43bb7218779d55c0b11af79daef128d199f2
TreeHugger Robot [Thu, 9 Mar 2017 19:19:39 +0000 (19:19 +0000)]
Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev
Svetoslav Ganov [Thu, 29 Dec 2016 22:36:58 +0000 (14:36 -0800)]
[DO NOT MERGE] Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.
Test: Added a CTS test which passes.
Bug:
33860747
Change-Id: I1ccf546f78ee79ff027cb98124be81c8e5265a82
Svetoslav Ganov [Thu, 29 Dec 2016 22:40:11 +0000 (14:40 -0800)]
[DO NOT MERGE] Don't allow permission change to runtime
Prevent apps to change permission protection level to dangerous
from any other type as this would allow a privilege escalation
where an app adds a normal permission in other app's group and
then redefines it as dangerous leading to the group auto-grant.
Test: Added a CTS test which passes.
Bug:
33860747
Change-Id: I4e86ee54e61d2fa45be601fae577986ef9a84673
Fyodor Kupolov [Wed, 22 Feb 2017 22:12:50 +0000 (14:12 -0800)]
[DO NOT MERGE] Throw exception if slot has invalid offset
Previously the process would crash, which is OK, but complicates testing.
Test: cts-tradefed run cts --module CtsContentTestCases
--test android.content.cts.ContentProviderCursorWindowTest
Bug:
34128677
Change-Id: I5b50982d77ec65c442fbb973d14c85a5c29c43c7
(cherry picked from commit
eb6de6f5f10148b9f81f9c0074d1e1f7af21bfb0)
Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]
[DO NOT MERGE] Check bounds in offsetToPtr
Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.
Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.
Test: manual - using the test app from the bug
Bug:
34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit
45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)
Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]
[DO NOT MERGE] Check bounds in offsetToPtr
Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.
Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.
Test: manual - using the test app from the bug
Bug:
34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit
45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)
Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]
[DO NOT MERGE] Check bounds in offsetToPtr
Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.
Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.
Test: manual - using the test app from the bug
Bug:
34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit
45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)
Fyodor Kupolov [Tue, 28 Feb 2017 01:33:18 +0000 (17:33 -0800)]
[DO NOT MERGE] Check bounds in offsetToPtr
Check whether specified offset belongs to mData.
Also added a default argument bufferSize to check the end offset.
Size of the ashmem descriptor can be modified between
ashmem_get_size_region call and mmap. createFromParcel method was updated
to check ashmem size again immediately after memory is mapped.
Test: manual - using the test app from the bug
Bug:
34128677
Change-Id: I3ecd1616a870ce20941ce9b20a1843d2b4295750
(cherry picked from commit
45e2e95c2ffeb2d978e2cce80b729ef6ada3b8d2)
Makoto Onuki [Thu, 28 Jul 2016 20:10:42 +0000 (13:10 -0700)]
DO NOT MERGE Relax isUserRunning check and allow in-profile calls
Bug
30475753
Bug
35667752
Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
(cherry picked from commit
8198deacb52eb082ae9f0a5658d594dc9b689882)
Jeff Sharkey [Sun, 12 Feb 2017 10:10:13 +0000 (10:10 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0 am:
9335807fc4
am:
208dcadb4f -s ours
Change-Id: If13e06378379077bbf25e6accc35951c26703a9c
Jeff Sharkey [Sun, 12 Feb 2017 10:06:34 +0000 (10:06 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a am:
00f5232dd0
am:
9335807fc4
Change-Id: I66766f7b8feccdf1855b3819ca30cec5b480ef07
Jeff Sharkey [Sun, 12 Feb 2017 10:02:08 +0000 (10:02 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours am:
48f1ddc94a
am:
00f5232dd0
Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
Jeff Sharkey [Sun, 12 Feb 2017 10:00:37 +0000 (10:00 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c am:
75f767afa1
am:
502ee22a9d -s ours
Change-Id: Ibb1a72ca35121ba586f18852445941b0a0c15724
Jeff Sharkey [Sun, 12 Feb 2017 09:58:13 +0000 (09:58 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9 am:
a0b1198e70 -s ours
am:
48f1ddc94a
Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f
Jeff Sharkey [Sun, 12 Feb 2017 09:56:10 +0000 (09:56 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9 am:
32c71b078c
am:
75f767afa1
Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
Jeff Sharkey [Sun, 12 Feb 2017 09:53:38 +0000 (09:53 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
6f754e48e9
am:
a0b1198e70 -s ours
Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902
Jeff Sharkey [Sun, 12 Feb 2017 09:51:37 +0000 (09:51 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am:
3f3da42ef9
am:
32c71b078c
Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
Jeff Sharkey [Sun, 12 Feb 2017 09:48:46 +0000 (09:48 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
6f754e48e9
Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c
Jeff Sharkey [Sun, 12 Feb 2017 09:47:33 +0000 (09:47 +0000)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
am:
3f3da42ef9
Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
TreeHugger Robot [Fri, 10 Feb 2017 12:10:58 +0000 (12:10 +0000)]
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev
Rubin Xu [Mon, 6 Feb 2017 17:18:50 +0000 (17:18 +0000)]
Fix uri permission grant on remote bug report uri
System server is no longer allowed to grant uri permission directly. As a result
we use grantUriPermissionFromIntent() to grant permission from the shell UID,
who is the owner of the bug report content.
Also fix a security bug where the broadcast to notify user consent of remote
bug report mismatches the <protected-broadcast> definition, causing it to be
sendable by anyone.
Bug:
34159108
Test: manual - Install TestDPC and request bugreport, try accept and decline
once the report is ready (Bullhead).
Merged-In: I66e3f2a16d4547549f09d3c96d52aed2330caedf
Change-Id: I66e3f2a16d4547549f09d3c96d52aed2330caedf
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
Jeff Sharkey [Wed, 30 Nov 2016 21:29:59 +0000 (14:29 -0700)]
DO NOT MERGE. Grant MMS Uri permissions as the calling UID.
A recent security fix prevents the system UID from handing out Uri
permission grants directly from itself. Instead, services need to
issue grants as the original calling UID to ensure that the caller
actually has access to the Uris.
Test: builds, boots, send/recv MMS works in primary/secondary users
Bug:
33231106
Change-Id: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit
7ff418d9a9afb9ecf42f87fffd3e65477decb55e)
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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