Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
252,782 Commits 3 Branches 0 Tags
d098c42ebe40d0573e856cdbfeae50ee9c805d27
Commit Graph

252782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fyodor Kupolov
d098c42ebe Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into nyc-dev 
am: 69d20eab85

Change-Id: I24b0840ec77d740836f43c14b25b27ee4d964a6a
 2017-03-09 19:39:08 +00:00
Fyodor Kupolov
69d20eab85 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into nyc-dev 2017-03-09 19:31:55 +00:00
Svetoslav Ganov
903102fa54 [DO NOT MERGE] Don't allow permission change to runtime 
am: fe430be9f1

Change-Id: I7c41e88f49738d927a5c0233b9702b36d2ca7282
 2017-03-09 19:26:52 +00:00
Svetoslav Ganov
fe430be9f1 [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
 2017-03-09 19:16:55 +00:00
Fyodor Kupolov
676f703f74 [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 22:55:40 +00:00
Makoto Onuki
7c6b2f4d8b DO NOT MERGE Relax isUserRunning check and allow in-profile calls 
am: a08c6a1cfb

Change-Id: I07ce253853c1b3066c81af4f52a4ff6968437ef4
 2017-02-23 20:00:01 +00:00
Makoto Onuki
a08c6a1cfb DO NOT MERGE Relax isUserRunning check and allow in-profile calls 
Bug 30475753
Bug 35667752

Change-Id: I739ee7e259f041f5e133edf048b6b54cb7a770db
(cherry picked from commit 8198deacb5)
 2017-02-23 11:24:34 +00:00
Jeff Sharkey
ab296986fc 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 
am: 9aca89293a

Change-Id: Ifc71c14cbdfe8e93cb6bca789daa17117b8f214f
 2017-02-12 10:14:09 +00:00
Jeff Sharkey
9aca89293a 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
 2017-02-12 10:10:13 +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
853e178de4 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 am: 502ee22a9d -s ours 
am: deea677359

Change-Id: I579175736bf9c3839492e67d08b8ce765c85c121
 2017-02-12 10:04:10 +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
deea677359 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 am: 32c71b078c am: 75f767afa1 
am: 502ee22a9d  -s ours

Change-Id: Ibb1a72ca35121ba586f18852445941b0a0c15724
 2017-02-12 10:00:37 +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
Jeff Sharkey
75f767afa1 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 3f3da42ef9 
am: 32c71b078c

Change-Id: I1af83dbf9869bd93ecc5c07e1ce6155206f73290
 2017-02-12 09:51:37 +00:00
Jeff Sharkey
a0b1198e70 DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
am: 6f754e48e9

Change-Id: I2f6dd5ba1e266b3d451533e518ec7f2fe24b262c
 2017-02-12 09:48:46 +00:00
Jeff Sharkey
32c71b078c DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
am: 3f3da42ef9

Change-Id: I222c32931827d906db5fc1e3258f2095e6013481
 2017-02-12 09:47:33 +00:00
Rubin Xu
824c8284ce Merge "Fix uri permission grant on remote bug report uri" into nyc-dev 
am: 42f2e80293

Change-Id: Ic167e10a205b5c8f9df81cd20a6f08359d3807f4
 2017-02-10 12:16:19 +00:00
TreeHugger Robot
42f2e80293 Merge "Fix uri permission grant on remote bug report uri" into nyc-dev 2017-02-10 12:11:00 +00:00
Jeff Sharkey
78f2e38a12 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
Merged-In: Ia9fe19843b52977c8a94ee5349b907beda1882fc
(cherry picked from commit 7ff418d9a9)
 2017-02-09 18:03:18 +00:00
Jeff Sharkey
be0dab477e DO NOT MERGE. Grant MMS Uri permissions as the calling UID. 
am: a78841ebd4  -s ours

Change-Id: Iac6ae6f87a60318e4557b238c196c3b0627e95ab
 2017-02-09 17:28:44 +00:00
Rubin Xu
ca53b27c34 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
 2017-02-08 10:15:48 +00:00
Jeff Sharkey
6f754e48e9 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 7ff418d9a9)
 2017-02-07 04:46:19 +00:00
Jeff Sharkey
3f3da42ef9 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 7ff418d9a9)
 2017-02-07 04:43:24 +00:00
Jeff Sharkey
a78841ebd4 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 7ff418d9a9)
 2017-02-07 04:04:15 +00:00
Jeff Sharkey
cecf30c3a2 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
 2017-02-03 01:07:09 +00:00
Jeff Sharkey
6f47221263 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
 2017-02-03 01:06:20 +00:00
Jeff Sharkey
7cd3c47c29 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
 2017-02-03 01:05:28 +00:00
Jeff Sharkey
d2a9d6fa27 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
 2017-02-03 01:04:24 +00:00
Jeff Sharkey
43f79eec8b 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
 2017-02-03 00:59:32 +00:00
Jeff Sharkey
65b0a6f596 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
 2017-02-03 00:58:38 +00:00
Jeff Sharkey
bafa3c1d3b 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
 2017-02-03 00:57:39 +00:00
Jeff Sharkey
cdb996355e 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
 2017-02-03 00:56:34 +00:00
Jeff Sharkey
4d1c25ec43 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
 2017-02-03 00:53:49 +00:00
Jeff Sharkey
bf16fab4e7 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
 2017-02-03 00:50:28 +00:00
Jeff Sharkey
394357761e 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
 2017-02-03 00:49:28 +00:00
Jeff Sharkey
56131cf7c0 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 
am: 1ddaf2f96b

Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf
 2017-02-03 00:48:41 +00:00
Jeff Sharkey
ee958351b7 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
 2017-02-03 00:45:39 +00:00
Jeff Sharkey
b4c5c522e3 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
 2017-02-03 00:43:16 +00:00
Jeff Sharkey
928574895b DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours 
am: 1a9c03f320

Change-Id: I22e7edcb7c6f287da63dfd636ffc777453d2b957
 2017-02-03 00:42:27 +00:00
Jeff Sharkey
f51e8e8642 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
 2017-02-03 00:42:23 +00:00
Jeff Sharkey
a7388f1ed4 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
 2017-02-03 00:41:16 +00:00
Jeff Sharkey
4b3c59005b 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
 2017-02-03 00:40:52 +00:00
Jeff Sharkey
1ddaf2f96b DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 
am: bd2bec9164

Change-Id: I9d9889577061ada5de8c0213ec73d257469466e8
 2017-02-03 00:40:04 +00:00
Jeff Sharkey
86a0c4d4d7 DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours 
am: 09d230d473

Change-Id: I058f4db80418f939c2f1e3e6f2b61c40b2a3fd91
 2017-02-03 00:37:48 +00:00
Jeff Sharkey
00af0a6d2c 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
 2017-02-03 00:35:19 +00:00
Jeff Sharkey
f19cea14cf 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
 2017-02-03 00:34:57 +00:00
Jeff Sharkey
c0cc8695a5 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours 
am: 9346bec730

Change-Id: I456a98abbdcb7d6f7d959a791da726f56f55edf8
 2017-02-03 00:34:33 +00:00