Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,361 Commits 3 Branches 0 Tags
fb74b8773a446a42cfdd42381f8e050fcc86e95c
Commit Graph

201361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
neo.chae
fb74b8773a Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 
am: b4b2203c5e

Change-Id: Ifd540b5f9cb1e32a002ed86c67eda30189f4e23f
 2016-11-10 23:44:32 +00:00
Xin Li
ca2abc5b71 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours 
am: a5c82e7dd9

Change-Id: I5ee94abbb8f6f4e8f98e8b81349ba58da3601407
 2016-11-10 23:43:39 +00:00
Xin Li
9788dd5bd2 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours 
am: 0a568ae56e

Change-Id: I49e2be8c77a13c939fe5f7bf6c16e0e80fb3bbbb
 2016-11-10 23:42:19 +00:00
Narayan Kamath
9958eb7180 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev 
am: 75c6b8c324

Change-Id: I4fb2f20ad4391915fe4ea734158274af5e879e10
 2016-11-10 23:40:40 +00:00
Narayan Kamath
6bf96c1192 Zygote: Additional whitelisting for legacy devices. 
am: 5e2f7c6229

Change-Id: I36adcd8393eab2bb4421f9e3e72302c5db37422a
 2016-11-10 23:40:36 +00:00
Narayan Kamath
ba23956c45 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev 
am: b3b03a9d78

Change-Id: Iafd7fc34df0fb88710003ea94219301d77ca78ed
 2016-11-10 23:39:07 +00:00
Narayan Kamath
d501e032d8 Zygote: Additional whitelists for runtime overlay / other static resources. 
am: 4e8ba1d73e

Change-Id: I52347c0024cc230d6e3db739eaafd78989c18430
 2016-11-10 23:39:03 +00:00
Hugo Benichi
3d9a2d7206 Merge "DhcpClient: guard against failure to parse packets" into mnc-dev 
am: fce4e43167

Change-Id: I9bf79e439213358381668b8c15d2d3061fa1170d
 2016-11-10 23:37:51 +00:00
Hugo Benichi
a0cfb157ec resolve merge conflicts of 89aa6fb to mnc-dr-dev 
Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
 2016-11-10 10:31:31 +09:00
neo.chae
b4b2203c5e Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b 
am: 85afb42c16

Change-Id: Ibb5ac24b2149637bf19b9a16153b1fcde5dbb45f
 2016-11-09 20:25:12 +00:00
Xin Li
a5c82e7dd9 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb 
am: 34de2a2d45  -s ours

Change-Id: Ifbc0ae4b514592e5e731b555bd4d393e46ad136d
 2016-11-09 20:24:12 +00:00
Xin Li
0a568ae56e Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours 
am: 16090c6177  -s ours

Change-Id: I25ba4f5731ecaed22faa95e3948e389405dca7e7
 2016-11-09 20:23:04 +00:00
neo.chae
85afb42c16 Fix idmap leak in zygote process am: 0244ca8d10 
am: 82537abc3b

Change-Id: I83d338ebfdefd0f935c4cfb14c3b15efca1cce0f
 2016-11-09 20:13:07 +00:00
Xin Li
34de2a2d45 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev 
am: 78f15948fb

Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4
 2016-11-09 20:11:44 +00:00
Xin Li
eda0b0078e Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev 
am: cc115c5931

Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f
 2016-11-09 20:11:42 +00:00
Xin Li
16090c6177 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. 
am: 7e0483fcec  -s ours

Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
 2016-11-09 20:11:40 +00:00
Xin Li
6166af96ba Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. 
am: ee2903686f  -s ours

Change-Id: I565953c9962f328055512615185de735c33a50bb
 2016-11-09 20:11:37 +00:00
Narayan Kamath
75c6b8c324 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev 2016-11-09 11:26:13 +00:00
Narayan Kamath
b3b03a9d78 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev 2016-11-09 09:45:36 +00:00
neo.chae
82537abc3b Fix idmap leak in zygote process 
am: 0244ca8d10

Change-Id: Ia35ded23161ad5c5c6fe4dea388e74b8d8af2955
 2016-11-09 09:21:46 +00:00
Hugo Benichi
fce4e43167 Merge "DhcpClient: guard against failure to parse packets" into mnc-dev 2016-11-09 02:24:45 +00:00
Xin Li
cc115c5931 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev 2016-11-08 21:25:43 +00:00
Xin Li
78f15948fb Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev 2016-11-08 21:24:17 +00:00
neo.chae
0244ca8d10 Fix idmap leak in zygote process 
Fix a idmap leak in AssetManager::addSystemOverlays.
And, The fix could also prevent fd leak of idmap.

Test: none
Bug: 32691930

Signed-off-by: Hyangseok Chae <neo.chae@lge.com>

(cherry picked from commit 6a742a3850)

Change-Id: Idc4af77db2b0cb739bd6b009b6af0f9123be1aac
 2016-11-08 09:59:44 +00:00
Jeff Sharkey
b232177c61 Merge "Public volumes belong to a single user." into mnc-dr-dev 2016-11-07 23:43:27 +00:00
Jeff Sharkey
60acc3e6ab Merge "Public volumes belong to a single user." into mnc-dev 
am: 34849c22e7

Change-Id: I5c57bb60ad565b4382184dbe55fc0e61d2fc3f0f
 2016-11-07 23:35:40 +00:00
Jeff Sharkey
e80720a731 Public volumes belong to a single user. 
am: 3a062a67fa

Change-Id: Ibe40a7985bde6ff6d8bc307c28b94f7b1445c961
 2016-11-07 23:35:34 +00:00
Jeff Sharkey
34849c22e7 Merge "Public volumes belong to a single user." into mnc-dev 2016-11-07 23:27:57 +00:00
Narayan Kamath
5e2f7c6229 Zygote: Additional whitelisting for legacy devices. 
On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.

Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.

Bug: 32691930
Test: manual
Change-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99
 2016-11-07 19:59:29 +00:00
Narayan Kamath
4e8ba1d73e Zygote: Additional whitelists for runtime overlay / other static resources. 
Partially cherry picked from commit 1c15c63578.

These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.

Bug: 32618130

Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
 2016-11-07 19:49:23 +00:00
Jeff Sharkey
6b0079d3bc Public volumes belong to a single user. 
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.

To use the device under a different user, switch users and then
eject/remount the device.

Test: verified user isolation of USB drive
Bug: 32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
 2016-11-02 22:06:28 +00:00
Jeff Sharkey
3a062a67fa Public volumes belong to a single user. 
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.

To use the device under a different user, switch users and then
eject/remount the device.

Test: verified user isolation of USB drive
Bug: 32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
 2016-11-02 16:04:38 -06:00
Hugo Benichi
89aa6fb4d8 DhcpClient: guard against failure to parse packets 
DhcpPacket.decodeFullPacket() is not exception safe and can throw
various runtime exceptions when trying to parse malicious or malformed
packets.

This patch adds a generic catch-all-exception in DhcpClient to avoid
propagating the exception and killing the framework process on reception
of such malformed packets.

Bug: 31850211
Change-Id: I2e723a792ff067ada2834da875700d4df16c5159
 2016-10-24 15:40:30 +09:00
Sungsoo
336791758a DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184 -s ours am: 21c4e6d532 -s ours am: ec44540d42 am: 583a7017ce -s ours 
am: 8c94179f51

Change-Id: I8abecc3855c2dd92fbf25717bd56481dd1ee37ea
 2016-10-18 18:07:19 +00:00
Sungsoo
8c94179f51 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184 -s ours am: 21c4e6d532 -s ours am: ec44540d42 
am: 583a7017ce  -s ours

Change-Id: I39976fd7bf943dd9b4e38c084270c977cf0511ca
 2016-10-18 18:00:54 +00:00
Sungsoo
583a7017ce DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184 -s ours am: 21c4e6d532 -s ours 
am: ec44540d42

Change-Id: Id4fd3422c443d5e7363d3ff27b2ba0eeb532f1dd
 2016-10-18 17:54:57 +00:00
Sungsoo
ec44540d42 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e am: 9a15881184 -s ours 
am: 21c4e6d532  -s ours

Change-Id: Ibf02e62ee13accd5d204c44faeb6aa8c05afb709
 2016-10-18 17:47:58 +00:00
Sungsoo
25cbc1b7ec DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 am: 8e2451759d -s ours 
am: 9cf942973d

Change-Id: Ice1c96b49f7350a41cf35779f0f1fb06f6ff0c77
 2016-10-18 17:47:56 +00:00
Sungsoo
21c4e6d532 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba am: a5affb045e 
am: 9a15881184  -s ours

Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8
 2016-10-18 17:41:55 +00:00
Sungsoo
9cf942973d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours am: 02cd808ab8 
am: 8e2451759d  -s ours

Change-Id: Id0d69d1bddcf0d6059b53bd3a4b2b55df493899c
 2016-10-18 17:41:49 +00:00
Sungsoo
69febedd6d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d am: 41b775b40a -s ours 
am: 8be090868e

Change-Id: I9e9954d2d058b6552d4d9900df51a4050a90c1fe
 2016-10-18 17:41:45 +00:00
Sungsoo
9a15881184 DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 418e0869ba 
am: a5affb045e

Change-Id: I4bb4440c019839073b4fcf6df54d726a02286680
 2016-10-18 17:35:23 +00:00
Sungsoo
8be090868e DO NOT MERGE) ExifInterface: Close the file when an exception happens am: ad74e88f1d 
am: 41b775b40a  -s ours

Change-Id: I6ce63b74988fb4f87565be611a47c2f4a28cbc9b
 2016-10-18 17:35:22 +00:00
Sungsoo
8e2451759d DO NOT MERGE) ExifInterface: Close the file when an exception happens am: 135524f2c5 -s ours 
am: 02cd808ab8

Change-Id: Ic14a5adecb6fb0732a5b3c2a68a28fdcf1eb1bc4
 2016-10-18 17:35:16 +00:00
Sungsoo
02cd808ab8 DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: 135524f2c5  -s ours

Change-Id: I34fc1b37171ad6ea5d79035df6c4730260a0b47b
 2016-10-18 17:29:03 +00:00
Sungsoo
761a1ed3a6 DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: cb17930077

Change-Id: I4b8f9270f75800e1390c3a840b41316c20ea4aa8
 2016-10-18 17:29:00 +00:00
Sungsoo
a5affb045e DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: 418e0869ba

Change-Id: Ifad08d681f67abc4dd9ad5d8c4e82b038cbd8322
 2016-10-18 17:28:58 +00:00
Sungsoo
41b775b40a DO NOT MERGE) ExifInterface: Close the file when an exception happens 
am: ad74e88f1d

Change-Id: Ic8a6e5b579c028a560436cdc6c3ca68a51cbf229
 2016-10-18 17:28:58 +00:00
Sungsoo
ad74e88f1d DO NOT MERGE) ExifInterface: Close the file when an exception happens 
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
 2016-10-18 16:18:35 +00:00
Sungsoo
135524f2c5 DO NOT MERGE) ExifInterface: Close the file when an exception happens 
Bug: 32068647, Bug: 30936376
Change-Id: I22fa2384348c890ca726d2b1632cd54e59d25a8f
 2016-10-18 16:18:15 +00:00