summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-19Merge cherrypicks of [5313339, 5313437, 5313318, 5313340, 5313282, 5313283, ↵android-8.1.0_r52oreo-m7-releaseandroid-build-team Robot
5313438, 5313284, 5313341, 5313379, 5313380, 5313319, 5313320, 5313321, 5313285, 5313286, 5313287, 5313497, 5313439] into oc-m7-release Change-Id: Ibe3905ac5412e3ff32a8687d005a15d17a1c13e0
2018-10-19RESTRICT AUTOMERGE: Recover shady content:// paths.Jeff Sharkey
The path-permission element offers prefix or regex style matching of paths, but most providers internally use UriMatcher to decide what to do with an incoming Uri. This causes trouble because UriMatcher uses Uri.getPathSegments(), which quietly ignores "empty" paths. Consider this example: <path-permission android:pathPrefix="/private" ... /> uriMatcher.addURI("com.example", "/private", CODE_PRIVATE); content://com.example//private The Uri above will pass the security check, since it's not technically a prefix match. But the UriMatcher will then match it as CODE_PRIVATE, since it ignores the "//" zero-length path. Since we can't safely change the behavior of either path-permission or UriMatcher, we're left with recovering these shady paths by trimming away zero-length paths. Bug: 112555574 Test: cts-tradefed run cts -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.AppSecurityTests Change-Id: Ibadbfa4fc904ec54780c8102958735b03293fb9a (cherry picked from commit a1ec7b115cc378f0547f10cf1074a5248d42d94f)
2018-10-19[DO NOT MERGE] Changing SUPL_ES=1 for SUPL end point controlWayne Lin
SUPL_ES=1 ensures the GnssLocationProvider and related framework code accepts incoming SMS SUPL_INIT messages with ES-bit=1 (which allow redirection of the ESLP end-point e.g. to the current local emergency services provider when you are travelling) only during an emergency call Bug: 115331218 Bug: 112159033 Test: Build pass Change-Id: I5075f7887a184ce18bb1815b35a2ce7acd8bca10 (cherry picked from commit 02f38c7284f183d5e1fc39fe56903a567ff3fc20)
2018-09-28Merge cherrypicks of [5142118] into oc-m7-releaseandroid-8.1.0_r50android-build-team Robot
Change-Id: Ida047fe37543c6cedb5bd8fcea026f05afea46b5
2018-09-28RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared ↵Atanas Kirilov
user id package for requested permissions." This reverts commit 05dc947c63a2304adce53a0aef6b0e0a9db9343a. Reason for revert: Not a security fix and the security fix needs this cl is reverted. Bug: 114365189 Change-Id: Id667b1c4d1a1af27837f553d7461283b22e5e41f (cherry picked from commit bb4dcd1099cac4e0b3602e3d2ac088b796df3691)
2018-09-11Merge cherrypicks of [4997814, 4997815, 4997816, 4996950, 4996344, 4997836, ↵android-build-team Robot
4997837, 4997838, 4998071, 4998091, 4998092, 4998093] into oc-m7-release Change-Id: Ia72b0b0a4e2dfb3176853b3e1feb38e1eefddfa0
2018-09-11Verify number of Map entries written to ParcelMichael Wachenschwanz
Make sure the number of entries written by Parcel#writeMapInternal matches the size written. If a mismatch were allowed, an exploitable scenario could occur where the data read from the Parcel would not match the data written. Fixes: 112859604 Test: cts-tradefed run cts -m CtsOsTestCases -t android.os.cts.ParcelTest Change-Id: I325d08a8b66b6e80fe76501359c41b6656848607 Merged-In: I325d08a8b66b6e80fe76501359c41b6656848607 (cherry picked from commit 057a01d1f38e9b46d3faa4059fdd7c8717681ea0)
2018-09-11RESTRICT AUTOMERGE: Check both self and shared user id package for requested ↵akirilov
permissions. Bug: 111752150 Test: Manual local test Change-Id: I0b48a20525f87fc6f5ab8d7e70aa7d11cd747f97 (cherry picked from commit 05dc947c63a2304adce53a0aef6b0e0a9db9343a)
2018-09-11RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection ↵Wale Ogunwale
permission. 1: Cherry-pick ag/4067454 - Setting PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS updateNonSystemOverlayWindowsVisibilityIfNeeded on relayoutWindow 2: Cherry-pick ag/3650369 - If PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS changed on relayoutWindow() then updateNonSystemOverlayWindowsVisibilityIfNeeded 3: Add permissions to SystemUI to allow it to hide non-system overlays Bug: 34170870 Test: manual (see bug for poc) Change-Id: I57cb0f390d9a78e721c5ddce49a377d385002753 (cherry picked from commit 40f7b5832291ec81b921d9d7598447653d926604)
2018-08-30Merge cherrypicks of [4902728, 4902589, 4902590] into oc-m7-releaseandroid-8.1.0_r47android-build-team Robot
Change-Id: I5407f09b1990560b4908fd78be454f3e57d7a363
2018-08-30Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed ↵Elisa Pascual Trevino
package." This reverts commit 821076440434443af4257c5ba0b7b1f037735041. Reason for revert: b/111752150 Change-Id: I035cfcacaeaf798b8aea7fe62376624d06c64388 (cherry picked from commit 9cd13a2bd5ca2546da7a15182b0ddf1a81f2e7da)
2018-08-16Merge cherrypicks of [4787603, 4787134, 4787604, 4786834, 4787135, 4787488, ↵android-build-team Robot
4786835, 4787489, 4787490, 4787548, 4787549, 4787550, 4787551, 4787552, 4787553, 4787502, 4786836, 4785839, 4787620, 4787621, 4787622, 4787623, 4787624, 4787625, 4787626, 4787627, 4787628] into oc-m7-release Change-Id: I601b76d218a5f03fb1506cbd22a2c9d2cec85469
2018-08-16Fix crash during cursor moving on BiDi textSeigo Nonaka
The crash was introduced by Ib66ef392c19c937718e7101f6d48fac3abe51ad0 The root cause of the crashing is requesting out-of-line access for the horizontal width. This invalid access is silently ignored by TextLine#measure() method but new implementation end up with out of bounds access. To makes behavior as old implementation, calling getHorizontal instead of accessing measured result array. Bug: 78464361, 111580019 Test: Manually done Change-Id: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8 (cherry picked from commit 960647d582911ae7ab8b9491097898e6c313aaf1) Merged-In: I5c5778718f6b397adbb1e4f2cf95e9f635f6e5c8 (cherry picked from commit d30c55e3ccf25668fcbccf29c94224fd1d2e67b6)
2018-08-16RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.akirilov
Bug: 67319274 Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved Change-Id: I2771c048e13529e168121c5a5501aa26fc21e30f (cherry picked from commit 821076440434443af4257c5ba0b7b1f037735041)
2018-08-16DO NOT MERGE. Extend SQLiteQueryBuilder for update and delete.Jeff Sharkey
Developers often accept selection clauses from untrusted code, and SQLiteQueryBuilder already supports a "strict" mode to help catch SQL injection attacks. This change extends the builder to support update() and delete() calls, so that we can help secure those selection clauses too. Bug: 111085900 Test: atest packages/providers/DownloadProvider/tests/ Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java Change-Id: Ib4fc8400f184755ee7e971ab5f2095186341730c Merged-In: Ib4fc8400f184755ee7e971ab5f2095186341730c (cherry picked from commit 09d49531334ce6bc4ac45de1d3d0edb1495c0566)
2018-08-16DO NOT MERGE. Execute "strict" queries with extra parentheses.Jeff Sharkey
SQLiteQueryBuilder has a setStrict() mode which can be used to detect SQL attacks from untrusted sources, which it does by running each query twice: once with an extra set of parentheses, and if that succeeds, it runs the original query verbatim. This sadly doesn't catch inputs of the type "1=1) OR (1=1", which creates valid statements for both tests above, but the final executed query ends up leaking data due to SQLite operator precedence. Instead, we need to continue compiling both variants, but we need to execute the query with the additional parentheses to ensure data won't be leaked. Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java Bug: 111085900 Change-Id: I6e8746fa48f9de13adae37d2990de11c9c585381 Merged-In: I6e8746fa48f9de13adae37d2990de11c9c585381 (cherry picked from commit 5a55a72fcd18fb676eb4c114e62048068f71c01a)
2018-08-16DO NOT MERGE. Persistable Uri grants still require permissions.Jeff Sharkey
When FLAG_GRANT_PERSISTABLE_URI_PERMISSION is requested, we still need to check permissions between the source and target packages, instead of shortcutting past them. The spirit of the original change is remains intact: if the caller requested FLAG_GRANT_PERSISTABLE_URI_PERMISSION, then we avoid returning "-1", which would prevent the grant data structure from being allocated. Bug: 111934948 Test: atest android.appsecurity.cts.AppSecurityTests Change-Id: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030 Merged-In: Ief0fc922aa09fc3d9bb6a126c2ff5855347cd030 (cherry picked from commit 05519b7e3d0f3d16ddfe6ee3892c8468a2c10c62)
2018-08-16Optimise the hit test algorithmMihai Popa
Layout#getOffsetForHorizontal was running in O(n^2) time, where n is the length of the current line. The method is used when a touch event happens on a text line, to compute the cursor offset (and the character) where it happened. Although this is not an issue in common usecases, where the number of characters on a line is relatively small, this can be very inefficient as a consequence of Unicode containing 0-width (invisible) characters. Specifically, there are characters defining the text direction (LTR or RTL), which cause our algorithm to touch the worst case quadratic runtime. For example, a person is able to send a message containing a few visible characters, and also a lot of these direction changing invisible ones. When the receiver touches the message (causing the Layout#getOffsetForHorizontal method to be called), the receiver's application would become not responsive. This CL optimizes the method to run in O(n) worst case. This is achieved by computing the measurements of all line prefixes at first, which can be done in a single pass. Then, all the prefix measurement queries will be answered in O(1), rather than O(n) as it was happening before. Bug: 79215201 Test: manual testing Change-Id: Ib66ef392c19c937718e7101f6d48fac3abe51ad0 Merged-In: Ib66ef392c19c937718e7101f6d48fac3abe51ad0 (cherry picked from commit 69b589b21d02cd380a6827c39e56cbd12a804ffd)
2018-08-10Merge cherrypicks of [4741663, 4741664, 4741665, 4741666, 4743080, 4743081, ↵android-8.1.0_r46oreo-m6-s4-releaseandroid-build-team Robot
4743082, 4743083, 4741262, 4741263, 4741264, 4741265, 4741266, 4741667, 4743084, 4741242, 4741243, 4741741, 4741742, 4741743, 4741744, 4741822, 4743085, 4741668, 4741338, 4743055, 4743056, 4743070, 4743073, 4743075, 4743076, 4743078, 4743079, 4743161, 4743162, 4743164, 4743165, 4743167, 4743168, 4743169, 4743170, 4741681, 4741682, 4741683, 4741684, 4741685, 4741686, 4741687, 4741688, 4741689, 4741690, 4741691, 4741692, 4741693, 4741694, 4741695, 4741696, 4741697, 4741698, 4741699, 4743240, 4743241, 4743242, 4743243, 4741745, 4741823, 4741824, 4741825, 4741267, 4741268, 4743244, 4743280, 4743281, 4743224, 4743203, 4743204, 4743205, 4741746, 4741747, 4743245, 4741826, 4741827, 4741828, 4741829, 4741748, 4741749, 4741750, 4743233, 4743282, 4741244, 4741245, 4741246, 4741247, 4743206, 4743207, 4743208, 4743209, 4743210, 4743211, 4743212, 4743213, 4743214, 4743215, 4743216, 4743217, 4743218, 4743219, 4743360, 4743361, 4743362, 4743363, 4743364, 4743365, 4743366, 4743367, 4743368, 4743369, 4743370, 4743371, 4743372, 4743373, 4743374, 4743375, 4743376, 4743377, 4743283, 4743284, 4741830, 4742501, 4743246, 4743086, 4743087, 4743378, 4743379, 4741751] into sparse-4749909-L04200000199131547 Change-Id: I1492186998ee5230a67cd2efaf8c68d8b008cb7e
2018-08-10Fix TrackInfo parcel writeRobert Shih
Bug: 77600398 Change-Id: Ia316f1c5dc4879f6851fdb78fe8b9039579be7bc (cherry picked from commit 0d2dc943dcaa3d7c8479e22ae62be9753ea2643c)
2018-08-10vpn: allow IPSec traffic through Always-on VPNBernie Innocenti
This won't leak any traffic outside the VPN as long as there are no processes owned by uid 0 which generate network traffic (which is currently the case). Bug: 69873852 Test: compared the output of 'adb shell ip rule show' before and after Test: runtest -x frameworks/base/tests/net/java/com/android/server/connectivity/VpnTest.java Test: local CTS tests run: android.net.cts.VpnServiceTest Test: local CTS tests run: com.android.cts.devicepolicy.MixedDeviceOwnerTest Change-Id: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6 Merged-In: I8758e576c9d961d73f62bfcf0559dd7ecee6e8e6 Merged-In: I1f9b78c8f828ec2df7aba71b39d62be0c4db2550 Merged-In: I8edeb0942e661c8385ff0cd3fdb72e6f62a8f218 (cherry picked from commit 00000fe55a4729f8339afdc7eab5c970b2549813) (cherry picked from commit ef2910dc709d698b6476e8d462c608d04c784a26)
2018-08-10Resolve inconsistent parcel read in NanoAppFilterArthur Ishiguro
Bug: 77599679 Test: Compile only Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266 (cherry picked from commit abe5a73a4a81e312a1690fbc10a6b99ce98b699a)
2018-08-10Backport Prevent shortcut info package name spoofingMakoto Onuki
Test: cts-tradefed run cts -m CtsShortcutManagerTestCases -t android.content.pm.cts.shortcutmanager.ShortcutManagerFakingPublisherTest Bug: 109824443 Change-Id: I90443973aaef157d357b98b739572866125b2bbc Merged-In: I78948446a63b428ae750464194558fd44a658493 (cherry picked from commit 9e21579a11219581a0c08ff5dd6ac4dc22e988a4)
2018-08-10Fix DynamicRefTable::load security bugRyan Mitchell
DynamicRefTables parsed from apks are missing bounds checks that prevent buffer overflows. This changes verifies the bounds of the header before attempting to preform operations on the chunk. Bug: 79488511 Test: run cts -m CtsAppSecurityHostTestCases \ -t android.appsecurity.cts.CorruptApkTests Change-Id: I02c8ad957da244fce777ac68a482e4e8fa70f846 Merged-In: I02c8ad957da244fce777ac68a482e4e8fa70f846 (cherry picked from commit 18a6ada4aa136da4f50f03fff91d61d448ced195)
2018-08-10ResStringPool: Prevenet boot loop from se fixRyan Mitchell
Changes the logs adding in a previous security fix to warnings so devices with malformed APKs currently on them will not undergo DOS when they are upgraded to P. Bug: 79724567 Test: run cts -m CtsAppSecurityHostTestCases \ -t android.appsecurity.cts.CorruptApkTests Change-Id: Ied54e4bb14abdaf79da562022c7ea6075187c1f8 (cherry picked from commit f05f47b2c1838529e682ad8f931d3da72244b1a1) (cherry picked from commit c31cf80008fdb06ea8e1eab9764096653e7854b1)
2018-08-10Make safe label more safeTodd Kennedy
* limit the absolute maximum size of the label to 50000 characters [which is probably far more than necessary, but, can be dialed down] * use a string buffer while processing the string [instead of creating multiple string objects] Bug: 62537081 Test: Manual. Install APK in bug and see that it can be uninstalled Change-Id: Ibf63c2691ad7438a123e92110d95b1f50050f8b1 Merged-In: Ibf63c2691ad7438a123e92110d95b1f50050f8b1 (cherry picked from commit 2263da9539daef134395226a2718ba2d7af7547d)
2018-08-10WM: Prevent secondary display focus while keyguard is upAdrian Roos
Fixes an issue where input intended for the keyguard could end up going to a different display. To prevent this, make sure that only the default display can get focused when the keyguard is showing. Change-Id: I6463c44aedca06930d2c9bda7c45ffd93141308c Merged-In: I6463c44aedca06930d2c9bda7c45ffd93141308c Fixes: 71786287 Test: atest DisplayContentTests (cherry picked from commit 3cd5e3d9bbb3255e874b8fa27d7ed506164905dd)
2018-08-10DO NOT MERGE: Add unit tests to ensure VPN meterednessBenedict Wong
These new tests ensure that VPNs report the meteredness of their underlying networks correctly. The added test verifies VPN meteredness for cases of metered and unmetered WiFi and Cell Bug: 78644887 Test: This; ran on walleye-eng Change-Id: I28bdc71a336bfd97f7908455d4781d774df44b87 (cherry picked from commit 66bc52884b1009fca7917ae89e72e8aa40f394d1)
2018-08-10DO NOT MERGE: Fix ConnectivityController meteredness checksBenedict Wong
This patch corrects ConnectivityController's meteredness checks to perform correct meteredness checks while VPNs are running. This fixes a bug in O-MR1 where any apps using the DownloadProvider with unmetered network constraints fail to start while the VPN is enabled. This change adds a bespoke method for ConnectivityController, allowing it to correctly identify the meteredness without affecting public API surfaces. Bug: 78644887 Test: Built, flashed on Walleye, and tested. Test: Additional test coverage in subsequent patch(es). Change-Id: Ie1d11d93d51d936ce81cd5984af61bde30325983 (cherry picked from commit d08ab5a641d9d81314c9439724dd34338fa81d58)
2018-08-10clearCallingIdentity before calling into getPackageUidAsUserTony Mak
Fix: 70585244 Bug: 69981755 Test: Enable any accessibility service -> inflate work profile -> Tap on any work app -> no longer crash Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest.testPrimaryUserToManagedProfile Change-Id: I80d18f4e2ab76a228cb0aa2c8312c323a9b5c84d (cherry picked from commit 857326e3731939f6ec7979e1d86585bf0ea484f4)
2018-08-10Nullcheck to fix Autofill CTSEugene Susla
Test: presubmit Fixes: 70506475 Bug: 69981755 Change-Id: I187bed4889a4901a7137a2995178ea651ed09186 (cherry picked from commit 6c68a692880b7cc981e130aace0edb9f2fcffff6)
2018-08-10Osu: fixed Mismatch between createFromParcel and writeToParcelEcco Park
Bug: 77600924 Change-Id: I46d765892e8e6839ed5140a3b0d6bb1815ccf9bc Signed-off-by: Ecco Park <eccopark@google.com> (cherry picked from commit 9a59cf84506e9fa841524ac2c70ae683449e709a)
2018-08-10DO NOT MERGE Truncate newline and tab characters in BluetoothDevice nameHansong Zhang
Test: manual Bug: 73173182 Change-Id: I7f2201cab36adf7f01d1a794d783cb78a536811f (cherry picked from commit 24da173b63b17a0bc6c80b2fcfefa7fe4574a15b)
2018-08-10Fix broken check for TelephonyManager#getForbiddenPlmnssqian
(backport from a fix merged in pi-dev) Bug: 73884967 Test: Treehugger Change-Id: I9deaae20893184cde36dcd936fe83708fa60b830 Merged-In: I0cf7920e138892fbcab71fae0eed1293f0b2e404 Merged-In: I9e3456e5f1e479b0e2b102f6c90db57cd0e977fe (cherry picked from commit 7b52a48d6b10e3ed2806b57d39a2d9211dd4b585)
2018-08-10DO NOT MERGE (O) Revoke permision when group changedPhilip P. Moltmann
If a run time permission of a group is already granted we grant the other permission of the group automatically when requested. Hence if an already granted permission changed its group during an update suddenly permission of a potentially not approved group will get auto-granted. This is undesirable, hence we revoke the permission during the update process. Test: atest android.permission.cts.PermissionGroupChange Change-Id: Ib2165d1ae53b80455ebe02e07775853e37a2e339 Fixes: 72710897 (cherry picked from commit 0ed1b472af194896fcf421dc862c443343c7c127)
2018-08-10ResStringPool: Fix security vulnerabilityy
Adds detection of attacker-modified size and data fields passed to ResStringPool::setTo(). These attacks are modified apks that AAPT would not normally generate. In the rare case this occurs, the installation cannot be allowed to continue. Bug: 71361168 Bug: 71360999 Test: run cts -m CtsAppSecurityHostTestCases \ -t android.appsecurity.cts.CorruptApkTests Change-Id: If7eb93a9e723b16c8a0556fc4e20006aa0391d57 Merged-In: If7eb93a9e723b16c8a0556fc4e20006aa0391d57 (cherry picked from commit 7e54c3f261d81316b75cb734075319108d8bc1d1)
2018-08-10RESTRICT AUTOMERGE: Prevent reporting fake package name - framework ↵akirilov
(backport to oc-mr1-dev) Test: added AccessibilityEndToEndTest#testPackageNameCannotBeFaked cts-tradefed run cts -m CtsAccessibilityServiceTestCases cts-tradefed run cts -m CtsAccessibilityTestCases Bug: 69981755 Change-Id: If3752e106aa7fdee4645dc9852289af471ceff18 Merged-In: I13304efbee10d1affa087e9c8bc4ec237643283e (cherry picked from commit c36db6d473c9988496cd614924ee113b67f7e333)
2018-08-10Use concrete CREATOR instance for parceling listsFyodor Kupolov
Replaced readTypedArrayList/writeTypedArrayList with writeTypedList/createTypedArrayList(CREATOR) Bug: 71508348 Test: CtsAutoFillServiceTestCases pass Merged-In: I2a8321023b40cc74b7026eb0fb32a9cc5f5543a9 Change-Id: Id17d02e40a4ae567bf2d74d2ea8ba4d8a943bdb7 (cherry picked from commit 4921986db76b1580bcb6ec8b2fd381d1364a6325)
2018-08-10Rework thumbnail cleanupMarco Nelissen
Bug: 63766886 Test: ran CTS tests Change-Id: I1f92bb014e275eafe3f42aef1f8c817f187c6608 (cherry picked from commit 6d2096f3889d38da60099b1b5678347de4f042bf)
2018-08-10DO NOT MERGE - fix AFM.getComponentNameFromContext()Felipe Leme
This method broke on O-MR1 when I3abf999eb6056c1df7982780bae43b58337c0668 was chery-picked from master. Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \ -t android.autofillservice.cts.AttachedContextActivityTest#testAutofill Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases Also individually ran tests that failed (due to flakiness) when ran in a suite: Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases \ -t android.autofillservice.cts.OptionalSaveActivityTest#testDontShowSaveUiWhenUserManuallyFilled_oneDatasetAllRequiredFields Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.PreSimpleSaveActivityTest #testTapLink_tapBack_thenStartOverBySayingYesAndManualRequest Fixes: 71960322 Change-Id: Ia093dcefe6699dc9493c46d671e48c2000214b31 Merged-In: I3abf999eb6056c1df7982780bae43b58337c0668 (cherry picked from commit b25b4736db2ea05dce6b9f03e8a9920ab338dd5a)
2018-08-10Proper autofill fix to let phone process autofill Settings activity.Felipe Leme
Test: adb shell am start com.android.settings/.RadioInfo Bug: 69981710 Fixes: 70506888 Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d Merged-In: Id29bad2d20b621f7379eb6144c95dcc819949b3d (cherry picked from commit 97f16a76db29269619d9a1b45d4cea49026a5b6a) (cherry picked from commit 92b5d2783a1b97bee476f04754481403839b4e45)
2018-08-10Make sure apps cannot forge package name on AssistStructure used for Autofill.Felipe Leme
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.VirtualContainerActivityTest#testAppCannotFakePackageName Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases Bug: 69981710 Change-Id: Id6036cddb51dd8dd0c9128b7212d573f630d693f Merged-In: Id6036cddb51dd8dd0c9128b7212d573f630d693f (cherry picked from commit 23e61a9086a34405e277868474e003b37ed1b711)
2018-04-13Merge cherrypicks of [3898937, 3898958, 3899077, 3897885, 3898496, 3898245, ↵android-8.1.0_r25oreo-m2-s1-releaseandroid-build-team Robot
3898959, 3898960, 3897790, 3898312, 3898313, 3898314, 3899155, 3899156, 3899157, 3898289, 3898290, 3899061, 3898291, 3898292, 3896951, 3899158, 3898961, 3898938, 3898246] into sparse-4657601-L30800000163316240 Change-Id: Ic46c21eef4b216774452afbac399e3d04947f053
2018-04-13Fixed Security Vulnerability of DcParamObjectPengquan Meng
The writeToParcel and readFromParcel is not symmetry, fixed it. Test: no test Bug: 70721937 Change-Id: I01f6f6b2ab778ee8b638d9b69fe0a6b9aa7ee395 (cherry picked from commit 8c55a70728fdb0a7b0585fac08629b0137dca51e)
2018-04-13Update internal ViewPager's SavedState to match Support Library versionAlan Viverette
Merged-In: Ic4569b21d8a26a62bba91742b442f0c3ea8bcc9e Change-Id: I17d085be9ce1a139e75264f1e715df7f565cd41b Fixes: 71992105 Test: manual (cherry picked from commit 187964aca12115c7ab66f59d1ebb95e4f4130ac6)
2018-04-13[DO NOT MERGE] Copy PermissionChecker from support lib and use in ↵Eugene Susla
RcognitionService Fixes: 73511076, 73311729 Test: presubmit Change-Id: Ie98f67ffee4744050ac85d8b229370a16a76a194 (cherry picked from commit 726b51a26e9a54b7352aad90ed15edccc44dd60d) (cherry picked from commit 5a28e533fe8865ed371b5c0fd909a4ec89f63633)
2018-04-13[DO NOT MERGE] Add permission check to setAllowOnlyVpnForUidsRubin Xu
Bug: 63000005 Test: runtest frameworks-net -c com.android.server.connectivity.VpnTest Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnLockDown Merged-In: Ia1a82ee73d8617f3124032986fe6c09c14bf7752 Change-Id: Ia1a82ee73d8617f3124032986fe6c09c14bf7752 (cherry picked from commit f915e04d5010c4dfffad263fa70c1e412e856314)
2018-04-13Verify last array's length in readFromParcelFyodor Kupolov
Length of the last array in readFromParcel should be the same as value of mNextIndex. Test: PoC app in the bug Bug: 73252178 Change-Id: I69f935949e945c3a036b19b4f88684d906079ea5 (cherry picked from commit 3b8bc2e45048527d7682b24b96957c34433da382)
2018-03-15Snap for 4603989 from 833770d26f7813768e195d22ca9c8e41dc83448a to oc-m2-releaseandroid-8.1.0_r20oreo-m2-releaseandroid-build-team Robot
Change-Id: Id2935bbe1630247131e87ed78cc70a7e3aaa0f5b
2018-02-09Merge cherrypicks of [3594034, 3594272, 3594273, 3594274, 3594275, 3594347, ↵android-wear-8.1.0_r1android-8.1.0_r19oreo-mr1-wear-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingandroid-build-team Robot
3594035, 3592471] into oc-mr1-release Change-Id: Id0214b5206fd01da1829b1475cef34ecac46f4e2