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

Commit 7074e6fd authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Frameworks: Handle exceptions in SystemProperties callbacks 

When notifying callbacks, catch thrown exceptions.

Bug: 73058952
Test: m
Test: atest SystemPropertiesTest
Change-Id: I1c61e11b833e8ddd30d80b9859b20a9fb3185a33
parent 00ef20e8

core/java/android/os/SystemProperties.java

+6 −1
Original line number Diff line number Diff line
@@ -189,7 +189,12 @@ public class SystemProperties { 
            }

            ArrayList<Runnable> callbacks = new ArrayList<Runnable>(sChangeCallbacks);

            for (int i=0; i<callbacks.size(); i++) {

                try {

                    callbacks.get(i).run();

                } catch (Throwable t) {

                    Log.wtf(TAG, "Exception in SystemProperties change callback", t);

                    // Ignore and try to go on.

                }

            }

        }

    }

core/jni/android_os_SystemProperties.cpp

+6 −0
Original line number Diff line number Diff line
@@ -124,6 +124,12 @@ void do_report_sysprop_change() { 
        if (sVM->GetEnv((void **)&env, JNI_VERSION_1_4) >= 0) {

            //ALOGI("Java SystemProperties: calling %p", sCallChangeCallbacks);

            env->CallStaticVoidMethod(sClazz, sCallChangeCallbacks);

            // There should not be any exceptions. But we must guarantee

            // there are none on return.

            if (env->ExceptionCheck()) {

                env->ExceptionClear();

                LOG(ERROR) << "Exception pending after sysprop_change!";

            }

        }

    }

}

core/tests/systemproperties/src/android/os/SystemPropertiesTest.java

+47 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package android.os;



import java.util.concurrent.CountDownLatch;

import java.util.concurrent.TimeUnit;



import junit.framework.TestCase;



import android.os.SystemProperties;
@@ -141,4 +144,48 @@ public class SystemPropertiesTest extends TestCase { 
        } catch (NullPointerException npe) {

        }

    }



    @SmallTest

    public void testCallbacks() {

        // Latches are not really necessary, but are easy to use.

        final CountDownLatch wait1 = new CountDownLatch(1);

        final CountDownLatch wait2 = new CountDownLatch(1);



        Runnable r1 = new Runnable() {

            boolean done = false;

            @Override

            public void run() {

                if (done) {

                    return;

                }

                done = true;



                wait1.countDown();

                throw new RuntimeException("test");

            }

        };



        Runnable r2 = new Runnable() {

            @Override

            public void run() {

                wait2.countDown();

            }

        };



        SystemProperties.addChangeCallback(r1);

        SystemProperties.addChangeCallback(r2);



        SystemProperties.reportSyspropChanged();



        try {

            assertTrue(wait1.await(5, TimeUnit.SECONDS));

        } catch (InterruptedException e) {

            fail("InterruptedException");

        }

        try {

            assertTrue(wait2.await(5, TimeUnit.SECONDS));

        } catch (InterruptedException e) {

            fail("InterruptedException");

        }

    }

}