1. seandroid
  2. Untitled project
  3. frameworks/base

Commits

Author Commit Message Date Builds
Stephen Smalley
Merge tag 'android-5.1.1_r26' into seandroid-5.1.1 Android 5.1.1 release 26
Branches
seandroid-5.1.1
Zach Jang
Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s." This reverts commit 82b70db7dd906013d131737a5bec2ae59b41ae61. Change-Id: Iace1607127d7d09cb1cc0afd8e52408fde443f5f
Tags
android-5.1.1_r26
Branches
2 branches
Zach Jang
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings b/23946860 Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
Paul Jensen
Don't mark NetworkRequests restricted when they don't have restricted caps Requests without NET_CAPABILITIES_INTERNET and just the default network capabilities should not be marked restricted. Without this fix apps can hit permissions exceptions if they inadvertently make requests without NET_CAPABILITIES_INTERNET. Bug:23164917 Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6 (cherry picked from commit aae613d96134245af7c55976731a49fa59e77470)
Paul Jensen
Fix NOT_RESTRICTED network capability and enforce it. With this change: 1. NOT_RESTRICTED should be removed from NetworkRequests that bring up special restricted carrier networks (e.g. IMS, FOTA). 2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL permission to register 3. Binding sockets to networks without NOT_RESTRICTED requires CONNECTIVITY_INTERNAL permission Bug:21637535 Change-Id: I5991d39facaa6b690e969fe15dcbeec…
Stephen Smalley
Fix build. Fix build from mis-merge of master after 6.0 merge. This reverts install-time MAC enforcement as it is OBE. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Branches
seandroid
The Android Automerger
merge in mnc-dr-release history after reset to mnc-dr-dev
Tags
4 tags
Tim Murray
Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
Chien-Yu Chen
Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
Chien-Yu Chen
MediaActionSound: Fix video stop sound Bug: 24745252 Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
Eric Laurent
ZenModeHelper: fix cross deadlock with AudioService Processing ZenModeHelper.setConfig() synchronously in ZenModeConditions.onConditionChanged() can cause a cross deadlock between ConditionProviders.mMutex and AudioService.mSettingsLock. Add a method to set Zen mode config asynchronously. Bug: 24528290. Change-Id: I9c1701ca6bef084527821175d84002b612241995
Yin-Chia Yeh
am a636be6c: Camera: fix wrong FULL feature string * commit 'a636be6c9a8a9192f72a111c2b3084a226d37b7e': Camera: fix wrong FULL feature string
Robert Carr
Ensure SurfaceView requests WM relayout when size changes. In the case of scaled SurfaceViews with a fixed size. It is possible for the surface layout size to change without a change to the surface size or position. In this case we need to inform the window manager so it can update frames and scaling. This has presented in Camera and required workarounds such as changing the fixed surface size to trigger an update (leading to visual artifacts). Bug:23974…
Eric Laurent
Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
Yin-Chia Yeh
Camera: fix wrong FULL feature string Bug: 24678065 Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
Stephen Smalley
Merge branch 'master' into seandroid Conflicts: services/core/java/com/android/server/AppOpsService.java
Branches
seandroid
Stephen Smalley
Merge tag 'android-5.1.1_r19' into seandroid-5.1.1 Android 5.1.1 release 19
Branches
seandroid-5.1.1
The Android Automerger
merge in mnc-dr-release history after reset to mnc-dr-dev
Selim Cinek
Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
Adam Lesinski
am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev * commit '46684d2caeef93f43be260d996e925ea6e4147ea': Add anydpi to the providing-resources docs
Pirama Arumuga Nainar
am 46b51097: Merge "Safely handle interrupts during Thread.join()" * commit '46b51097b92900866ac5b25762f622d3ceb1be5d': Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar
Merge "Safely handle interrupts during Thread.join()"
Pirama Arumuga Nainar
Safely handle interrupts during Thread.join() Interrupt current thread if InterruptedException is received during Thread.join(). Also, log the interruption. Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
Adam Lesinski
Merge "Add anydpi to the providing-resources docs" into mnc-dev
Jean-Michel Trivi
Fix AudioService rotation helper thread Fix a race condition where the wait index can be incremented inbetween the while() loop and the lock Fix when updateOrientation() is called: after the sleep, otherwise the last sleep is useless. Bug 24677424 Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
Adam Lesinski
Add anydpi to the providing-resources docs Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
Eric Laurent
ZenModeHelper: fix cross deadlock with AudioService Processing ZenModeHelper.setConfig() synchronously in ZenModeConditions.onConditionChanged() can cause a cross deadlock between ConditionProviders.mMutex and AudioService.mSettingsLock. Add a method to set Zen mode config asynchronously. Bug: 24528290. Change-Id: I9c1701ca6bef084527821175d84002b612241995
Geoff Mendal
Import translations. DO NOT MERGE Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda Auto-generated-cl: translation import
The Android Automerger
merge in mnc-dr-release history after reset to mnc-dr-dev
Stephen Hines
resolved conflicts for bd57dac5 to stage-aosp-master Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
  1. Prev
  2. Next