Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Extract info on LoadedPackage crash"" into sc-dev am: 66d9c07d2e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15142899

Change-Id: Id4d3009b1e57ca6315c863b94a1943e8da97b287
This commit is contained in:
Ryan Mitchell
2021-07-02 23:14:30 +00:00
committed by Automerger Merge Worker
parent 6060aeb624 66d9c07d2e
commit c9d0c36a17
1 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
core/jni/android_content_res_ApkAssets.cpp
View File

@@ -377,61 +377,8 @@ static jlong NativeLoadEmpty(JNIEnv* env, jclass /*clazz*/, jint flags, jobject
return CreateGuardedApkAssets(std::move(apk_assets));
}
// STOPSHIP (b/159041693): Revert signal handler when reason for issue is found.
static thread_local std::stringstream destroy_info;
static struct sigaction old_handler_action;
static void DestroyErrorHandler(int sig, siginfo_t* info, void* ucontext) {
if (sig != SIGSEGV) {
return;
}
LOG(ERROR) << "(b/159041693) - Failed to destroy ApkAssets " << destroy_info.str();
if (old_handler_action.sa_handler == SIG_DFL) {
// reset the action to default and re-raise the signal. It will kill the process
signal(sig, SIG_DFL);
raise(sig);
return;
}
if (old_handler_action.sa_handler == SIG_IGN) {
// ignoring SIGBUS won't help us much, as we'll get back right here after retrying.
return;
}
if (old_handler_action.sa_flags & SA_SIGINFO) {
old_handler_action.sa_sigaction(sig, info, ucontext);
} else {
old_handler_action.sa_handler(sig);
}
}
static void NativeDestroy(JNIEnv* /*env*/, jclass /*clazz*/, jlong ptr) {
{
auto scoped_apk_assets = ScopedLock(ApkAssetsFromLong(ptr));
auto apk_assets = scoped_apk_assets->get();
destroy_info << "{ptr=" << apk_assets;
if (apk_assets != nullptr) {
destroy_info << ", name='" << apk_assets->GetDebugName() << "'"
<< ", idmap=" << apk_assets->GetLoadedIdmap()
<< ", {arsc=" << apk_assets->GetLoadedArsc();
if (auto arsc = apk_assets->GetLoadedArsc()) {
destroy_info << ", strings=" << arsc->GetStringPool()
<< ", packages=" << &arsc->GetPackages() << " [";
for (auto& package : arsc->GetPackages()) {
destroy_info << "{unique_ptr=" << &package << ", package=" << package.get()
<< "},";
}
destroy_info << "]";
}
destroy_info << "}";
}
destroy_info << "}";
}
DeleteGuardedApkAssets(ApkAssetsFromLong(ptr));
// Deleting the apk assets did not lead to a crash.
destroy_info.str("");
destroy_info.clear();
}
static jstring NativeGetAssetPath(JNIEnv* env, jclass /*clazz*/, jlong ptr) {
@@ -591,18 +538,6 @@ int register_android_content_res_ApkAssets(JNIEnv* env) {
jclass parcelFd = FindClassOrDie(env, "android/os/ParcelFileDescriptor");
gParcelFileDescriptorOffsets.detachFd = GetMethodIDOrDie(env, parcelFd, "detachFd", "()I");
// STOPSHIP (b/159041693): Revert signal handler when reason for issue is found.
sigset_t allowed;
sigemptyset(&allowed);
sigaddset(&allowed, SIGSEGV);
pthread_sigmask(SIG_UNBLOCK, &allowed, nullptr);
struct sigaction action = {
.sa_flags = SA_SIGINFO,
.sa_sigaction = &DestroyErrorHandler,
};
sigaction(SIGSEGV, &action, &old_handler_action);
return RegisterMethodsOrDie(env, "android/content/res/ApkAssets", gApkAssetsMethods,
arraysize(gApkAssetsMethods));
}