OSDN Git Service
Jeff Sharkey [Wed, 11 Oct 2017 20:44:45 +0000 (20:44 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
04b96d76a9
am:
d20cad62ee
Change-Id: Iaee355315a29be72ffd670178f88510aacdfc042
Jeff Sharkey [Wed, 11 Oct 2017 20:32:40 +0000 (20:32 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am:
04b96d76a9
Change-Id: Ie2ae7f5071a534e1245c92293014963c8e4187ca
Jeff Sharkey [Mon, 12 Jun 2017 23:33:07 +0000 (17:33 -0600)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
KEY_INTENT has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32990341,
32879915
Change-Id: I657455a770c81f045ccce6abbd2291407a1cfb42
Siyamed Sinir [Sat, 30 Sep 2017 00:28:19 +0000 (00:28 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c am:
095eda9307
am:
a4f6ca3e77
Change-Id: If3b713963f393b7a16352d03c28dced60e2df7db
Siyamed Sinir [Sat, 30 Sep 2017 00:22:03 +0000 (00:22 +0000)]
Fix ClipboardService device lock check for cross profile am:
6d79675e0c
am:
095eda9307
Change-Id: I4ff17f12c20f95efe68115cc3d6b7d5e9b47228c
Siyamed Sinir [Sat, 30 Sep 2017 00:12:41 +0000 (00:12 +0000)]
Fix ClipboardService device lock check for cross profile
am:
6d79675e0c
Change-Id: Icea573859a6d441e18665d9da855370582f2992a
Beverly Tai [Thu, 14 Sep 2017 14:29:56 +0000 (14:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am:
8150eb82ee
am:
97b98a3b1c
Change-Id: If39d33d4c5b9e1057c7cdfd9b9b52f42d4b193d2
Beverly Tai [Thu, 14 Sep 2017 14:25:02 +0000 (14:25 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
am:
8150eb82ee
Change-Id: I85a98e8c857c9c7b7597fafb13ecb6ae44cb9b69
Beverly Tai [Thu, 14 Sep 2017 14:18:07 +0000 (14:18 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
Siyamed Sinir [Wed, 13 Sep 2017 23:32:21 +0000 (16:32 -0700)]
Fix ClipboardService device lock check for cross profile
ClipboardService.isDeviceLocked should clear callingIdentity before
accessing KeyguardManager.
Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest
Bug:
64934810
Change-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6
Merged-In: I712abfe8d542cd1be9c1816f407c8912321ac480
Beverly Tai [Tue, 12 Sep 2017 16:09:38 +0000 (16:09 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours am:
d0d0fea3d6
am:
ff058a78ec
Change-Id: Id39f2a417d5feb4c1da0836c3df484ced0eb84ef
Beverly Tai [Tue, 12 Sep 2017 16:01:36 +0000 (16:01 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am:
89a94b706d -s ours
am:
d0d0fea3d6
Change-Id: I78599f53f9ea78f02335af4ada360965e6ea78bf
Beverly Tai [Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
am:
89a94b706d -s ours
Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36
Beverly Tai [Tue, 12 Sep 2017 15:29:21 +0000 (15:29 +0000)]
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
Beverly [Thu, 7 Sep 2017 18:25:02 +0000 (14:25 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Ic7a81cf130fc70bc18f6990a662e921eb0d22635
Beverly [Fri, 1 Sep 2017 15:14:03 +0000 (11:14 -0400)]
DO NOT MERGE Backporting potential usb tapjacking precaution.
Bug:
62187985
Test: manual, backport
Change-Id: Id9fff28cf54969cbcbdc8a3bfaeadc02ff597c89
Siyamed Sinir [Tue, 12 Sep 2017 00:00:54 +0000 (00:00 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6 am:
028ad8d498
am:
6352ced635
Change-Id: I13044306db2e849d3f02c5d42015567e6b65f30a
Siyamed Sinir [Mon, 11 Sep 2017 23:50:20 +0000 (23:50 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am:
06183a57a6
am:
028ad8d498
Change-Id: I537277cbc92a3bb45fc967cc7e26b6bf2233aa34
Siyamed Sinir [Mon, 11 Sep 2017 23:42:42 +0000 (23:42 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
am:
06183a57a6
Change-Id: Ia69682e87705f3ede14ab87b2c496037e00d3c5a
Siyamed Sinir [Mon, 11 Sep 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev
Tony Mak [Mon, 11 Sep 2017 08:44:22 +0000 (08:44 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c am:
a1cbcf5513
am:
220e7c1628
Change-Id: Ib882539bf0f362d3dbd279418d37b8fd56a9d8f1
Tony Mak [Mon, 11 Sep 2017 08:36:08 +0000 (08:36 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev am:
328c129f4c
am:
a1cbcf5513
Change-Id: I37cafa9ee6e166e27c074e6317a6a818fe9e87a5
Tony Mak [Mon, 11 Sep 2017 08:26:32 +0000 (08:26 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
am:
328c129f4c
Change-Id: If2d6418cf2a71b2ae3094349101e71903c016224
TreeHugger Robot [Mon, 11 Sep 2017 08:14:19 +0000 (08:14 +0000)]
Merge "DPC should not be allowed to grant development permission" into mnc-dev
Suprabh Shukla [Sun, 10 Sep 2017 20:00:05 +0000 (20:00 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73 am:
bf1b308361
am:
54f494ffc0
Change-Id: Ibbdf82686d13d9a554ef62774f140c57115118a3
Suprabh Shukla [Sun, 10 Sep 2017 19:47:46 +0000 (19:47 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
5470469d73
am:
bf1b308361
Change-Id: Ia01d70256824947bed5e88e103bc263749404fbb
Suprabh Shukla [Sun, 10 Sep 2017 19:32:12 +0000 (19:32 +0000)]
Clearing up invalid entries when SyncStorageEngine starts
am:
5470469d73
Change-Id: I8ffaaf35be0e2586a5bdbbe5de6e6bd440e26017
Siyamed Sinir [Thu, 7 Sep 2017 01:02:23 +0000 (18:02 -0700)]
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
Merged-In: Icefac226615fe22a7735dff4ba4c3b528fb2ac12
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)
Tony Mak [Tue, 15 Aug 2017 18:56:39 +0000 (19:56 +0100)]
DPC should not be allowed to grant development permission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant_developmentPermission
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testPermissionGrant
Test: cts-tradefed run cts-dev --module CtsDevicePolicyManagerTestCases --t com.android.cts.devicepolicy.MixedProfileOwnerTest#testPermissionGrant
Test: Run "Permissions lockdown" test in CtsVerifier
Merged-In: If83d8edd0eea99145421e967ae47fdc264a5cf7c
Merged-In: I129bfe850981cf0b3646b7c1cf19c8a3ec69f512
Bug:
62623498
Change-Id: Ief96a23fa49f1ea923574840f8ff590a5ea2456e
Siarhei Vishniakou [Wed, 16 Aug 2017 21:56:58 +0000 (21:56 +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 am:
6a7c6a24a7 am:
e8b48abb02
am:
a23674b4f9
Change-Id: I1071a79ff62a800027c5da1ffad9401e83f541b1
Siarhei Vishniakou [Wed, 16 Aug 2017 21:39:41 +0000 (21:39 +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 am:
6a7c6a24a7
am:
e8b48abb02
Change-Id: I171e3e1d9575f4e9b61ee46cfc08ac4331d6d245
Siarhei Vishniakou [Wed, 16 Aug 2017 21:26:49 +0000 (21:26 +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
am:
6a7c6a24a7
Change-Id: I72398c99878637d26dbb976bab05aca315368729
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
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
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
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
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
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
Charles He [Wed, 16 Aug 2017 18:58:11 +0000 (18:58 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours am:
5048fc8e92
am:
5d34739d70
Change-Id: I51f9bbaa35a853ec3442267cbb9327a2a64ff1d1
Charles He [Wed, 16 Aug 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev am:
039b357a46 -s ours
am:
5048fc8e92
Change-Id: Ib55158e1608d7eeba7d41854377ed1e93e283a75
Charles He [Wed, 16 Aug 2017 18:37:17 +0000 (18:37 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
am:
039b357a46 -s ours
Change-Id: Ia916a0c1a5ec5d63e4e76ed9da9d563fd39d3823
TreeHugger Robot [Tue, 15 Aug 2017 19:30:53 +0000 (19:30 +0000)]
Merge "Fix security hole in GateKeeperResponse." into mnc-dev
Charles He [Tue, 15 Aug 2017 17:52:27 +0000 (17:52 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0 am:
1cd9e8096f
Change-Id: I2fce56d688cc0a4111668c695c9cf9b1c930faf8
Charles He [Tue, 15 Aug 2017 17:51:58 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c am:
b1141b6ff0
Change-Id: Ia0d267bb2013d7ddfe26dddfa35f3f396cca7f20
Charles He [Tue, 15 Aug 2017 17:51:28 +0000 (17:51 +0000)]
[automerger] Fix security hole in GateKeeperResponse. am:
e74cae8f7c
Change-Id: Ic72c354aaec594f02567949e294be2c10da47853
Tony Mak [Fri, 11 Aug 2017 21:09:58 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7 am:
6acee639af
Change-Id: I877b0cba326b85e894d52f24a694a1ef666cdb1c
Tony Mak [Fri, 11 Aug 2017 21:09:21 +0000 (21:09 +0000)]
[automerger] Enforce policy for camera gesture in keyguard am:
65f02e8ba7
Change-Id: Ia91fe8b88c04f1b430f8cf90f5691b6b2791610b
Tony Mak [Fri, 28 Jul 2017 10:53:56 +0000 (11:53 +0100)]
Enforce policy for camera gesture in keyguard
Test:
1. Set lock screen, set keyguard policy. Lock the device.
Observe that double tap is not showing camera
2. Set lock screen, unset the keyguard policy. Lock the device.
Observe that double tap is showing camera
3. Unset lock screen (swipe), set the keyguard policy. Lock the device.
Observe that double tap is showing camera.
4. Unset lock screen (swipe), unset the keyguard policy. Lock the device.
Observe that double tap is showing camera.
Bug:
63787722
Merged-In: I104688eaad719528376e2851f837d5956a6a1169
Change-Id: I42e6d9015682998176fe41971356bde22e1b37b2
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
Phil Weaver [Tue, 18 Jul 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714
am:
9625d164e4
Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1
Phil Weaver [Tue, 18 Jul 2017 23:35:25 +0000 (23:35 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56
am:
0ddd7e4714
Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f
Phil Weaver [Tue, 18 Jul 2017 23:28:55 +0000 (23:28 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
am:
093c7a8e56
Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53
Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4
am:
5264237c94
Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178
Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb
am:
f05a6fc52d
Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33
Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c
am:
68f7106cf4
Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e
Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e
am:
e11e076fed
Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5
Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240
am:
219d9b5dfb
Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623
Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours
am:
5d46833d9c
Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4
Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5
am:
e06843fe7e
Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2
Phil Weaver [Tue, 18 Jul 2017 20:38:43 +0000 (20:38 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours
am:
76007bb240
Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2
Phil Weaver [Tue, 18 Jul 2017 20:35:51 +0000 (20:35 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours
am:
68efc2e5b5
Change-Id: I4bb03e87b259faa45a8a2511d05c340f20fe2a6e
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
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
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
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
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
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
Phil Weaver [Tue, 18 Jul 2017 18:26:58 +0000 (18:26 +0000)]
Back-port fixes for b/
62196835
am:
fd0ca151a6
Change-Id: I442d26b476e3e83602b5f2eb61a01386e4d6d247
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
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
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
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
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
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
Phil Weaver [Wed, 12 Jul 2017 22:35:35 +0000 (22:35 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987 am:
4d608d2f35
am:
a6e0a6e31d
Change-Id: Ia5af67f07974b520d8c3e7424c07402793a486f2
Phil Weaver [Wed, 12 Jul 2017 22:30:08 +0000 (22:30 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323 am:
111a2c7987
am:
4d608d2f35
Change-Id: Id1626217e80920f162b735336ac708c4dd9467f9
Phil Weaver [Wed, 12 Jul 2017 22:24:06 +0000 (22:24 +0000)]
Back-port fixes for b/
62196835 am:
5bdffc5d57 am:
5a7eb970e2 -s ours am:
f433884a84 am:
ba928bd522 am:
1add6be25e am:
ba46064323
am:
111a2c7987
Change-Id: Idb7d3c789c6241aa8d77eb6077930b47c7ba69e4
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
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
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
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
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
Phil Weaver [Wed, 12 Jul 2017 21:43:46 +0000 (21:43 +0000)]
Back-port fixes for b/
62196835
am:
5bdffc5d57
Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de
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
Marco Nelissen [Fri, 16 Jun 2017 16:26:30 +0000 (16:26 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours am:
45cd809caa -s ours
am:
ce4c7df6a0 -s ours
Change-Id: I1fb798481ca56b8c81386792b5642a544aae1c7e
Marco Nelissen [Fri, 16 Jun 2017 16:19:02 +0000 (16:19 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours am:
23118a9b77 -s ours
am:
45cd809caa -s ours
Change-Id: Idd7b2d2536d1c25072794ba228f33fc2459f2aaa
Marco Nelissen [Fri, 16 Jun 2017 16:11:01 +0000 (16:11 +0000)]
libmedia_jni.so doesn't need libjhead.so am:
9a4a34afd8 -s ours am:
398d50feeb -s ours am:
49fc959be3 -s ours
am:
23118a9b77 -s ours
Change-Id: Id314511cf3e6af08e0f00e84e8945ea404b85c6a
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
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
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
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
Marco Nelissen [Tue, 6 Jun 2017 23:33:50 +0000 (23:33 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1
am:
e18e8c4113
Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
Marco Nelissen [Tue, 6 Jun 2017 23:28:27 +0000 (23:28 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2
am:
3272cf26c1
Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
Marco Nelissen [Tue, 6 Jun 2017 23:22:14 +0000 (23:22 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546
am:
6d5bc9a3c2
Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
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
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
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
TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]
Merge "Close connection before retrying" into lmp-dev