Commit Graph

161375 Commits

Author SHA1 Message Date
Beverly Tai
f2b592726d Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev 2017-09-14 13:11:10 +00:00
Suprabh Shukla
8b438236ce Clearing up invalid entries when SyncStorageEngine starts
am: 271702fc28

Change-Id: I4943cf417be41679c2fa332223825dd01a477814
2017-09-13 20:21:09 +00:00
Suprabh Shukla
271702fc28 Clearing up invalid entries when SyncStorageEngine starts
Fixing the original change which was reverted. Using the
available api Context.getSystemService(String) instead of
the unavailable Context.getSystemService(Class)

Test: cts-tradefed run cts -p android.content.syncmanager

Bug: 35028827

This reverts commit 4a9d358448.

Change-Id: I725430401eaec861f45bb91ee1352bb1307a6915
2017-09-12 15:06:59 -07:00
Beverly
64822d949a DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug: 62187985
Test: manual, backport
Change-Id: I1a2150b795425a68ad45ee0134e31a317076d806
2017-09-12 15:00:57 +00:00
Beverly Tai
3ca0cc0ae6 Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev
am: e1adf2240f  -s ours

Change-Id: I02b0df60257429b5f2ed4ce2f0f4ee817abf585c
2017-09-12 14:11:10 +00:00
Beverly Tai
e1adf2240f Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev 2017-09-12 14:03:19 +00:00
Beverly
088bc504db DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug: 62187985
Test: manual, backport
Change-Id: I52e27f84338fdcf63cad0ee7436233736499d87b
2017-09-12 14:01:48 +00:00
Siyamed Sinir
4973227cbf Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev
am: 9f496fbbe0

Change-Id: Ibc57c285fec0bf1fcf560854971770e1353a88ac
2017-09-11 23:42:10 +00:00
Siyamed Sinir
9f496fbbe0 Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev 2017-09-11 23:30:34 +00:00
Suprabh Shukla
0597a93629 Revert "Clearing up invalid entries when SyncStorageEngine starts"
am: 4a9d358448

Change-Id: I3844594302279f859f7834a6bb29093162914ae6
2017-09-11 22:25:29 +00:00
Suprabh Shukla
4a9d358448 Revert "Clearing up invalid entries when SyncStorageEngine starts"
API getSystemService(Class) was not present in lmp-dev.

This reverts commit 89c0dbca0f.

Bug: 35028827
Change-Id: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-09-11 20:05:29 +00:00
Suprabh Shukla
53a2e46036 Clearing up invalid entries when SyncStorageEngine starts
am: 89c0dbca0f

Change-Id: Ib6a256a22d703feae8067366d8dc2622593c1142
2017-09-11 04:13:16 +00:00
Siyamed Sinir
51c5f6e0d2 Prevent getting data from Clipboard if device is locked
Clipboard should not return data if the device is locked. This CL checks
for device locked state before returning values from get/has functions.

Bug: 64934810
Change-Id: I856a9079fe64db0af44383fae1a9a418de959420
2017-09-07 06:47:45 +00:00
Suprabh Shukla
89c0dbca0f Clearing up invalid entries when SyncStorageEngine starts
Any app with permission WRITE_SYNC_SETTINGS could write sync settings
for authorities or accounts that are not valid. This results in invalid
data being persisted to disk which can effectively lead to a DOS style
attack. Clearing such entries on boot will make sure that a reboot fixes
any such issues.

Test: cts-tradefed run cts-dev -m CtsSyncContentHostTestCases

Bug: 35028827
Change-Id: I9e206a42508e3cba65d7523bf47fff743f47dcb2
Merged-In: I9e206a42508e3cba65d7523bf47fff743f47dcb2
(cherry picked from commit 042a478b73)
2017-09-05 19:46:13 -07:00
Siarhei Vishniakou
b737365553 DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e -s ours
am: 3280efe50e  -s ours

Change-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd
2017-08-16 20:35:40 +00:00
Siarhei Vishniakou
3280efe50e DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6
am: 9d99b0001e  -s ours

Change-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d
2017-08-16 20:19:29 +00:00
Siarhei Vishniakou
9d99b0001e DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff
am: 96fe6421f6

Change-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4
2017-08-16 20:03:29 +00:00
Siarhei Vishniakou
96fe6421f6 DO NOT MERGE Remove window obscurement information.
am: c3c2ed94ff

Change-Id: Ib9552165e9b1c2dfcd235d1f7930d85c258b2ece
2017-08-16 19:48:22 +00:00
Siarhei Vishniakou
c3c2ed94ff DO NOT MERGE Remove window obscurement information.
If ACTION_OUTSIDE_EVENTS contain information about whether the touch is
obscured, then a pattern of invisible, untouchable, unfocusable
SYSTEM_ALERT_WINDOWS can be placed across the screen to determine
approximate locations of touch events without the user knowing.

Bug: 31097064
Test: cts-tradefed run cts --class android.security.cts.MotionEventTest
Change-Id: I081a483c491dd384e252f0b615affee96038fdda
2017-07-27 20:22:20 -07:00
Phil Weaver
954deb1c6e Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
am: a620b21828  -s ours

Change-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf
2017-07-18 18:36:23 +00:00
Phil Weaver
ff115bffb1 DO NOT MERGE Back-port fixes for b/62196835
am: 24fdc53cfe  -s ours

Change-Id: I01a6f574df5cc1b133b7f761062a6259aac07476
2017-07-18 18:26:57 +00:00
Phil Weaver
a620b21828 Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev 2017-07-18 18:19:45 +00:00
Phil Weaver
fd0ca151a6 Back-port fixes for b/62196835
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-12 16:57:31 -07:00
Phil Weaver
24fdc53cfe DO NOT MERGE Back-port fixes for b/62196835
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
2017-07-12 23:25:00 +00:00
Phil Weaver
1add6be25e Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84
am: ba928bd522

Change-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9
2017-07-12 22:06:27 +00:00
Phil Weaver
ba928bd522 Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours
am: f433884a84

Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297
2017-07-12 22:00:31 +00:00
Phil Weaver
f433884a84 Back-port fixes for b/62196835 am: 5bdffc5d57
am: 5a7eb970e2  -s ours

Change-Id: Ifd4b5ff2487c8b8035ffaf6ed7e55539f26a463e
2017-07-12 21:55:31 +00:00
Phil Weaver
5a7eb970e2 Back-port fixes for b/62196835
am: 5bdffc5d57

Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de
2017-07-12 21:43:46 +00:00
Phil Weaver
5bdffc5d57 Back-port fixes for b/62196835
Bug: 62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.

Change-Id: Ibb4c2c6a30de6b4ce8d27c34caa02e2d8148f621
2017-07-11 15:11:26 -07:00
Marco Nelissen
398d50feeb libmedia_jni.so doesn't need libjhead.so
am: 9a4a34afd8  -s ours

Change-Id: I557d7e96401b742d916e2eef5aa03949018382c7
2017-06-16 15:43:46 +00:00
Marco Nelissen
9a4a34afd8 libmedia_jni.so doesn't need libjhead.so
Bug: 37776688
Merged-In: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Change-Id: I18f0b6b88a9c0b117839497f081549404d5edc40
2017-06-09 22:57:49 +00:00
Marco Nelissen
5181a7ab64 Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
2017-06-06 23:02:35 +00:00
TreeHugger Robot
a8648ecebb Merge "Close connection before retrying" into lmp-dev 2017-06-06 22:54:01 +00:00
Marco Nelissen
46132afee7 Close connection before retrying
Otherwise the (CTS) server might run out of connections.
Bug: 38391487
Bug: 22771132
Test: build, run CTS, stream music

Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
2017-06-02 22:35:35 +00:00
Nick Kralevich
1cc9ec47c8 ZygoteInit: Remove CAP_SYS_RESOURCE
am: 4911af2b8c

Change-Id: I4aa46981edb8fd711e1aec8c889528e596e5c233
2017-05-22 22:05:18 +00:00
Nick Kralevich
b8d972e973 system_server: add CAP_SYS_PTRACE
am: 966619d0ab

Change-Id: Ie5f95f2c078cd0bec7a2b2321c3303301ec9ec74
2017-05-22 22:04:57 +00:00
Nick Kralevich
4911af2b8c ZygoteInit: Remove CAP_SYS_RESOURCE
Please see commit 3082eb7c72 for an
explanation of this change.

This capability is not used by system_server.

Bug: 34951864
Bug: 38496951
Test: code compiles, device boots, no selinux errors ever reported.
Change-Id: I4242b1abaa8679b9bfa0d31a1df565b46b7b3cc3
(cherry picked from commit 35775783fc)
2017-05-22 12:19:29 -07:00
Nick Kralevich
966619d0ab system_server: add CAP_SYS_PTRACE
Commit https://android.googlesource.com/kernel/common/+/f0ce0eee added
CAP_SYS_RESOURCE as a capability check which would allow access to
sensitive /proc/PID files. system_server uses this capability to collect
smaps from managed processes. Presumably this was done to avoid the
implications of granting CAP_SYS_PTRACE to system_server.

However, with SELinux enforcement, we can grant CAP_SYS_PTRACE but not
allow ptrace attach() to other processes. The net result of this is that
CAP_SYS_PTRACE and CAP_SYS_RESOURCE have identical security controls, as
long as system_server:process ptrace is never granted.

Add CAP_SYS_PTRACE to the set of capabilities granted to system_server.

Don't delete CAP_SYS_RESOURCE for now. SELinux has blocked the use of
CAP_SYS_RESOURCE, but we still want to generate audit logs if it's
triggered. CAP_SYS_RESOURCE can be deleted in a future commit.

Bug: 34951864
Bug: 38496951
Test: Device boots, functionality remains identical, no sys_resource
denials from system_server.
Change-Id: I2570266165396dba2b600eac7c42c94800d9c65b
(cherry picked from commit 3082eb7c72)
2017-05-22 11:28:48 -07:00
Phil Weaver
88698afd01 Merge "Make a11y node info parceling more robust" into lmp-mr1-dev 2017-04-07 23:27:51 +00:00
Phil Weaver
93c47c9d07 Make a11y node info parceling more robust
am: 1d8eb49073

Change-Id: I5280a23cbfff5abfcc83e9e6d9afb4f8960ece44
2017-04-07 23:09:28 +00:00
Phil Weaver
2b6197f464 Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.

Bug: 36491278
Test: Verified that POC no longer works, a11y cts still passes.

(Manual merge from commit 687bb44b43)

Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852
2017-04-07 22:23:12 +00:00
Phil Weaver
1d8eb49073 Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.

Bug: 36491278
Test: Verified that POC no longer works, a11y cts still passes.

(Manual merge from commit 687bb44b43)

Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852
2017-04-07 15:21:39 -07:00
Fyodor Kupolov
2c112c4ad2 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70 am: 156fa32e2a -s ours
am: de9cb7ed68  -s ours

Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab
2017-03-10 03:06:31 +00:00
Fyodor Kupolov
de9cb7ed68 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354 am: a821245d70
am: 156fa32e2a  -s ours

Change-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c
2017-03-10 03:00:46 +00:00
Fyodor Kupolov
156fa32e2a Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354
am: a821245d70

Change-Id: I1e47c963728906cb2283a353c882017368d07747
2017-03-10 02:55:07 +00:00
Fyodor Kupolov
a821245d70 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
am: ac87aee354

Change-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958
2017-03-10 02:49:34 +00:00
Fyodor Kupolov
ac87aee354 Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev 2017-03-10 02:39:14 +00:00
Fyodor Kupolov
1e6d3f904e Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev
am: d2e8e1488a  -s ours

Change-Id: I85273c31137127b733b51579c55618326d67a88c
2017-03-10 02:02:30 +00:00
Fyodor Kupolov
1c732801ab [DO NOT MERGE] Throw exception if slot has invalid offset
am: 69e347f7ef  -s ours

Change-Id: I5b06e8493703961f828894358a05c9cc70856fa9
2017-03-10 01:55:54 +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