OSDN Git Service
Fyodor Kupolov [Fri, 10 Mar 2017 02:45:57 +0000 (02:45 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4
am:
1aaef53444 -s ours
Change-Id: I9a962db0db6c1e5369bc3e21b4b2f1c6a21dc2c6
Fyodor Kupolov [Fri, 10 Mar 2017 02:42:23 +0000 (02:42 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0
am:
46dbe6a7d0 -s ours
Change-Id: I23d0261d2b1704528a4ea49c59785c9e35419d2b
Fyodor Kupolov [Fri, 10 Mar 2017 02:37:52 +0000 (02:37 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9
am:
bbb7ae05d4
Change-Id: Ia30782857bdbb6e05bc1e2b0e7c5d905509e2c5d
Fyodor Kupolov [Fri, 10 Mar 2017 02:34:06 +0000 (02:34 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b
am:
0766ba70c0
Change-Id: Iccf8ecd9b0a5571efe648416ffda156578aeb095
Fyodor Kupolov [Fri, 10 Mar 2017 02:30:29 +0000 (02:30 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25
am:
ad386addb9
Change-Id: I80e715d7dc65b82d89249b163c2198e5c0561761
Fyodor Kupolov [Fri, 10 Mar 2017 02:25:30 +0000 (02:25 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b
am:
a3912b6a1b
Change-Id: I48d59519ecc404860100e8aba1cb118e1d141ca0
Fyodor Kupolov [Fri, 10 Mar 2017 02:25:14 +0000 (02:25 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4 am:
109ac1c0b6
am:
48a36cdade -s ours
Change-Id: I7cf97386f135d2814da0c7b33d7d80372b2bbaf2
Fyodor Kupolov [Fri, 10 Mar 2017 02:21:44 +0000 (02:21 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours
am:
b76704bf25
Change-Id: I4dfd0be0c7ab642e3d743062da218950a4b4129f
Fyodor Kupolov [Fri, 10 Mar 2017 02:19:06 +0000 (02:19 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4
am:
109ac1c0b6
Change-Id: I07162b0fa7bbe2423d122f64dec9f43fde4aaad8
Fyodor Kupolov [Fri, 10 Mar 2017 02:18:04 +0000 (02:18 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours
am:
13df27e68b
Change-Id: I7b7c03f9b744957378aef17f26ac4a66f9c747e3
Fyodor Kupolov [Fri, 10 Mar 2017 02:14:07 +0000 (02:14 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e
am:
ce677737ec -s ours
Change-Id: I4ef50e6ff43d354f1542a0c1bb486ebfe14309e8
Fyodor Kupolov [Fri, 10 Mar 2017 02:13:55 +0000 (02:13 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0
am:
360cb87db4
Change-Id: I424fd036c097317c6f7fae26ea8a46e3f35a1af9
Fyodor Kupolov [Fri, 10 Mar 2017 02:11:03 +0000 (02:11 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am:
d2699d009b am:
4130501c19 am:
3a8534f18e
am:
a74748d05e -s ours
Change-Id: Icb0b081e77e58761c4c3a9baea0254aa16151f2f
Fyodor Kupolov [Fri, 10 Mar 2017 02:10:31 +0000 (02:10 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab
am:
78861ad53e -s ours
Change-Id: I32668e97f69f63e798cab1e62f68deae861ec96e
Fyodor Kupolov [Fri, 10 Mar 2017 02:08:00 +0000 (02:08 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours
am:
677a8879c0
Change-Id: I890acbc20da8c6637642e9718e0748273bfe22be
Fyodor Kupolov [Fri, 10 Mar 2017 02:07:27 +0000 (02:07 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours
am:
1e6d3f904e
Change-Id: I50a91bc415fb1aa9b0baf8eb48e208f3792425bc
Fyodor Kupolov [Fri, 10 Mar 2017 02:05:45 +0000 (02:05 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am:
d2699d009b am:
4130501c19
am:
3a8534f18e
Change-Id: I08dab5efd089c0cb7b93638d81cba96efad2d322
Fyodor Kupolov [Fri, 10 Mar 2017 02:03:24 +0000 (02:03 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours
am:
1c732801ab
Change-Id: I5edf742dbf962ce2a863996b71192ccca038705e
Fyodor Kupolov [Fri, 10 Mar 2017 02:03:16 +0000 (02:03 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41
am:
105b0ff30c -s ours
Change-Id: Iec5bbb651da033182ec99e9b10e10c098724a5a0
Fyodor Kupolov [Fri, 10 Mar 2017 02:02:30 +0000 (02:02 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev
am:
d2e8e1488a -s ours
Change-Id: I85273c31137127b733b51579c55618326d67a88c
Fyodor Kupolov [Fri, 10 Mar 2017 02:00:07 +0000 (02:00 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am:
d2699d009b
am:
4130501c19
Change-Id: I9ee79ce0bc865fd3edb1fe67df6402ed1abb7c8c
Fyodor Kupolov [Fri, 10 Mar 2017 01:56:58 +0000 (01:56 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev
am:
e1766acb41
Change-Id: I5bfc6d7e47772f0aabcc0567e52c6534ba6815c9
Fyodor Kupolov [Fri, 10 Mar 2017 01:55:54 +0000 (01:55 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset
am:
69e347f7ef -s ours
Change-Id: I5b06e8493703961f828894358a05c9cc70856fa9
Fyodor Kupolov [Fri, 10 Mar 2017 01:54:48 +0000 (01:54 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev
am:
d2699d009b
Change-Id: If4e1c8bff81a3e9a7c4e4c94a2a3ea0a2d4cc9ba
Fyodor Kupolov [Fri, 10 Mar 2017 01:51:13 +0000 (01:51 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev
Fyodor Kupolov [Fri, 10 Mar 2017 01:50:38 +0000 (01:50 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev
Fyodor Kupolov [Fri, 10 Mar 2017 01:49:54 +0000 (01:49 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev
Fyodor Kupolov [Thu, 9 Mar 2017 20:40:04 +0000 (20:40 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5 am:
305a41b7a6 -s ours am:
e0f30ecdb9 -s ours am:
a482ac81a5 am:
b50794ec65 -s ours am:
9d2914436f am:
467a8d802f am:
d08ec589b2
am:
1b17c98b88 -s ours
Change-Id: I99294974b5fe9a1bf7a9059d8d4f4e3c3c0cfc7d
Fyodor Kupolov [Thu, 9 Mar 2017 20:35:00 +0000 (20:35 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5 am:
305a41b7a6 -s ours am:
e0f30ecdb9 -s ours am:
a482ac81a5 am:
b50794ec65 -s ours am:
9d2914436f am:
467a8d802f
am:
d08ec589b2
Change-Id: Ibb3d3fda0d83b0f1e87c22442628d462ed889dd6
Fyodor Kupolov [Thu, 9 Mar 2017 20:31:12 +0000 (20:31 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5 am:
305a41b7a6 -s ours am:
e0f30ecdb9 -s ours am:
a482ac81a5 am:
b50794ec65 -s ours am:
9d2914436f
am:
467a8d802f
Change-Id: Ie918721ba9e122f72a6fd406548a2568d1f6e5bf
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:24:29 +0000 (20:24 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5 am:
305a41b7a6 -s ours am:
e0f30ecdb9 -s ours am:
a482ac81a5 am:
b50794ec65 -s ours
am:
9d2914436f
Change-Id: Ifccf901c30a7b4cbb8fb0556b0ed520ddc1851c8
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:18:55 +0000 (20:18 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5 am:
305a41b7a6 -s ours am:
e0f30ecdb9 -s ours am:
a482ac81a5
am:
b50794ec65 -s ours
Change-Id: If7f57fc24bc60e8fa990e43fed483576d5451282
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:12:46 +0000 (20:12 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5 am:
305a41b7a6 -s ours am:
e0f30ecdb9 -s ours
am:
a482ac81a5
Change-Id: I4f7b8442c5094c30496299cf00b744db48fd72ad
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:05:21 +0000 (20:05 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5 am:
305a41b7a6 -s ours
am:
e0f30ecdb9 -s ours
Change-Id: Iffa0c61e06cbfe2e66912c26b0a3d81660bc5a91
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:58:26 +0000 (19:58 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa am:
2d54d2c0d5
am:
305a41b7a6 -s ours
Change-Id: I902e6af1c2ef49d454a7d1bae92d8e20ea263b0e
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:52:01 +0000 (19:52 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr am:
7b83d625aa
am:
2d54d2c0d5
Change-Id: I29dccd1ed95079470fc1dd7b04e3db6c5c7d76d2
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:54 +0000 (19:43 +0000)]
[DO NOT MERGE] Check bounds in offsetToPtr
am:
7b83d625aa
Change-Id: Icfcec14e7d4bfcd6c893f0fa319541223b9d7901
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 [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 [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 [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)
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