Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
208,004 Commits 3 Branches 0 Tags
48a36cdade6d93c8d2e290bbdb83959aa5ddc484
Commit Graph

208004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fyodor Kupolov
48a36cdade 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
 2017-03-10 02:19:06 +00:00
Fyodor Kupolov
109ac1c0b6 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
 2017-03-10 02:13:55 +00:00
Fyodor Kupolov
360cb87db4 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
 2017-03-10 02:08:00 +00:00
Fyodor Kupolov
a74748d05e Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b am: 4130501c19 
am: 3a8534f18e

Change-Id: I08dab5efd089c0cb7b93638d81cba96efad2d322
 2017-03-10 02:05:45 +00:00
Fyodor Kupolov
677a8879c0 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am: e1766acb41 
am: 105b0ff30c  -s ours

Change-Id: Iec5bbb651da033182ec99e9b10e10c098724a5a0
 2017-03-10 02:03:16 +00:00
Fyodor Kupolov
3a8534f18e Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am: d2699d009b 
am: 4130501c19

Change-Id: I9ee79ce0bc865fd3edb1fe67df6402ed1abb7c8c
 2017-03-10 02:00:07 +00:00
Fyodor Kupolov
105b0ff30c Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev 
am: e1766acb41

Change-Id: I5bfc6d7e47772f0aabcc0567e52c6534ba6815c9
 2017-03-10 01:56:58 +00:00
Fyodor Kupolov
4130501c19 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev 
am: d2699d009b

Change-Id: If4e1c8bff81a3e9a7c4e4c94a2a3ea0a2d4cc9ba
 2017-03-10 01:54:48 +00:00
Fyodor Kupolov
e1766acb41 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev 2017-03-10 01:51:17 +00:00
Fyodor Kupolov
d2699d009b Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev 2017-03-10 01:49:59 +00:00
Fyodor Kupolov
1b17c98b88 [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
 2017-03-09 20:35:00 +00:00
Fyodor Kupolov
d08ec589b2 [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
 2017-03-09 20:31:12 +00:00
Fyodor Kupolov
467a8d802f [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
 2017-03-09 20:24:29 +00:00
Fyodor Kupolov
4f560b5165 [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
 2017-03-09 20:21:58 +00:00
Fyodor Kupolov
9d2914436f [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
 2017-03-09 20:18:55 +00:00
Fyodor Kupolov
5ad687a85c [DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8 am: cd1be81d25 -s ours am: 451bcb50c7 am: 656a8b9459 
am: 09b7ea0c73

Change-Id: Ie52cf55c32fd2d33830541f43675f64fcab0bbc3
 2017-03-09 20:16:33 +00:00
Fyodor Kupolov
65d2acbc9d [DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours am: 31b54b9803 am: 56020da601 -s ours am: 29104fe5eb 
am: 831a5ccc5d

Change-Id: I74e3929ed6ee435c897a51607f03705d84423daf
 2017-03-09 20:16:24 +00:00
Fyodor Kupolov
b50794ec65 [DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours am: e0f30ecdb9 -s ours 
am: a482ac81a5

Change-Id: I4f7b8442c5094c30496299cf00b744db48fd72ad
 2017-03-09 20:12:46 +00:00
Fyodor Kupolov
09b7ea0c73 [DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8 am: cd1be81d25 -s ours am: 451bcb50c7 
am: 656a8b9459

Change-Id: I86e856148ffa98658daff875705519770aeb0b64
 2017-03-09 20:08:22 +00:00
Fyodor Kupolov
831a5ccc5d [DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours am: 31b54b9803 am: 56020da601 -s ours 
am: 29104fe5eb

Change-Id: I8cc18e571f1791845aa2add426fa93a9f7520de7
 2017-03-09 20:07:54 +00:00
Fyodor Kupolov
a482ac81a5 [DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7a6 -s ours 
am: e0f30ecdb9  -s ours

Change-Id: Iffa0c61e06cbfe2e66912c26b0a3d81660bc5a91
 2017-03-09 20:05:21 +00:00
Fyodor Kupolov
656a8b9459 [DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8 am: cd1be81d25 -s ours 
am: 451bcb50c7

Change-Id: Iecaf28d9d8df6d202f67a6393f1255d65c24dd64
 2017-03-09 20:01:05 +00:00
Fyodor Kupolov
29104fe5eb [DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours am: 31b54b9803 
am: 56020da601  -s ours

Change-Id: I1117f04043a04adce2fc544052884e96430cc88a
 2017-03-09 19:58:28 +00:00
Fyodor Kupolov
e0f30ecdb9 [DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 
am: 305a41b7a6  -s ours

Change-Id: I902e6af1c2ef49d454a7d1bae92d8e20ea263b0e
 2017-03-09 19:58:26 +00:00
Fyodor Kupolov
697265ac3c Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am: 07beec953b am: 4707bd455e 
am: 4fa88b4ddb

Change-Id: I133348d3f7dd0d9fbc6a24b9e23bd118986fb6d1
 2017-03-09 19:57:49 +00:00
Fyodor Kupolov
305a41b7a6 [DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa 
am: 2d54d2c0d5

Change-Id: I29dccd1ed95079470fc1dd7b04e3db6c5c7d76d2
 2017-03-09 19:52:01 +00:00
Fyodor Kupolov
4fa88b4ddb Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev am: 07beec953b 
am: 4707bd455e

Change-Id: I5ad21560d103ccd099c8c82b591bdd432bad50aa
 2017-03-09 19:51:56 +00:00
Fyodor Kupolov
451bcb50c7 [DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8 
am: cd1be81d25  -s ours

Change-Id: Idce25609138797d130d511ea84847ed71fc6dd65
 2017-03-09 19:51:55 +00:00
Fyodor Kupolov
56020da601 [DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours 
am: 31b54b9803

Change-Id: Idfb4997bc0e44322bcf2db7e111b76ea59244168
 2017-03-09 19:50:39 +00:00
Fyodor Kupolov
cd1be81d25 [DO NOT MERGE] Check bounds in offsetToPtr 
am: 1cbfeef9d8

Change-Id: Ib2dc9c376b0ad77a0b64ac3a762bc49e4ef6159f
 2017-03-09 19:44:01 +00:00
Fyodor Kupolov
4707bd455e Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev 
am: 07beec953b

Change-Id: Ia5853c9741163b5e38a432ca645e4082bfa0a7bb
 2017-03-09 19:43:55 +00:00
Fyodor Kupolov
2d54d2c0d5 [DO NOT MERGE] Check bounds in offsetToPtr 
am: 7b83d625aa

Change-Id: Icfcec14e7d4bfcd6c893f0fa319541223b9d7901
 2017-03-09 19:43:54 +00:00
Fyodor Kupolov
31b54b9803 [DO NOT MERGE] Check bounds in offsetToPtr 
am: bb6096d37b  -s ours

Change-Id: Ief3269100fb5c0d425e58b4faf87bd73677251b1
 2017-03-09 19:43:52 +00:00
Svetoslav Ganov
74ea386b92 Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am: c8dac8d6f6 am: 84e1238ed6 
am: cc0ec4d292

Change-Id: Ic65e41e08606715cbbd953b77ef4066a8e047a7f
 2017-03-09 19:39:51 +00:00
Fyodor Kupolov
07beec953b Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev 2017-03-09 19:35:32 +00:00
Svetoslav Ganov
cc0ec4d292 Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev am: c8dac8d6f6 
am: 84e1238ed6

Change-Id: I2c912b8363a6ca8a12e1c56ae5f1956a4ba5dc07
 2017-03-09 19:32:59 +00:00
Svetoslav Ganov
84e1238ed6 Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev 
am: c8dac8d6f6

Change-Id: I597b43bb7218779d55c0b11af79daef128d199f2
 2017-03-09 19:26:50 +00:00
TreeHugger Robot
c8dac8d6f6 Merge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev 2017-03-09 19:19:43 +00:00
Svetoslav Ganov
8b943f40b6 [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
 2017-03-09 19:16:08 +00:00
Fyodor Kupolov
8aee0b2516 [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 eb6de6f5f1)
 2017-03-04 01:35:49 +00:00
Fyodor Kupolov
3b3f08e68f [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 eb6de6f5f1)
 2017-03-03 23:19:11 +00:00
Fyodor Kupolov
1cbfeef9d8 [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 45e2e95c2f)
 2017-03-03 19:01:24 +00:00
Fyodor Kupolov
7b83d625aa [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 45e2e95c2f)
 2017-03-01 18:46:27 -08:00
Fyodor Kupolov
bb6096d37b [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 45e2e95c2f)
 2017-03-01 01:31:18 +00:00
Fyodor Kupolov
23efadc807 [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 45e2e95c2f)
 2017-03-01 01:29:05 +00:00
Jeff Sharkey
208dcadb4f 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
 2017-02-12 10:06:34 +00:00
Jeff Sharkey
9335807fc4 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours am: 48f1ddc94a 
am: 00f5232dd0

Change-Id: I535ba4091bcb29fc25fc640f938a483b829e15c2
 2017-02-12 10:02:08 +00:00
Jeff Sharkey
00f5232dd0 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 am: a0b1198e70 -s ours 
am: 48f1ddc94a

Change-Id: I1785a0a301e2847946276be682f62ee263b39a3f
 2017-02-12 09:58:13 +00:00
Jeff Sharkey
502ee22a9d DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c 
am: 75f767afa1

Change-Id: I1393b6bcfa074bef42b7491204df55e39471e689
 2017-02-12 09:56:10 +00:00
Jeff Sharkey
48f1ddc94a DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9 
am: a0b1198e70  -s ours

Change-Id: Ieefebd7669b892cba9afade572e3f43d56095902
 2017-02-12 09:53:38 +00:00