88efa56e1b
The sf.debug.nobootanimation was apparently broken in a recent refactoring. Flipping the boolean in the utils fixes the issue. Left some additional logging behind. Test: marlin-eng boots Test: my test can prevent the boot animation Test: shell stop start shows boot animation Change-Id: I815708a2f16a3a8688cf1a53695e5a8d43194575
62 lines
1.9 KiB
C++
62 lines
1.9 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include "BootAnimationUtil.h"
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <binder/IServiceManager.h>
|
|
#include <cutils/properties.h>
|
|
#include <utils/Log.h>
|
|
#include <utils/SystemClock.h>
|
|
|
|
namespace android {
|
|
|
|
bool bootAnimationDisabled() {
|
|
char value[PROPERTY_VALUE_MAX];
|
|
property_get("debug.sf.nobootanimation", value, "0");
|
|
if (atoi(value) > 0) {
|
|
return true;
|
|
}
|
|
|
|
property_get("ro.boot.quiescent", value, "0");
|
|
return atoi(value) > 0;
|
|
}
|
|
|
|
void waitForSurfaceFlinger() {
|
|
// TODO: replace this with better waiting logic in future, b/35253872
|
|
int64_t waitStartTime = elapsedRealtime();
|
|
sp<IServiceManager> sm = defaultServiceManager();
|
|
const String16 name("SurfaceFlinger");
|
|
const int SERVICE_WAIT_SLEEP_MS = 100;
|
|
const int LOG_PER_RETRIES = 10;
|
|
int retry = 0;
|
|
while (sm->checkService(name) == nullptr) {
|
|
retry++;
|
|
if ((retry % LOG_PER_RETRIES) == 0) {
|
|
ALOGW("Waiting for SurfaceFlinger, waited for %" PRId64 " ms",
|
|
elapsedRealtime() - waitStartTime);
|
|
}
|
|
usleep(SERVICE_WAIT_SLEEP_MS * 1000);
|
|
};
|
|
int64_t totalWaited = elapsedRealtime() - waitStartTime;
|
|
if (totalWaited > SERVICE_WAIT_SLEEP_MS) {
|
|
ALOGI("Waiting for SurfaceFlinger took %" PRId64 " ms", totalWaited);
|
|
}
|
|
}
|
|
|
|
} // namespace android
|