Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 831f5db0 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Only construct real Throwable objects in... 

Merge "Only construct real Throwable objects in AndroidFuture.readThrowable()." into sc-dev am: af04dd2a

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

Change-Id: I2afc85c266bebcb88848c57a094ed0af757b277e
parents e394f040 af04dd2a

core/java/com/android/internal/infra/AndroidFuture.java

+9 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.Looper; 
import android.os.Parcel;

import android.os.Parcelable;

import android.os.RemoteException;

import android.util.EventLog;

import android.util.Log;



import com.android.internal.annotations.GuardedBy;
@@ -601,9 +602,14 @@ public class AndroidFuture<T> extends CompletableFuture<T> implements Parcelable 
        String messageWithStackTrace = message + '\n' + stackTrace;

        Throwable throwable;

        try {

            Class<?> clazz = Class.forName(className);

            Class<?> clazz = Class.forName(className, true, Parcelable.class.getClassLoader());

            if (Throwable.class.isAssignableFrom(clazz)) {

                Constructor<?> constructor = clazz.getConstructor(String.class);

                throwable = (Throwable) constructor.newInstance(messageWithStackTrace);

            } else {

                android.util.EventLog.writeEvent(0x534e4554, "186530450", -1, "");

                throwable = new RuntimeException(className + ": " + messageWithStackTrace);

            }

        } catch (Throwable t) {

            throwable = new RuntimeException(className + ": " + messageWithStackTrace);

            throwable.addSuppressed(t);