Commits

Author Commit Message Labels Comments Date
Stephen Smalley
Merge branch 'master' into seandroid
Branches
seandroid
Alan Viverette
Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"
Stephen Woo
Fix WallpaperCropper crash when setting wallpaper over 8MB Use large heap for WallpaperCropper to avoid OOM crash in createBitmap(). Change-Id: I1dc171286eaf0da37323ccf9fab046ca17e2ff07 Signed-off-by: Stephen Woo <stephen.m.woo@intel.com> Signed-off-by: Dan Liang <dan.liang@intel.com>
Stephen Hines
Merge "Don't make bad RS API level recommendations."
Tom Cherry
Merge "bundle init.rc contents with its service"
Chong Zhang
Merge "wm: call displayReady for all built in displays when system is ready."
Elliott Hughes
Merge "zygote: fix memory leak when fork process"
Tom Cherry
bundle init.rc contents with its service Bug: 23186545 Change-Id: I080e73d6a124873c2ddd0fba85315d7082faf3f5
Mykola Kondratenko
zygote: fix memory leak when fork process Release memory allocated by GetIntArrayElements. Change-Id: If7ce2a78a480e58b0376352ce438dbe51f664f3a
Stephen Hines
Don't make bad RS API level recommendations. This document was recommending that users always target the latest available API level, but that will prevent optimization on older devices. Instead, they should be setting the minimum value that they require. Change-Id: I27c65872d124ed0beaeb2125d68d1d636ffa9352
Tao Bao
Merge "Recursively delete directories in handleAftermath()."
Tao Bao
Recursively delete directories in handleAftermath(). RecoverySystem.handleAftermath() is called to clean up recovery-related files. It needs to handle non-empty directories as well such as leftover stashes from failed OTAs. Bug: 23199081 Change-Id: I33fb326d376d04c793ad7b5948a10e8c1c572812
Elliott Hughes
Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
Elliott Hughes
Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools. Change-Id: Ideef62acbf53a442167c9b8038021affffef9e8a
Chris Craik
Merge "Make the value for shadowRadius less than 1.0 work"
Dan Albert
Merge "Fix mismatched new[]/delete."
Dan Albert
Fix mismatched new[]/delete. The new clang will emit a warning for this. Change-Id: Ie0edc46461eb5edb2a7ad33a3a7f6cef2d825c36
Nick Kralevich
Merge "SELinuxPolicyInstallReceiver: Switch to file_contexts.bin."
Tags
android-m-preview-2
Elliott Hughes
Merge "Lose HAVE_ANDROID_OS from frameworks/base."
Elliott Hughes
Lose HAVE_ANDROID_OS from frameworks/base. Change-Id: I713881fdbaec7cbbb5e7f2f4be6f9b8be3d2ca4e
Neil Fuller
Merge "Add ICU as a java library for docs."
Robert Craig
Impose an ordering on created SELinuxMMAC Policy objects. Imposing an order on Policy objects allows us to extend the policy writers ability to union mac_permissions.xml files. Policy developers can now create new mac_permissions.xml entries under their device specific directories. This is in contrast to current methods which only allow differing stanzas to appear outside the base mac_permissions.xml. Also, report on stanzas with duplicate input selecto…
Branches
2 branches
Robert Craig
Mods to the SELinuxMMAC engine code. * We now require that all certs used to sign the apk and all certs stored with policy be tested for set equality. Prior efforts required that the cert included with policy only needed to match one of the certs included with an apk. * Allowed a new tag to be included with policy describing the signatures. <cert signature=""/> is now allowed as a child element of the <signer> tag describi…
Branches
2 branches
Robert Craig
Drop unused String. Change-Id: I152447bec37db33f6c4356e2a373b00ff99d7de7 Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Branches
2 branches
Robert Craig
Add testing api to SELinuxMMAC code. Added needed api for local unit testing. Change-Id: If52555ecb4f0e6bc06e153b6a17e2c706b11253e Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Branches
2 branches
Stephen Smalley
SELinuxPolicyInstallReceiver: Prevent partial or mixed policy updates. The current SELinuxPolicyInstallReceiver logic can yield a partial or mixed (old and new) set of policy files under /data/security/current if there is an error or a crash at certain points before completing the installation of the update. Rewrite the logic to avoid the possibility of such partial or mixed policy updates by using rename on the entire directory of policy files rather than operating…
Branches
2 branches
Robert Craig
Augment AppOps code to support locked ops control. Introduce a new mechanism which extends the existing AppOps mechanism to include enterprise-like controls. Each operation is ultimately checked against a set of policy files if present. A base version of the policy file can exist at /system/etc/security/eops.xml as well as a directory full of them within the /data/security/eops directory. This extension allows multiple policies to be used on the p…
Branches
2 branches
Robert Craig
Add EopsInstallReceiver code. This allows the eops.xml policy file to be reloaded akin to the SELinuxPolicyInstallReceiver. Change-Id: I447808fe5eb49a4a25a0b653328fa7580f5632d8
Branches
2 branches
Robert Craig
Install-time MAC enforcement. Reject apps that do not pass one of the mac_permissions.xml stanzas. Change-Id: I75c7df5d37329fb4a2cee250a2e4f2a620b57d36
Branches
2 branches
Yusuke Sato
Merge "Clean up AssetManager::scanAndMergeZipLocked"
  1. Prev
  2. Next