summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-01Merge "Snap for 5042378 from 00d9027e38e8337b2358a06aa7e14840d6a1dfe9 to ↵android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10pie-vts-releaseandroid-build-prod (mdb)
pie-vts-release" into pie-vts-release
2018-10-01Snap for 5042378 from 00d9027e38e8337b2358a06aa7e14840d6a1dfe9 to ↵android-build-prod (mdb)
pie-vts-release Change-Id: I00ee3b39d93354c930e5b5a5f2a97c70f5309284
2018-09-05Merge "Snap for 4994203 from 641b3da47a5164698088dc9046ea56c026df891a to ↵android-build-prod (mdb)
pie-vts-release" into pie-vts-release
2018-09-05Snap for 4994203 from 641b3da47a5164698088dc9046ea56c026df891a to ↵android-build-prod (mdb)
pie-vts-release Change-Id: I02ad2aec1e874b34f29292d7ab9c4387347c740d
2018-08-30Merge cherrypicks of [4902692, 4902722, 4902585, 4902586, 4902656, 4902657] ↵android-9.0.0_r9pie-releaseandroid-build-team Robot
into pi-release Change-Id: If515a747511b8d1dcc14339e0d4e0d8426baa6db
2018-08-30Revert "RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed ↵Elisa Pascual Trevino
package." This reverts commit fde947837c848b51a830b74b28f96f9808405492. Reason for revert: b/111752150 Change-Id: Ifc60261cd78e606e01f7a68626a1710699ff7bc7 (cherry picked from commit 307c6c50a7b374b4ab034560bb67a204071b5bca)
2018-08-16Merge cherrypicks of [4793300, 4793320, 4793321, 4793340, 4793322, 4793061, ↵android-build-team Robot
4793323, 4793324, 4793325, 4793380, 4793341, 4793342, 4793343, 4793265, 4793131, 4793132, 4793266, 4793133, 4793134, 4793400, 4793229, 4793381, 4793382, 4793383, 4793384, 4793385, 4793386, 4793387, 4793388, 4793062, 4793105, 4793063, 4793135, 4793389, 4793420] into pi-release Change-Id: I5612c00adb30f4fc6c6d170f59b3533a5c8e58a2
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 a1076fdaa54ebf56bb32bea43fb278f7470ff307)
2018-08-16RESTRICT AUTOMERGE: Revoke permissions defined in a to-be removed package.Hongming Jin
Bug: 67319274 Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved Change-Id: Id23535d6c4d2fcf5c86dc1338af13a561b32154c (cherry picked from commit fde947837c848b51a830b74b28f96f9808405492)
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 506994268bc4fa07d8798b7737a2952f74b8fd04)
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 57b04a86802ff879af78e782a8582462323e34e7)
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 d6a6e7127cc341ca875d9d13cf7a864d9f20b479)
2018-08-16Fix for incorrect cycle evaluation in computeOomAdj DO NOT MERGEAmith Yamasani
Use the conservative value of adj and procstate if at least one evaluation pass was completed, even if the value is not final. The later iterations through the procs that have cycles will elevate the apps if necessary. Otherwise the dependencies will just get stuck in a low state. Bug: 79643956 Test: Manual test of connecting to AA and turning off screen atest CtsAppTestCases:ActivityManagerProcessStateTest Change-Id: If520eb239935782e2487b16e8bb650ded775f184 (cherry picked from commit d2aa4e1913c05d8c21e81eef3ad941565aded7d6)
2018-08-01Merge cherrypicks of [4667264, 4667744, 4667382, 4666687, 4667506, 4667745, ↵android-9.0.0_r5android-build-team Robot
4667225, 4667226, 4667227, 4667228, 4668483, 4668486, 4668487, 4668489, 4666733, 4668492, 4668493, 4668495, 4667548, 4667482, 4667549, 4667550, 4667551, 4667552, 4667553, 4667554, 4667555, 4667556, 4666734, 4666688, 4668511, 4668531, 4667265] into pi-release Change-Id: I26a6ed48d90dc60293403c9777b1a432a4ca7dbd
2018-08-01Fix TrackInfo parcel writeRobert Shih
Bug: 77600398 Change-Id: Ia316f1c5dc4879f6851fdb78fe8b9039579be7bc (cherry picked from commit 0d2dc943dcaa3d7c8479e22ae62be9753ea2643c)
2018-08-01vpn: 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 ae07a6bf53cc9650039c4f2918baf58d522b49f9)
2018-08-01Resolve inconsistent parcel read in NanoAppFilterArthur Ishiguro
Bug: 77599679 Test: Compile only Change-Id: Ib417a5cb4d51744442d2fb14437cabbe5fd1c266 (cherry picked from commit abe5a73a4a81e312a1690fbc10a6b99ce98b699a)
2018-08-01Backport 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-07-17Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, ↵android-vts-9.0_r4android-cts-9.0_r2android-cts-9.0_r1android-9.0.0_r3android-9.0.0_r2android-9.0.0_r1android-build-team Robot
4564351, 4564352, 4564333, 4564033, 4560455, 4564034, 4560674, 4560675, 4563620, 4561607, 4561062, 4561063] into pi-release Change-Id: I8b6494e6539f685ea265cd74dfbfa88ab3cb289f
2018-07-17Loosen resource file verificationTodd Kennedy
Bug: 77808145 Test: Tried to install corrupt APK prior to the change, install failed Test: Tried to install corrupt APK after the change, install succeeded Test: atest CtsAppSecurityHostTestCases:CorruptApkTests Change-Id: I19a69e52a17c1080beaf2cc575c32f564b1033a3 (cherry picked from commit 28e663cbed28fb6c8c8dec0849e0277daf67651b)
2018-07-17Fix crash on calling getAppStandbyBucket()Amith Yamasani
MATCH_ANY_USER, which was locked down recently, is not really needed in this context, so removed it. Bug: 111145886 Test: cts CtsAppUsageHostTestCases Change-Id: I1bb9df0c7370015365bea414599b2b83084a1846 (cherry picked from commit 99e1424e0aa9e7dc4a5ccbff011d7161201921d1)
2018-07-17Acquire service lock in AppTaskImpl.moveToFront()Wale Ogunwale
Oversight from previous refactor in O release done in ag/2987716 Change-Id: I2e2d6e55251eb319ddee0db97eedc1c574736ead Merged-In: I2e2d6e55251eb319ddee0db97eedc1c574736ead Fixes: 111336376 Test: builds (cherry picked from commit bc4d0326a04c19500f44283fbfab581257d3c75e)
2018-07-17Add active admin app to power white list.Lei Yu
So user can't restrict it in settings app. Bug: 110337989 Test: RunSettingsLibTests Change-Id: Ie32dc8b2204369c9ca8f704436d5c988f76481ae Merged-In: Ie32dc8b2204369c9ca8f704436d5c988f76481ae (cherry picked from commit f5a13f8b3a0ce1a3ee6e49802e32db3f3fb38d6d)
2018-06-21Merge cherrypicks of [4392181, 4392182, 4392183, 4392184, 4392201, 4392202] ↵android-build-team Robot
into pi-release Change-Id: I8e1428f12ab9bf4cc2b1a322e64b4aa41aa0ae41
2018-06-21Stabilize hidden API listsDavid Brazdil
Hidden API lists are auto-generated using a combination of Doclava /Makefile rules and manually curated lists. As OEMs make their own changes to the framework, they might arrive at slightly different lists. This is not desirable as the entire ecosystem should enforce the same rules. This patch adds the files generated by Doclava to the code base, which will stabilize the lists for everyone. The problem is exacerbated by the fact that the Doclava-generated private-dex.txt contains only classes explored by Doclava. This can change rather unexpectedly as OEMs make changes and start/stop using internal classes otherwise only used in unexplored code. If the file is extended, they might start blacklisting new APIs. If the file shrinks, they might start whitelisting APIs they should restrict access to and have trouble passing CTS. (Avoid merging out of pi trees) Test: m ; check that produced lists have not changed Bug: 109824927 Merged-In: I0e9653d9cd7e4b748870bacb6fbcecae535ebb2a Change-Id: I1463a06d6510e7051a64d5d516f4c589638ca11c (cherry picked from commit 5999830557004ec70158e91cde2e9ff4e52dbb74)
2018-06-21More light grey APIs.Nicolas Geoffray
bug: 110157261 bug: 110065832 bug: 110179435 bug: 110174713 bug: 110191494 bug: 110282922 bug: 110289776 bug: 110314356 bug: 110340642 bug: 110382035 Bug: 110444248 Bug: 110447432 bug: 110378707 Test: m Change-Id: I5d7c0f9d471eab22e23cc335f03cebecb642f871 (cherry picked from commit 43536175f2c29b1dcb15e3e104bd1aa11a0f3a4a)
2018-06-21Fix race condition in MediaHTTPConnectionMarco Nelissen
getSize() and getMIMEType() rely on seekTo() having completed. If seekTo() was called on a different thread, for example because NuCachedSource2 was doing reads on a background thread, getSize() could return -1 if it was called after connection was established, but before the response had been parsed. Bug: 110230427 Test: manual Change-Id: I469b47e025f1c7a7ef3123d3347668f0541e6f2d (cherry picked from commit d4f64f27b0de1c5d21c93b4d73acd05ede28fde2)
2018-06-21Don't throw uri exceptions for user chosen soundsJulia Reynolds
Bug: 109889733 Test: runtest systemui-notification Change-Id: I5ed599deca83f97899affce44e3ed8fbcacae366 (cherry picked from commit 218871ee3ffffea964658be327ffd06e1e3eed61) (cherry picked from commit 89945c5a222ab2761ab086588c1ac5434cca661f)
2018-06-18Merge cherrypicks of [4368877, 4369031, 4369032, 4369033, 4369034, 4368878, ↵android-build-team Robot
4369035, 4369036, 4369008] into pi-release Change-Id: I961d7c7e4922defecafaa3976c69491a2b20c71e
2018-06-18audioservice: fix a2dp connection race conditionEric Laurent
In case of fast (< 1 second) A2DP disconnect/connect sequence, there is a potential race condition where the delayed disconnection message (due to becoming noisy intent) is received after the not delayed connection message. - Make sure all messages related to device connection/disconnection (including MSG_A2DP_DEVICE_CONFIG_CHANGE and MSG_BTA2DP_DOCK_TIMEOUT) are handled by queueMsgUnderWakeLock(). - Make sure messages are processed in the same order as API calls. - Add check for null address in makeA2dpDeviceUnavailableNow(). Bug: 109903807 Bug: 78837311 Test: repro steps in bugs. A2DP connection and playback Change-Id: Ib81b3805f945f7206b1a60de74e9bbeeef89bdd0 (cherry picked from commit 3c4636c7127cd34728050d051ef3bd62829e877d)
2018-06-18Abbreviate permission labels less aggressivelyPhilip P. Moltmann
We switched the package installer app to always abbreviate all labels loaded from foreign packages. This is done so that a foreign app cannot crorrupt the UI via super-long strings. The default abbreviation is very aggressive and abbreviates to ~5 cm. When an app with a targetSDK <= M gets installed, all permissions will get auto-granted. Hence when a user side-loads such an app, we show the permissions during install so that the user is aware of this. Unfortunately most permission labels and restrictions do not fit into a single line. This change allows much longer strings for permissions names and descriptions. It still abbreviates eventually and handles permission descriptions with weird characters (such as back-space) correctly. Fixes: 110209410 Test: Side-loaded old app and verified that permission labels and descriptions are not abbreviated. Change-Id: Ie1db240883c9f5cb9c1b74ca7bdcb80625e3f7f2 (cherry picked from commit 004e489a251d6adf94922368e98a730185642123)
2018-06-18Make testSplitscreenPortraitAppOrientationRequests pass to unblock releaseWale Ogunwale
Work around to unblock the release for failing test ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests which shouldn't be failing since home stack shouldn't be visible. We need to dig deeper to see why it is failing. NOTE: Not failing on current master... Bug: 110159357 Test: atest ActivityManagerAppConfigurationTests#testSplitscreenPortraitAppOrientationRequests Change-Id: I69423eef3661133b2a032a166745157b3e344751 (cherry picked from commit cf2d6475f9fc885e8bc9761ef2d839eaad3f32b4)
2018-06-18docs: repaired link to internal sectionLaura Davis
Test: make ds-docs Bug: 79236136 Change-Id: Idf48cf7a055a0aa3841d6b4d0540724b43c61241 (cherry picked from commit 22dbf294bb0cc3bf4975a6836d3ad74b2f22a0b4)
2018-06-13Allow unsuspending critical packagesSuprabh Shukla
PackageManager prevents certain packages from being suspended to ensure device is in a sane state. It should not disallow unsuspening these packages for the same reason. Test: Existing tests: atest FrameworksServicesTests:SuspendPackagesTest Manually, changed the default dialer, then adb shell pm suspend com.android.dialer change the default dialer to com.android.dialer, then adb shell pm unsuspend com.android.dialer should succeeed. Bug: 79846500 Change-Id: Ie198f61bf3b092e497f978e60a27f9d52cdda9c7 (cherry picked from commit 4d74d50f53882560ac20c06de53b40f030e31fec)
2018-06-13Make rotate nav+qs icon consistent, understandableMike Digman
Now using the same iconography (but different angle) for nav and qs. Note nav viewport, size and pivot (for motion) change is intentional to match other navbar icon sizing. Test: manual Change-Id: I1abb33130cc724b6e63e008cf7301ebce383c8d1 Fixes: 110052596 (cherry picked from commit 2657757c432a95100ad6a2aed5a36c7dcd296aae)
2018-06-13Keeping the lockdown state in sync with the notification listSelim Cinek
Whenever the lockdown was changed, the UI wasn't consistently updated, but only once another notification / update came in, which lead to notifications being invisisible or visible when they shouldn't have been. Change-Id: I17c1b4e0ef58d6aa05f4404e52e07a098d4fce4e Fixes: 78020486 Test: manual, hit lockdown observe notification gone, coming back when unlocked (cherry picked from commit ddb7b47dd0c875318669cc2d68f84de49710d138)
2018-06-12Merge cherrypicks of [4315359, 4315389, 4315390, 4315519, 4315520, 4315360, ↵android-build-team Robot
4317665, 4317701, 4315391, 4316085] into pi-release Change-Id: I35248f1228a04b847fdb7ecdb15d48190fbaf759
2018-06-12Revert "Defer stop for all activities becoming invisible"Winson Chung
This reverts commit b824f87c65216e4dfe5e9ab0e63795466836bc0f (for b/80313326) Reason for revert: Cts issues (b/110032866) Bug: 80313326 Bug: 110032866 Change-Id: Iaca3a8650d30b475ef4331e98b4b14377072ee4d (cherry picked from commit f49b106dca1b878319a09a1acf8582c05c360a30)
2018-06-12AudioService: fix deallock setBluetoothScoOn vs setModeJean-Michel Trivi
In AudioService: setBluetoothScoOn() > setBluetoothScoOnInt() > synchronized(mSettingsLock) > muteRingerModeStreams() > synchronized (VolumeStreamState.class) vs setMode() > setModeInt() > synchronized (mSettingsLock) > synchronized (VolumeStreamState.class) The issue comes from setBluetoothScoOnInt() releasing the lock on mSettingsLock before calling muteRingerModeStreams(). This breaks the expected lock ordering in AudioService, where mSettingsLock must be locked before VolumeStreamState.class. Bug: 109746821 Test: see bug Change-Id: I853ca60781efc506626b6345f27da701655ac359 (cherry picked from commit c106d9f958be76ab14a6724525f39bc3fec03fd2)
2018-06-10Snap for 4832339 from 9b1f560ee56e0c7538f6656a9459a905416509f0 to pi-releaseandroid-build-team Robot
Change-Id: Ib743f4471d6d2db801d874d397b68a81ff59c6cc
2018-06-10Merge "Include "emergency calls only" in disabled SIM strings." into pi-devbsears
2018-06-08Merge "Revert "Fix DefaultPermissionGrantPolicyTest"" into pi-devTreeHugger Robot
2018-06-08Merge "Revert "Added online-sdk & off-sdk for Metalava"" into pi-devNan Zhang
2018-06-08Revert "Added online-sdk & off-sdk for Metalava"Nan Zhang
This reverts commit 726df7efc9e8faad94ee8133fcb4fd976b66ebda. Reason for revert: <Didn't add Merged-in which flows this change down to pi-dev-plus-aosp> Bug: b/78245848 Change-Id: Ie15181bcb91314718ee9902402179cd010f17553
2018-06-08Merge "Revert "Consider icon scale when calculating icon offset in shelf"" ↵Selim Cinek
into pi-dev
2018-06-08Merge "Fixed a flickering of the icon when it goes into the shelf" into pi-devSelim Cinek
2018-06-08Revert "Fix DefaultPermissionGrantPolicyTest"Eugene Susla
This ended up being not the right fix for the bug, and had a consequence of AiAi permissions becoming fixed. Per recent email thread, reverting this back to how it was This reverts commit 0988f24dfff1529552c857fb1c28592070ecc1b8. Fixes: 109665265 Change-Id: Ibf39c3b788c09f189d941f830ebbe8f371fc6f6a
2018-06-08Merge "More light grey APIs." into pi-devTreeHugger Robot
2018-06-08Include "emergency calls only" in disabled SIM strings.Dan Sandler
This message appears in the QS footer when the SIM has been disabled permanently (IccCardConstants.State.PERM_DISABLED). Required in Australia, harmless elsewhere. Test: runtest systemui Bug: 109874640 Change-Id: Ib2b3fcf2bd84c54b61f0bd45fe0b83209d9c9bd0
2018-06-08Added online-sdk & off-sdk for MetalavaNan Zhang
Test: m -j metalava online-sdk-docs Bug: b/78245848 Change-Id: I2cf92b14d20ecb2898e90c5e5956612f49acd33c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 13:59:49 +0000