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

Commit bf13083b authored by Jeffrey Huang's avatar Jeffrey Huang
Browse files

Migrate Listeners to StatsPullAtomService 

No thermalStateChanged CTS test

Test: atest HostAtmTests#testConnectivityStateChange
Bug: 145565211
Change-Id: Ic09e4184d8d500c5e4d4a6c302769fdb39d3b3b9
parent aa7848a6

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+0 −48
Original line number Diff line number Diff line
@@ -342,30 +342,6 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
            firstCpuOfCluster += powerProfile.getNumCoresInCpuCluster(i);

        }



        // Enable push notifications of throttling from vendor thermal

        // management subsystem via thermalservice.

        IBinder b = ServiceManager.getService("thermalservice");



        if (b != null) {

            sThermalService = IThermalService.Stub.asInterface(b);

            try {

                sThermalService.registerThermalEventListener(

                        new ThermalEventListener());

                Slog.i(TAG, "register thermal listener successfully");

            } catch (RemoteException e) {

                // Should never happen.

                Slog.e(TAG, "register thermal listener error");

            }

        } else {

            Slog.e(TAG, "cannot find thermalservice, no throttling push notifications");

        }



        // Default NetworkRequest should cover all transport types.

        final NetworkRequest request = new NetworkRequest.Builder().build();

        final ConnectivityManager connectivityManager =

                (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);

        connectivityManager.registerNetworkCallback(request, new ConnectivityStatsCallback());



        HandlerThread handlerThread = new HandlerThread(TAG);

        handlerThread.start();

        mHandler = new CompanionHandler(handlerThread.getLooper());
@@ -909,28 +885,4 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
            }

        }

    }



    // Thermal event received from vendor thermal management subsystem

    private static final class ThermalEventListener extends IThermalEventListener.Stub {

        @Override

        public void notifyThrottling(Temperature temp) {

            StatsLog.write(StatsLog.THERMAL_THROTTLING_SEVERITY_STATE_CHANGED, temp.getType(),

                    temp.getName(), (int) (temp.getValue() * 10), temp.getStatus());

        }

    }



    private static final class ConnectivityStatsCallback extends

            ConnectivityManager.NetworkCallback {

        @Override

        public void onAvailable(Network network) {

            StatsLog.write(StatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,

                    StatsLog.CONNECTIVITY_STATE_CHANGED__STATE__CONNECTED);

        }



        @Override

        public void onLost(Network network) {

            StatsLog.write(StatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,

                    StatsLog.CONNECTIVITY_STATE_CHANGED__STATE__DISCONNECTED);

        }

    }

}

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+44 −0
Original line number Diff line number Diff line
@@ -229,6 +229,25 @@ public class StatsPullAtomService extends SystemService { 
        mTelephony = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);

        mStorageManager = (StorageManager) mContext.getSystemService(StorageManager.class);



        final ConnectivityManager connectivityManager =

                (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);

        // Default NetworkRequest should cover all transport types.

        final NetworkRequest request = new NetworkRequest.Builder().build();

        connectivityManager.registerNetworkCallback(request, new ConnectivityStatsCallback());



        // Enable push notifications of throttling from vendor thermal

        // management subsystem via thermalservice.

        IThermalService thermalService = getIThermalService();

        if (thermalService != null) {

            try {

                thermalService.registerThermalEventListener(

                        new ThermalEventListener());

                Slog.i(TAG, "register thermal listener successfully");

            } catch (RemoteException e) {

                Slog.i(TAG, "failed to register thermal listener");

            }

        }



        // Initialize state for CPU_TIME_PER_FREQ atom

        PowerProfile powerProfile = new PowerProfile(mContext);

        final int numClusters = powerProfile.getNumCpuClusters();
@@ -2896,4 +2915,29 @@ public class StatsPullAtomService extends SystemService { 
                BackgroundThread.getExecutor()

        );

    }





    // Thermal event received from vendor thermal management subsystem

    private static final class ThermalEventListener extends IThermalEventListener.Stub {

        @Override

        public void notifyThrottling(Temperature temp) {

            StatsLog.write(StatsLog.THERMAL_THROTTLING_SEVERITY_STATE_CHANGED, temp.getType(),

                    temp.getName(), (int) (temp.getValue() * 10), temp.getStatus());

        }

    }



    private static final class ConnectivityStatsCallback extends

            ConnectivityManager.NetworkCallback {

        @Override

        public void onAvailable(Network network) {

            StatsLog.write(StatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,

                    StatsLog.CONNECTIVITY_STATE_CHANGED__STATE__CONNECTED);

        }



        @Override

        public void onLost(Network network) {

            StatsLog.write(StatsLog.CONNECTIVITY_STATE_CHANGED, network.netId,

                    StatsLog.CONNECTIVITY_STATE_CHANGED__STATE__DISCONNECTED);

        }

    }

}