Fix ClipboardService #2
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 (cherry picked from commit ec733747bb428cea3b5523518c59159031f96e47)
Bug: 65646012 Bug: 65426286 Cherry-picked from master. The original CL just updates BitmapFactory. This also updates ExifInterface in the same way. ExifInterface.cpp no longer existed by the time the Skia change landed. Required for Ib7aaf367f68f8764147887d858f65ee14fa7a1d9, which fixes the aforementioned bugs. Test: No change in behavior, no new tests. This enum is going away in https://skia-review.googlesource.com/c/9498, and this method is using the default anyway. Merged-In: I928a72851f90e84f45ce2fa49560f8ba894a8058 Merged-In: I8f6c761e50cb29476dc0784f58908ec35e3c70e9 Change-Id: I928a72851f90e84f45ce2fa49560f8ba894a8058 (cherry picked from commit adb5e0ba6d532c0d52b3bf89a1dbec4e3e7a6fd6)
ClipboardService.isDeviceLocked should clear callingIdentity before accessing KeyguardManager. Test: bit CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileTest Bug: 64934810 Change-Id: I81a7adac8c9d56ed801ffc1380fcbc987d5df3e6 Merged-In: I712abfe8d542cd1be9c1816f407c8912321ac480 (cherry picked from commit 6d79675e0c0e55a7d5591a123727796f52c42954) Conflicts: services/core/java/com/android/server/clipboard/ClipboardService.java
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 (cherry picked from commit 0b8fa2f5e0d305f083345968a7c39fe7a6f0a158) Conflicts: services/core/java/com/android/server/clipboard/ClipboardService.java
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) (cherry picked from commit e5787fc13164856e39690e40e81d3d46839eea16)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.