OSDN Git Service

android-x86/frameworks-base.git
6 years agoClearing up invalid entries when SyncStorageEngine starts
Suprabh Shukla [Fri, 12 May 2017 22:26:54 +0000 (15:26 -0700)]
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 042a478b73c3b7f7cd73f5bb1af657cfe07d0571)

6 years agoDO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6...
Siarhei Vishniakou [Wed, 16 Aug 2017 21:15:05 +0000 (21:15 +0000)]
DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e  -s ours am: 3280efe50e  -s ours am: b737365553
am: 3d1931d4e3  -s ours

Change-Id: Ieb19904cf060072d2525836ebba9f310da515b4b

6 years agoDO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6...
Siarhei Vishniakou [Wed, 16 Aug 2017 20:50:20 +0000 (20:50 +0000)]
DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e  -s ours am: 3280efe50e  -s ours
am: b737365553

Change-Id: I375324a937478c584e95cb6550d98293162656fc

6 years agoDO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6...
Siarhei Vishniakou [Wed, 16 Aug 2017 20:35:40 +0000 (20:35 +0000)]
DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e  -s ours
am: 3280efe50e  -s ours

Change-Id: Ia7bf4d6991be15c732ba8b55c37f2c9e447b1dbd

6 years agoDO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6
Siarhei Vishniakou [Wed, 16 Aug 2017 20:19:29 +0000 (20:19 +0000)]
DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6
am: 9d99b0001e  -s ours

Change-Id: Ib0fb40f990138b3729b66bdb6d6a095bd3ad231d

6 years agoDO NOT MERGE Remove window obscurement information. am: c3c2ed94ff
Siarhei Vishniakou [Wed, 16 Aug 2017 20:03:29 +0000 (20:03 +0000)]
DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff
am: 96fe6421f6

Change-Id: Ia2ce3f8b95b578253c5336407ae85880d3d317f4

6 years agoDO NOT MERGE Remove window obscurement information.
Siarhei Vishniakou [Wed, 16 Aug 2017 19:48:22 +0000 (19:48 +0000)]
DO NOT MERGE Remove window obscurement information.
am: c3c2ed94ff

Change-Id: Ib9552165e9b1c2dfcd235d1f7930d85c258b2ece

6 years agoMerge "Fix security hole in GateKeeperResponse." into mnc-dev
TreeHugger Robot [Tue, 15 Aug 2017 19:30:53 +0000 (19:30 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev

6 years agoDO NOT MERGE Remove window obscurement information.
Siarhei Vishniakou [Fri, 28 Jul 2017 01:24:01 +0000 (18:24 -0700)]
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

7 years agoMerge "Back-port fixes for b/62196835" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]
Merge "Back-port fixes for b/62196835" into mnc-dev

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 20:30:39 +0000 (20:30 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours am: 954deb1c6e
am: 37cf6265db  -s ours

Change-Id: I28f848331e5379736dd777995fe844aa5c5df689

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours am: ff115bffb1
Phil Weaver [Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours am: ff115bffb1
am: ccbac7e9e0  -s ours

Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37

7 years agoBack-port fixes for b/62196835 am: fd0ca151a6
Phil Weaver [Tue, 18 Jul 2017 20:25:44 +0000 (20:25 +0000)]
Back-port fixes for b/62196835 am: fd0ca151a6
am: 3c4d24923c  -s ours

Change-Id: Ie8d7f1d4840bcea7538f99b2eb1bfb2bc472549f

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828 ...
Phil Weaver [Tue, 18 Jul 2017 18:41:22 +0000 (18:41 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev am: a620b21828  -s ours
am: 954deb1c6e

Change-Id: I929c9dfa84b25fdbeadfedf0e0e9ecd914a74483

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:36:23 +0000 (18:36 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
am: a620b21828  -s ours

Change-Id: Iaa4e8eb83ebf2036999a31e3487c6157bcefecbf

7 years agoDO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe -s ours
Phil Weaver [Tue, 18 Jul 2017 18:36:21 +0000 (18:36 +0000)]
DO NOT MERGE Back-port fixes for b/62196835 am: 24fdc53cfe  -s ours
am: ff115bffb1

Change-Id: Ieca157f60b7c57f60900b55b10fcf8e585852e70

7 years agoBack-port fixes for b/62196835
Phil Weaver [Tue, 18 Jul 2017 18:26:58 +0000 (18:26 +0000)]
Back-port fixes for b/62196835
am: fd0ca151a6

Change-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247

7 years agoDO NOT MERGE Back-port fixes for b/62196835
Phil Weaver [Tue, 18 Jul 2017 18:26:57 +0000 (18:26 +0000)]
DO NOT MERGE Back-port fixes for b/62196835
am: 24fdc53cfe  -s ours

Change-Id: I01a6f574df5cc1b133b7f761062a6259aac07476

7 years agoMerge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev
Phil Weaver [Tue, 18 Jul 2017 18:19:45 +0000 (18:19 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/62196835" into lmp-dev

7 years agoBack-port fixes for b/62196835
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
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

7 years agoFix security hole in GateKeeperResponse.
Charles He [Fri, 14 Jul 2017 13:41:06 +0000 (14:41 +0100)]
Fix security hole in GateKeeperResponse.

GateKeeperResponse has inconsistent writeToParcel() and
createFromParcel() methods, making it possible for a malicious app to
create a Bundle that changes contents after reserialization. Such
Bundles can be used to execute Intents with system privileges.

This CL changes writeToParcel() to make serialization and
deserialization consistent, thus fixing the issue.

Bug: 62998805
Test: use the debug app (see bug)
Change-Id: Ie1c64172c454c3a4b7a0919eb3454f0e38efcd09

7 years agoBack-port fixes for b/62196835
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
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

7 years agoDO NOT MERGE Back-port fixes for b/62196835
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
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

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:18:59 +0000 (22:18 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522 am: 1add6be25e
am: ba46064323

Change-Id: I7119e3f003562f6d826d40ad3577b9db0e44c2c6

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84...
Phil Weaver [Wed, 12 Jul 2017 22:14:01 +0000 (22:14 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84 am: ba928bd522
am: 1add6be25e

Change-Id: I83a6c654862443a69bfeeaf675a8c038b3f7fb53

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours am: f433884a84
Phil Weaver [Wed, 12 Jul 2017 22:06:27 +0000 (22:06 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours am: f433884a84
am: ba928bd522

Change-Id: I74a7b0488371606dd9bdccab854d23c0e09b1ac9

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2 -s ours
Phil Weaver [Wed, 12 Jul 2017 22:00:31 +0000 (22:00 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57 am: 5a7eb970e2  -s ours
am: f433884a84

Change-Id: I737838098a36efafe1509c4814ac1120a3bb8297

7 years agoBack-port fixes for b/62196835 am: 5bdffc5d57
Phil Weaver [Wed, 12 Jul 2017 21:55:31 +0000 (21:55 +0000)]
Back-port fixes for b/62196835 am: 5bdffc5d57
am: 5a7eb970e2  -s ours

Change-Id: Ifd4b5ff2487c8b8035ffaf6ed7e55539f26a463e

7 years agoBack-port fixes for b/62196835
Phil Weaver [Wed, 12 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Back-port fixes for b/62196835
am: 5bdffc5d57

Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de

7 years agoBack-port fixes for b/62196835
Phil Weaver [Tue, 11 Jul 2017 00:27:20 +0000 (17:27 -0700)]
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

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours am: 398d50feeb ...
Marco Nelissen [Fri, 16 Jun 2017 16:02:19 +0000 (16:02 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours am: 398d50feeb  -s ours
am: 49fc959be3  -s ours

Change-Id: I0eb248911ce1a582a4939e2bd5419659c586128f

7 years agolibmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8 -s ours
Marco Nelissen [Fri, 16 Jun 2017 15:51:48 +0000 (15:51 +0000)]
libmedia_jni.so doesn't need libjhead.so am: 9a4a34afd8  -s ours
am: 398d50feeb  -s ours

Change-Id: Ide31821909dde91443cdf650216a6ada7277ce9a

7 years agolibmedia_jni.so doesn't need libjhead.so
Marco Nelissen [Fri, 16 Jun 2017 15:43:46 +0000 (15:43 +0000)]
libmedia_jni.so doesn't need libjhead.so
am: 9a4a34afd8  -s ours

Change-Id: I557d7e96401b742d916e2eef5aa03949018382c7

7 years agolibmedia_jni.so doesn't need libjhead.so
Marco Nelissen [Fri, 9 Jun 2017 22:07:38 +0000 (15:07 -0700)]
libmedia_jni.so doesn't need libjhead.so

Bug: 37776688
Merged-In: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
Change-Id: I18f0b6b88a9c0b117839497f081549404d5edc40

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
Marco Nelissen [Tue, 6 Jun 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
am: 4b78a79546

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8

7 years agoMerge "Close connection before retrying" into lmp-dev am: a8648ecebb
Marco Nelissen [Tue, 6 Jun 2017 23:10:16 +0000 (23:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am: a8648ecebb
am: 5181a7ab64

Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9

7 years agoMerge "Close connection before retrying" into lmp-dev
Marco Nelissen [Tue, 6 Jun 2017 23:02:35 +0000 (23:02 +0000)]
Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74

7 years agoMerge "Close connection before retrying" into lmp-dev
TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]
Merge "Close connection before retrying" into lmp-dev

7 years agoClose connection before retrying
Marco Nelissen [Fri, 2 Jun 2017 19:16:44 +0000 (12:16 -0700)]
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

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
Nick Kralevich [Mon, 22 May 2017 22:46:18 +0000 (22:46 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c am: 1cc9ec47c8
am: 8965cd6a39

Change-Id: If549cda5fd1a640fee746311745b9b08ebf63b91

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
Nick Kralevich [Mon, 22 May 2017 22:45:44 +0000 (22:45 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab am: b8d972e973
am: c46889e2d2

Change-Id: I840740012d9ba0c434f7de0fd9ca83a44926d018

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
Nick Kralevich [Mon, 22 May 2017 22:24:39 +0000 (22:24 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am: 4911af2b8c
am: 1cc9ec47c8

Change-Id: Ic81685686dabbc1f0004a30785a021bf89420846

7 years agosystem_server: add CAP_SYS_PTRACE am: 966619d0ab
Nick Kralevich [Mon, 22 May 2017 22:23:47 +0000 (22:23 +0000)]
system_server: add CAP_SYS_PTRACE am: 966619d0ab
am: b8d972e973

Change-Id: I4d9e2d9b53523b9182a9f9272d06a93a87b0c61b

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE
Nick Kralevich [Mon, 22 May 2017 22:05:18 +0000 (22:05 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE
am: 4911af2b8c

Change-Id: I4aa46981edb8fd711e1aec8c889528e596e5c233

7 years agosystem_server: add CAP_SYS_PTRACE
Nick Kralevich [Mon, 22 May 2017 22:04:57 +0000 (22:04 +0000)]
system_server: add CAP_SYS_PTRACE
am: 966619d0ab

Change-Id: Ie5f95f2c078cd0bec7a2b2321c3303301ec9ec74

7 years agoZygoteInit: Remove CAP_SYS_RESOURCE
Nick Kralevich [Tue, 14 Mar 2017 17:25:35 +0000 (10:25 -0700)]
ZygoteInit: Remove CAP_SYS_RESOURCE

Please see commit 3082eb7c7253c62a06aa151a80487a4eabd49914 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 35775783fc6609035136184e3843bc743b59945d)

7 years agosystem_server: add CAP_SYS_PTRACE
Nick Kralevich [Wed, 15 Feb 2017 23:12:31 +0000 (15:12 -0800)]
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 3082eb7c7253c62a06aa151a80487a4eabd49914)

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01
Phil Weaver [Fri, 7 Apr 2017 23:43:28 +0000 (23:43 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am: 88698afd01
am: 7cb5e1dfd1

Change-Id: I8e51350ae38384dfb9ae034d73fe9087837b27f7

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev
am: 88698afd01

Change-Id: I37194d958aa5fc21ece027c288e2f9a0a239cd93

7 years agoMake a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07
Phil Weaver [Fri, 7 Apr 2017 23:30:19 +0000 (23:30 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073 am: 93c47c9d07
am: 3a7cf1f057  -s ours

Change-Id: I0000c6df3ca0375022535be19cf0f9a76ed07e39

7 years agoMerge "Make a11y node info parceling more robust" into lmp-mr1-dev
Phil Weaver [Fri, 7 Apr 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev

7 years agoMake a11y node info parceling more robust am: 1d8eb49073
Phil Weaver [Fri, 7 Apr 2017 23:16:55 +0000 (23:16 +0000)]
Make a11y node info parceling more robust am: 1d8eb49073
am: 93c47c9d07

Change-Id: I8677c77968c202c8c6a0553db919610a140fda58

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 23:09:28 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am: 1d8eb49073

Change-Id: I5280a23cbfff5abfcc83e9e6d9afb4f8960ece44

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 21:39:27 +0000 (14:39 -0700)]
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 687bb44b437f7bb24dd3dddf072c2f646308e2ca)

Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 21:39:27 +0000 (14:39 -0700)]
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 687bb44b437f7bb24dd3dddf072c2f646308e2ca)

Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852

7 years agoMake a11y node info parceling more robust
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
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.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit 687bb44b437f7bb24dd3dddf072c2f646308e2ca)

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:17:46 +0000 (03:17 +0000)]
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 am: 2c112c4ad2
am: 2411b4f774  -s ours

Change-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:12:06 +0000 (03:12 +0000)]
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
am: 2c112c4ad2

Change-Id: Ic108a0750248d001873de33d69984e6cf2c3584a

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:06:31 +0000 (03:06 +0000)]
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 03:00:46 +0000 (03:00 +0000)]
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am...
Fyodor Kupolov [Fri, 10 Mar 2017 02:55:07 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am: ac87aee354
am: a821245d70

Change-Id: I1e47c963728906cb2283a353c882017368d07747

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
Fyodor Kupolov [Fri, 10 Mar 2017 02:49:34 +0000 (02:49 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
am: ac87aee354

Change-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
Fyodor Kupolov [Fri, 10 Mar 2017 02:39:09 +0000 (02:39 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
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

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours...
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am...
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

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset am: 69e347f7ef -s ours
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev...
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev
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

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev
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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-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

7 years agoMerge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7...
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7...
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5 am: 305a41b7...
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours am: 31b54b9803
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa am: 2d54d2c0d5
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: 7b83d625aa
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: 1cbfeef9d8
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr am: bb6096d37b -s ours
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr
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

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr
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

7 years agoMerge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev
Fyodor Kupolov [Thu, 9 Mar 2017 19:35:27 +0000 (19:35 +0000)]
Merge "[DO NOT MERGE] Check bounds in offsetToPtr" into mnc-dev

7 years agoMerge "[DO NOT MERGE] Don't allow permission change to runtime" into mnc-dev
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

7 years ago[DO NOT MERGE] Don't allow permission change to runtime
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

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset
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)

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset
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)

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset
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)

7 years ago[DO NOT MERGE] Throw exception if slot has invalid offset
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)

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr
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)

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr
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)

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr
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)

7 years ago[DO NOT MERGE] Check bounds in offsetToPtr
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)

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 6f754e48e9
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

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
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

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
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)

7 years agoDO NOT MERGE. Grant MMS Uri permissions as the calling UID.
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)