summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-12-02merge in nougat-cts-release history after reset to nougat-cts-devandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10nougat-cts-releasegitbuildkicker
2016-12-01merge in nougat-cts-release history after reset to nougat-cts-devgitbuildkicker
2016-09-27DO NOT MERGE Check caller for sending media key to global priority sessionandroid-7.0.0_r15nougat-releaseJaewan Kim
Prevent sending media key events from the non-system app to the global priority session through the MediaSessionManager.dispatchMediaKeyEvent(). Note that any app can use the API indirectly with the public API AudioManager.dispatchMediaKeyEvent(). Bug: 29833954 Tested: Installed malicious apps and confirmed that they don't work. Tested: Run CtsTelecomTestCases and CtsMediaTestCases Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15 (cherry picked from commit 09c3df004bad9343092e377a7e74e11f9635734a)
2016-09-27Fix build break due to automerge of 7d2198b5Paul Jensen
Bug: 30100884 Change-Id: I8fa379a74b5d9467b5b9498bd18de2a043963c6f (cherry picked from commit baae57ab24db7d3b0bf7f84c05954173f1ee15fe)
2016-09-27Avoid crashing when downloading MitM'd PAC that is too big am: 7d2198b586 ↵Paul Jensen
am: 9c1cb7a273 am: 6634e90ad7 am: 66ee2296a9 Change-Id: Ib0023b44e521b936ab2f9450ad367b1feda64492 (cherry picked from commit d37eb7646581a2ffc68b11ccb67e3457716d878e)
2016-09-27Catch all exceptions when parsing IME meta dataTadashi G. Takaoka
Bug: 30568284 Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2 (cherry picked from commit dddc438e97509a858319e91988908b27085792d6)
2016-09-27Fix deadlock in AcitivityManagerService.Sudheer Shanka
Don't hold mPidsSelfLocked lock when calling cleanUpApplicationRecordLocked. Bug: 31463143 Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98 (cherry picked from commit 67e05b4d28bb63974f88f6abaf8b3636215c9511)
2016-09-27Only return password for account session flow if the caller is signedHongming Jin
with system key and have get_password permission. Bug: 30455516 Change-Id: I78484c59e4de1dff685ab91a0a8e7a756fffd9bf (cherry picked from commit 9342e137c68e9d31e61b774f7a6583ed5f8353f9)
2016-09-27Ensure munmap matches mmapJohn Reck
Bug: 31350622 Change-Id: I6d3f9faec32d54360caa6706d17405e20b50966c (cherry picked from commit aa394dd42c049479bface1991f11b863dc1a0922)
2016-09-27Fix setPairingConfirmation permissions issue (2/2)Marie Janssen
setPairingConfirmation was set to only require BLUETOOTH_ADMIN permission which shouldn't be able to set the confirmation itself. This is restricted to BLUETOOTH_PRIVILEGED permission. Bug: 29043989 Change-Id: I887de32d156e672ec44aa0b286cd7ea7f9f8ad55 (cherry picked from commit 93326cfd9fb8a20081baa9b975275772798cfd80)
2016-09-27DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before ↵Sungsoo
change ExifInterface object can be created with a unsupported file format. If saveAttribute is called with an unsupported file format, ExifInterface makes the file corrupted. This CL prevents those cases by throwing an exception before making any change on the file. Bug: 30936376 Change-Id: I115a42601c774062485974042464abb0d65c35e9 (cherry picked from commit a8f9a075b14c526a0de75c2ade81ebc4e05e4ef8) (cherry picked from commit 56ea7b490107e4531ab4db6f74671c34b5c59fd3)
2016-09-27Backport changes to whitelist sockets opened by the zygote.Narayan Kamath
This is the backport of the following commits : Reopen whitelisted zygote file descriptors after a fork. We don't want these descriptors to be shared post-fork, so we'll have to close and reopen them when the zygote forks. The set of open descriptors is checked against a whitelist and it is a fatal error if a non whitelisted FD is opened. It is also a fatal error if anything other than a regular file / character device or socket is opened at the time of forking. This work is done in two stages : - An initial list of FDs is constructed and cached prior to the first zygote fork. - On each subsequent fork, we check whether the list of open FDs has changed. We are currently tolerant of changes, but in the longer term, it should be a fatal error if the set of open file descriptors in the zygote changes. - Post fork, we traverse the list of open descriptors and reopen them if necessary. bug: 30963384 (cherry picked from commit c5f27a7cb2ec816f483a65255034a1b57a8aa221) Fix clang build breakage (-Werror -Wformat). Use %zd for size_t. Note that this will break only on (-plus-)aosp because clang is disabled on the N development branches. bug: 30963384 (cherry picked from commit b334c33d65894f5ca9833fa55c3a1cf75e01c497) Add a whitelist of sockets on fork. Maintain a whitelist of AF_UNIX sockets that are permitted to exist at the time of forking. If an open socket does not belong to the whitelist (or is not AF_UNIX), the process will abort. If an open socket is whitelisted, it will be redirected to /dev/null after a sucessful fork. This allows us to unify our handling of the special zygote sockets (/dev/socket/zygote[_secondary]) with the existing whitelist of non socket file descriptors. This change also removes non-fatal ALOGW messages since they have the side effect of reopening the logging socket. bug: 30963384 (cherry picked from commit 3764a260f0c90dcb323caeda14baf903cc108759) fd_utils: Remove whitelist for "/dev/pmsg0". We're now calling __android_log_close prior to a fork, so this file shouldn't need to be open. bug: 31243313 bug: 30963384 (cherry picked from commit 8dee0541904e4f792cdebdee4f23f768561cb276) fd_utils: Fix broken usage of iterators. There were two separate issues here : - RestatInternal was using an iterator after a call to erase(). This will not work because it will be invalidated. - The "standard" for loop idiom for iterating over a map while making structural changes to it is broken. Switch to a while loop and treat cases where elements are erased differently from cases where they aren't. bug: 31092930 bug: 30963384 (cherry picked from commit 0b76d6a28e6978151bf245a775329cdae5e574d5) add dri device to zygote whitelisted FDs The driver can be used just like /dev/ion for graphic buffers. (cherry picked from commit 8977e424ee2d6d85fec419532ae510131aa88c45) (cherry picked from commit a1252ccbdbae686cb41e7efba769c4935f664220)
2016-09-27DO NOT MERGE Stop work challenge freeform bypassRobin Lee
Bypassing work challenge in freeform mode was trivial by just keeping work apps open in freeform mode and then switching focus to them from another app. Because the only interception point is startActivity this never triggered work challenge. The solution is to trigger the check on focus change events and also to allow passing the result back into the freeform stack instead of dumping our user out into the homescreen. Change-Id: I141ecf90b5f0e708a21d27141b6fec6074e5d475 Fix: 30693465 (cherry picked from commit 0737c2b4c2ae6415eced00926235f848d1957bae)
2016-09-26Use "all_downloads" instead of "my_downloads".Jeff Sharkey
Fix Merge Conflict into nyc-release We can no longer return the "my_downloads" paths: if those Uris were shared beyond the app that requested the download, access would be denied. Instead, we need to switch to using "all_downloads" Uris so that permission grants can be issued to third-party viewer apps. Since an app requesting a download doesn't normally have permission to "all_downloads" paths, DownloadProvider now issues narrow grants toward the owner of each download, both at device boot and when new downloads are started. Bug: 30537115, 30945409 Change-Id: I533125b36444877f54373d88922f2acc777e250b
2016-08-26DO NOT MERGE: Fix vulnerability where large GPS XTRA data can beandroid-cts-7.0_r3android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r11android-7.0.0_r10David Christie
injected. -Can potentially crash system with OOM. Bug: 29555864 Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4 (cherry picked from commit 79375723f0f201a6759ddbfda57d491ff3fea64e)
2016-08-26Bind fingerprint when we start authenticationJim Miller
This fixes a bug where it was possible to authenticate the wrong user. We now bind the userId when we start authentication and confirm it when authentication completes. Fixes bug 30744668 (Cherry pick from Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2) Change-Id: I3584790c39eb2e8c435ad1b2d887bf9b8ebd36fe (cherry picked from commit 837d052ed4b5b75dfd4af44f5ad268e683bf2e13)
2016-08-26Fix vulnerability in LockSettings serviceJim Miller
Fixes bug 30003944 Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d (cherry picked from commit 2d71384a139ae27cbc7b57f06662bf6ee2010f2b)
2016-08-26DO NOT MERGE: Clean up when recycling a pid with a pending launchAmith Yamasani
Fix for accidental launch of a broadcast receiver in an incorrect app instance. Bug: 30202481 Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f (cherry picked from commit 55eacb944122ddc0a3bb693b36fe0f07b0fe18c9)
2016-08-26Limit capabilities of a11y gesture dispatch.Phil Weaver
Changing the service side to accept descriptions of motion events, not motion events themselves, so we can control their creation. Bug: 30647115 Change-Id: Ia6772a1fc05df91818e3f88959d1e2b4a35fe0cc (cherry picked from commit a8918f23c712e97fa1dc4911f64827d64fc906e5) (cherry picked from commit 157f416a3549420bd109dbc4931b437089e22d04)
2016-08-26Process: Fix communication with zygote.Narayan Kamath
Don't write partial requests, and don't return (or throw) early after partially reading a response. bug: 30143607 Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1 (cherry picked from commit 448be0a62209c977593d81617853a8a428d013df)
2016-08-01Allow apps with CREATE_USERS permission to call UM.getProfiles.android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r3Sudheer Shanka
Bug: 29189712 Bug: 30317026 Bug: 30235113 Change-Id: I899f13898773483ee627a974d70173b5aa962e9a
2016-08-01Don't allow enable/disable of tuner on lockscreenJason Monk
Change-Id: Id9748ea39a8fa03b67d3fa6f91da530dd5cf9409 Fixes: 30107438
2016-08-01Block user from setting safe boot setting via adbBenjamin Franz
Bug: 29900345 Change-Id: Id3b4472b59ded2c7c29762ddf008ee8486009dbb
2016-08-01Add bound checks to utf16_to_utf8Sergio Giro
Test: ran libaapt2_tests64 Bug: 29250543 Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3 (cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
2016-08-01Disallow shell to mutate always-on vpn when DISALLOW_CONFIG_VPN user ↵Victor Chang
restriction is set Fix: 29899712 Change-Id: I38cc9d0e584c3f2674c9ff1d91f77a11479d8943 (cherry picked from commit 9c7b706cf4332b4aeea39c166abca04b56685280)
2016-08-01Pre-setup restrictionsJason Monk
- Prevent external tiles from system apps - Disable help Bug: 29194585 Change-Id: I92da498110db49f7a523d6f775f191c4b52a4ad6
2016-08-01Check uid for notification policy access.Julia Reynolds
Bug: 29421441 Change-Id: Ia0a7b06112dde1c925ec3232f50bf4d90b17b5e5 (cherry picked from commit 0cd1b789567b60b963fc7b8935e898ea0e61a617)
2016-07-13Don't hold on to AssetManager instancesandroid-cts-7.0_r2android-cts-7.0_r1android-7.0.0_r1afw-test-harness-2.1Adam Lesinski
If we enter multi-window mode or load WebView assets into a Resources object, then the underlying AssetManager instance may change. crbug.com/627586 Bug:30118654 Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
2016-07-13MediaDataSource: add DrmInitialization for IDataSource.Wei Jia
Bug: 29342399 Bug: 28901867 Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2 (cherry picked from commit a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
2016-07-13Don't dump stack traces for background ANRs.Tim Murray
Dumping stack traces can be extremely expensive, and doing so for background applications often has extremely negative side effects for foreground applications. This can be exacerbated by resource-intensive applications, because those may exhibit thermal throttling in the first place. For such applications, the additional performance hit caused by stack dumps may be catastrophic. Instead, don't dump stack traces for background ANRs except for the app that actually ANR'd. bug 30112521 Change-Id: I8a05059343254861c436a193690cd1c50a95d674
2016-07-13Avoid throwing when 0 size layer requestedChris Craik
bug:30032790 Change-Id: I8553af0d0b0d59fea6535d03479c4e7134a9f4f9
2016-07-07SoundPool: fix enforced camera shutter soundEric Laurent
Make sure that camera shutter sound is played in total silence DND mode when enforced by country regulation. Bug: 29973005 Change-Id: I208f7ae5b07777eac48597f68feae6358999b2c3
2016-07-06Use proper lock when accessing the generation registrySvet Ganov
We use 'this' for synchronization in NameValueCache but some code that accesses the generation registry uses 'this' in a different context ending up syncing on the wrong instance. This is why sync on this is just a bad idea. bug:29956424 Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06Make registerDefaultNetwork work on metered networks.Lorenzo Colitti
Bug: 29927488 Change-Id: I3b705c2ab0d1493546ffa5185bb5b07d5e25c897
2016-06-30Make sure SELinux labels are correct after move-to operationsChristopher Tate
In some circumstances wallpaper-related files are moved into position, and must then take proper effect. Make sure that they have the correct SELinux labels afterwards to avoid preventing some valid accesses. Bug 29469965 Change-Id: I6d7c86be63d568fa0ad8841d109a7ff2149fdd54
2016-06-30Removed warning when objects are added on wrong order.Felipe Leme
append() is used to optimized insertions in the array, but it must preserve the order of the hashcode array; when it doesn't, it falls back to append(), but it should not log a warning message In particular, PendingIntentRecords might have different hashcodes across different processes. Fixes: 29912192 Change-Id: I0ab566249829ddb934fd51cf21399b68cb286bd5
2016-06-30Mutate the drawable if a valid state change happenTeng-Hui Zhu
In another word, create another cached bitmap, when the current VectorDrawable will look differently when state changed. Bug: 29870392 Bug: 29854240 Change-Id: I7a5ef91091e547a930368286defc7ab96aeb9471 (cherry picked from commit 4f1acfb5f507798daaff2ff0da47d2b15607ded4)
2016-06-30Fix missing header text in notification groupsAdrian Roos
Fixes a case where notification header text could go missing if a notification view was recycled and previously had a header text. Reapplying only hid the text without clearing it, so the extraction logic thought it was still there and hid the text for the children even though it was not showing for the parent. Change-Id: I3f96e1e7bebb2f815020d278ad13b2b5d948e63c Fixes: 29915184
2016-06-30Only clip PopupWindow in the vertical directionAlan Viverette
Bug: 29865091 Change-Id: Ic4e3b50571034f341aff2c2fbf2c349342622448
2016-06-30Exclude children from excess space distribution when using largest childAlan Viverette
Preserves API 23 behavior. Bug: 29872769 Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1
2016-06-29Move getRecentTasks() to ParceledListSlice.Jeff Sharkey
In extreme cases the list of recent tasks can grow beyond the size of a single Binder transaction. This change moves over to ParceledListSlice which handles chunking any large results. Bug: 29635557 Change-Id: Iaf1227234f5f8c9451f73a6a5c1dc89f2067f05f
2016-06-29Recents: Make sure blacklist checks the package name as well as activity nameSid Soundararajan
BUG: 28719274 BUG: 28764678 Change-Id: Ib17d3feda8997ce5b29060bff47d51f503c868dc
2016-06-29Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system APIDianne Hackborn
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
2016-06-29Disable constant state sharing for VectorDrawableAlan Viverette
Bug: 29854240 Change-Id: Icc58d04ad6f471d05b085a9089893e4f7205eb7d
2016-06-29merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-06-29Merge "Only use one SurfaceControlWithBackground per AppToken." into nyc-devRob Carr
2016-06-28Only use one SurfaceControlWithBackground per AppToken.Robert Carr
In the past, if an app never renders to a SurfaceView, it will be invisible despite having FLAG_OPAQUE. This means an app could leave a totally empty SurfaceView (never drawing in to it) on top of a second SurfaceView, and expect the second one to be visible. This is probably buggy app behavior because FLAG_OPAQUE means if they ever draw anything at all in to the top SurfaceView the bottom one will become totally invisible. However this has worked in the past, so we have to preserve things for apps. To accomplish this we ensure only the bottom most visible SurfaceView for a given AppToken will receive a background. We achieve this by synchronizing through the app token whenever visibility or layering of a SurfaceView changes. Bug: 29580298 Change-Id: I0023326323cb961b56404fd49093384e7b72aa54
2016-06-28merge in nyc-release history after reset to nyc-devThe Android Automerger
2016-06-29Move preloading to boot complete.Winson
Bug: 29320695 Change-Id: I14b5127b218597f3c32e647e0443a88b5a708ce1
2016-06-29Merge "Relax security constraint around getAuthenticatorId()." into nyc-devJim Miller