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

Commit f64b4c5d authored by Siim Sammul's avatar Siim Sammul
Browse files

Fix process source propagation for binder calls stats settings so that 

it is correctly reported in the pushed atom BinderLatencyReported.

Bug: 180584913
Test: unit test
Change-Id: Ifbdd96c73276546fb2a05213f71e1de088e1fe1e
parent bd661f62

core/java/com/android/internal/os/BinderCallsStats.java

+1 −4
Original line number Diff line number Diff line
@@ -1190,15 +1190,12 @@ public class BinderCallsStats implements BinderInternal.Observer { 
        private final Context mContext;

        private final KeyValueListParser mParser = new KeyValueListParser(',');

        private final BinderCallsStats mBinderCallsStats;

        private final int mProcessSource;



        public SettingsObserver(Context context, BinderCallsStats binderCallsStats,

                    int processSource) {

        public SettingsObserver(Context context, BinderCallsStats binderCallsStats) {

            super(BackgroundThread.getHandler());

            mContext = context;

            context.getContentResolver().registerContentObserver(mUri, false, this);

            mBinderCallsStats = binderCallsStats;

            mProcessSource = processSource;

            // Always kick once to ensure that we match current state

            onChange();

        }

core/java/com/android/internal/os/BinderLatencyObserver.java

+5 −0
Original line number Diff line number Diff line
@@ -370,4 +370,9 @@ public class BinderLatencyObserver { 
    public Runnable getStatsdPushRunnable() {

        return mLatencyObserverRunnable;

    }



    @VisibleForTesting

    public int getProcessSource() {

        return mProcessSource;

    }

}

core/tests/coretests/src/com/android/internal/os/BinderCallsStatsTest.java

+34 −0
Original line number Diff line number Diff line
@@ -974,6 +974,40 @@ public class BinderCallsStatsTest { 
        assertEquals(true, bcs.getCollectLatencyData());

    }



    @Test

    public void testProcessSource() {

        BinderCallsStats defaultCallsStats = new BinderCallsStats(

                new BinderCallsStats.Injector());



        BinderCallsStats systemServerCallsStats = new BinderCallsStats(

                new BinderCallsStats.Injector(),

                com.android.internal.os.BinderLatencyProto.Dims.SYSTEM_SERVER);



        BinderCallsStats telephonyCallsStats = new BinderCallsStats(

                new BinderCallsStats.Injector(),

                com.android.internal.os.BinderLatencyProto.Dims.TELEPHONY);



        BinderCallsStats bluetoothCallsStats = new BinderCallsStats(

                new BinderCallsStats.Injector(),

                com.android.internal.os.BinderLatencyProto.Dims.BLUETOOTH);



        assertEquals(

                com.android.internal.os.BinderLatencyProto.Dims.SYSTEM_SERVER,

                defaultCallsStats.getLatencyObserver().getProcessSource());



        assertEquals(

                com.android.internal.os.BinderLatencyProto.Dims.SYSTEM_SERVER,

                systemServerCallsStats.getLatencyObserver().getProcessSource());



        assertEquals(

                com.android.internal.os.BinderLatencyProto.Dims.TELEPHONY,

                telephonyCallsStats.getLatencyObserver().getProcessSource());



        assertEquals(

                com.android.internal.os.BinderLatencyProto.Dims.BLUETOOTH,

                bluetoothCallsStats.getLatencyObserver().getProcessSource());

    }



    private static class TestHandler extends Handler {

        ArrayList<Runnable> mRunnables = new ArrayList<>();