gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Camera service: Extend UID check timeout to 300ms. am: 32b8c20dbc

Browse Source 
am: 29a50b741b

Change-Id: Ie638575f69e0b232b4474ea042452b30e020a999
gugelfrei
Eino-Ville Talvala 6 years ago committed by android-build-merger
parent 1d7bc85016 29a50b741b
commit 6b8cf11049
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File

12
services/camera/libcameraservice/CameraService.cpp
Unescape View File

@ -2429,7 +2429,8 @@ bool CameraService::UidPolicy::isUidActive(uid_t uid, String16 callingPackage) {
return isUidActiveLocked(uid, callingPackage); return isUidActiveLocked(uid, callingPackage);
} }
static const int kPollUidActiveTimeoutMillis = 50; static const int64_t kPollUidActiveTimeoutTotalMillis = 300;
static const int64_t kPollUidActiveTimeoutMillis = 50;
bool CameraService::UidPolicy::isUidActiveLocked(uid_t uid, String16 callingPackage) { bool CameraService::UidPolicy::isUidActiveLocked(uid_t uid, String16 callingPackage) {
// Non-app UIDs are considered always active // Non-app UIDs are considered always active
@ -2457,7 +2458,8 @@ bool CameraService::UidPolicy::isUidActiveLocked(uid_t uid, String16 callingPack
// activity being resumed. The proper fix is very risky, so we temporary add // activity being resumed. The proper fix is very risky, so we temporary add
// some polling which should happen pretty rarely anyway as the race is hard // some polling which should happen pretty rarely anyway as the race is hard
// to hit. // to hit.
active = am.isUidActive(uid, callingPackage); active = mActiveUids.find(uid) != mActiveUids.end();
if (!active) active = am.isUidActive(uid, callingPackage);
if (active) { if (active) {
break; break;
} }
@ -2465,11 +2467,15 @@ bool CameraService::UidPolicy::isUidActiveLocked(uid_t uid, String16 callingPack
startTimeMillis = uptimeMillis(); startTimeMillis = uptimeMillis();
} }
int64_t ellapsedTimeMillis = uptimeMillis() - startTimeMillis; int64_t ellapsedTimeMillis = uptimeMillis() - startTimeMillis;
int64_t remainingTimeMillis = kPollUidActiveTimeoutMillis - ellapsedTimeMillis; int64_t remainingTimeMillis = kPollUidActiveTimeoutTotalMillis - ellapsedTimeMillis;
if (remainingTimeMillis <= 0) { if (remainingTimeMillis <= 0) {
break; break;
} }
remainingTimeMillis = std::min(kPollUidActiveTimeoutMillis, remainingTimeMillis);
mUidLock.unlock();
usleep(remainingTimeMillis * 1000); usleep(remainingTimeMillis * 1000);
mUidLock.lock();
} while (true); } while (true);
if (active) { if (active) {

Write Preview
Loading…
Cancel
Save