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

Commit e17b1e12 authored by Hani Kazmi's avatar Hani Kazmi Committed by Achim Thesmann
Browse files

Convert bundle defuse logs to wtf 

After recent work on making bundles lazy, deserialization errors due to
missing classes should be approaching zero. This change converts defuse
logs to errors on debug builds to find other error causes in system
server. Depending on findings, defuse may be deprecated.

Bug: 254848919
Test: m and manually tested
Flag: android.security.deprecate_bundle_defuse
Change-Id: Iece0d4108e3389e0d61c3c0b47be82982fa27af1
parent 4bbab50b

core/java/android/os/BaseBundle.java

+19 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Intent;

import android.security.Flags;

import android.util.ArrayMap;

import android.util.Log;

import android.util.MathUtils;
@@ -446,7 +447,16 @@ public class BaseBundle implements Parcel.ClassLoaderProvider { 
                object = ((BiFunction<Class<?>, Class<?>[], ?>) object).apply(clazz, itemTypes);

            } catch (BadParcelableException e) {

                if (sShouldDefuse) {

                    Log.w(TAG, "Failed to parse item " + mMap.keyAt(i) + ", returning null.", e);

                    if (Flags.wtfBundleDefuse()) {

                        Slog.wtf(TAG, "Failed to parse item " + mMap.keyAt(i) + ", returning null.",

                                e);

                    } else {

                        Log.w(TAG, "Failed to parse item " + mMap.keyAt(i) + ", returning null.",

                                e);

                    }

                    if (Flags.deprecateBundleDefuse()) {

                        throw e;

                    }

                    return null;

                } else {

                    throw e;
@@ -507,7 +517,14 @@ public class BaseBundle implements Parcel.ClassLoaderProvider { 
                    /* lazy */ ownsParcel, this, numLazyValues);

        } catch (BadParcelableException e) {

            if (sShouldDefuse) {

                if (Flags.wtfBundleDefuse()) {

                    Slog.wtf(TAG, "Failed to parse Bundle, but defusing quietly", e);

                } else {

                    Log.w(TAG, "Failed to parse Bundle, but defusing quietly", e);

                }

                if (Flags.deprecateBundleDefuse()) {

                    throw e;

                }

                map.erase();

            } else {

                throw e;

core/java/android/security/responsible_apis_flags.aconfig

+20 −0
Original line number Diff line number Diff line
@@ -179,3 +179,23 @@ flag { 
    description: "Flag for failing instead of logging in case of parcel size mismatches"

    bug: "416031865"

}



flag {

    name: "wtf_bundle_defuse"

    namespace: "responsible_apis"

    description: "Flag for wtf logging when defuse is enabled."

    bug: "254848919"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "deprecate_bundle_defuse"

    namespace: "responsible_apis"

    description: "Flag for failing instead of logging when defuse is enabled."

    bug: "254848919"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}