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

Commit 76d0b6e1 authored by Ted Bauer's avatar Ted Bauer Committed by Automerger Merge Worker
Browse files

Merge "Handle null exception messages in FeatureFlagsImpl.java.template" into... 

Merge "Handle null exception messages in FeatureFlagsImpl.java.template" into main am: a00b187f am: 494499f4

Original change: https://android-review.googlesource.com/c/platform/build/+/3376833



Change-Id: Ib0992560261938d09ffe046a882b62ea9f54f303
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84b6c655 494499f4

tools/aconfig/aconfig/src/codegen/java.rs

+15 −3
Original line number Diff line number Diff line
@@ -547,14 +547,26 @@ mod tests { 
                        enabledRw = reader.getBooleanFlagValue("enabled_rw", true);

                        disabledRwInOtherNamespace = reader.getBooleanFlagValue("disabled_rw_in_other_namespace", false);

                    } else {

                        Log.e(TAG, "encountered an AconfigStorageReadException");

                        if (error.getMessage() != null) {

                            Log.e(TAG, error.getMessage());

                        } else {

                            Log.e(TAG, "Encountered a null AconfigStorageReadException");

                        }

                    }

                } catch (Exception e) {

                    if (e.getMessage() != null) {

                        Log.e(TAG, e.getMessage());

                    } else {

                        Log.e(TAG, "Encountered a null Exception");

                    }

                } catch (NoClassDefFoundError e) {

                    // for mainline module running on older devices.

                    // This should be replaces to version check, after the version bump.

                    if (e.getMessage() != null) {

                        Log.e(TAG, e.getMessage());

                    } else {

                        Log.e(TAG, "Encountered a null NoClassDefFoundError");

                    }

                }

                isCached = true;

            }

tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template

+15 −3
Original line number Diff line number Diff line
@@ -50,14 +50,26 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ 
            {{ -endfor }}

            {{ -endfor }}

            } else \{

                Log.e(TAG, "encountered an AconfigStorageReadException");

                if (error.getMessage() != null) \{

                    Log.e(TAG, error.getMessage());

                } else \{

                    Log.e(TAG, "Encountered a null AconfigStorageReadException");

                }

            }

        } catch (Exception e) \{

            if (e.getMessage() != null) \{

                Log.e(TAG, e.getMessage());

            } else \{

                Log.e(TAG, "Encountered a null Exception");

            }

        } catch (NoClassDefFoundError e) \{

            // for mainline module running on older devices.

            // This should be replaces to version check, after the version bump.

            if (e.getMessage() != null) \{

                Log.e(TAG, e.getMessage());

            } else \{

                Log.e(TAG, "Encountered a null NoClassDefFoundError");

            }

        }

        isCached = true;

    }