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

Commit b4355a32 authored by Marco Gontijo's avatar Marco Gontijo
Browse files

Send SDK sandbox UID instead of app UID in battery stats push metrics 

Bug: 225204467
Test: atest FrameworksCoreTests:BatteryStatsTests
Change-Id: I68825c156d67c535978922015f62f2add2ec634d
parent b29ab1f7

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

+29 −21
Original line number Diff line number Diff line
@@ -4763,8 +4763,11 @@ public class BatteryStatsImpl extends BatteryStats { 
        if (Process.isSdkSandboxUid(uid)) {

            return Process.getAppUidForSdkSandboxUid(uid);

        }

        int isolated = mIsolatedUids.get(uid, -1);

        return isolated > 0 ? isolated : uid;

        return mapIsolatedUid(uid);

    }













    private int mapIsolatedUid(int uid) {













        return mIsolatedUids.get(/*key=*/uid, /*valueIfKeyNotFound=*/uid);















    }





























    @GuardedBy("this")










@@ -5215,7 +5218,7 @@ public class BatteryStatsImpl extends BatteryStats {













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE);















            } else {















                FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED,













                        mappedUid, null, getPowerManagerWakeLockLevel(type), name,













                        mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name,















                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__ACQUIRE);















            }















        }










@@ -5269,7 +5272,7 @@ public class BatteryStatsImpl extends BatteryStats {













                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE);















            } else {















                FrameworkStatsLog.write_non_chained(FrameworkStatsLog.WAKELOCK_STATE_CHANGED,













                        mappedUid, null, getPowerManagerWakeLockLevel(type), name,













                        mapIsolatedUid(uid), null, getPowerManagerWakeLockLevel(type), name,















                        FrameworkStatsLog.WAKELOCK_STATE_CHANGED__STATE__RELEASE);















            }
























@@ -5693,7 +5696,10 @@ public class BatteryStatsImpl extends BatteryStats {













    @GuardedBy("this")















    private void noteStartGpsLocked(int uid, WorkChain workChain,















            long elapsedRealtimeMs, long uptimeMs) {













        uid = getAttributionUid(uid, workChain);













        if (workChain != null) {













            uid = workChain.getAttributionUid();













        }













        final int mappedUid = mapUid(uid);















        if (mGpsNesting == 0) {















            mHistoryCur.states |= HistoryItem.STATE_GPS_ON_FLAG;















            if (DEBUG_HISTORY) Slog.v(TAG, "Start GPS to: "









@@ -5703,21 +5709,24 @@ public class BatteryStatsImpl extends BatteryStats {













        mGpsNesting++;





























        if (workChain == null) {













            FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, uid, null,













                    FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON);













            FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED,













                    mapIsolatedUid(uid), null, FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON);















        } else {















            FrameworkStatsLog.write(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED,















                    workChain.getUids(), workChain.getTags(),















                    FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__ON);















        }



























        getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs).noteStartGps(elapsedRealtimeMs);













        getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs).noteStartGps(elapsedRealtimeMs);















    }





























    @GuardedBy("this")















    private void noteStopGpsLocked(int uid, WorkChain workChain,















            long elapsedRealtimeMs, long uptimeMs) {













        uid = getAttributionUid(uid, workChain);













        if (workChain != null) {













            uid = workChain.getAttributionUid();













        }













        final int mappedUid = mapUid(uid);















        mGpsNesting--;















        if (mGpsNesting == 0) {















            mHistoryCur.states &= ~HistoryItem.STATE_GPS_ON_FLAG;









@@ -5729,14 +5738,15 @@ public class BatteryStatsImpl extends BatteryStats {













        }





























        if (workChain == null) {













            FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, uid, null,













            FrameworkStatsLog.write_non_chained(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED,













                    mapIsolatedUid(uid), null,















                    FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF);















        } else {















            FrameworkStatsLog.write(FrameworkStatsLog.GPS_SCAN_STATE_CHANGED, workChain.getUids(),















                    workChain.getTags(), FrameworkStatsLog.GPS_SCAN_STATE_CHANGED__STATE__OFF);















        }



























        getUidStatsLocked(uid, elapsedRealtimeMs, uptimeMs).noteStopGps(elapsedRealtimeMs);













        getUidStatsLocked(mappedUid, elapsedRealtimeMs, uptimeMs).noteStopGps(elapsedRealtimeMs);















    }





























    @GuardedBy("this")










@@ -7154,7 +7164,10 @@ public class BatteryStatsImpl extends BatteryStats {













    @GuardedBy("this")















    private void noteBluetoothScanStartedLocked(WorkChain workChain, int uid,















            boolean isUnoptimized, long elapsedRealtimeMs, long uptimeMs) {













        uid = getAttributionUid(uid, workChain);













        if (workChain != null) {













            uid = workChain.getAttributionUid();













        }













        uid = mapUid(uid);















        if (mBluetoothScanNesting == 0) {















            mHistoryCur.states2 |= HistoryItem.STATE2_BLUETOOTH_SCAN_FLAG;















            if (DEBUG_HISTORY) Slog.v(TAG, "BLE scan started for: "










@@ -7194,7 +7207,10 @@ public class BatteryStatsImpl extends BatteryStats {













    @GuardedBy("this")















    private void noteBluetoothScanStoppedLocked(WorkChain workChain, int uid,















            boolean isUnoptimized, long elapsedRealtimeMs, long uptimeMs) {













        uid = getAttributionUid(uid, workChain);













        if (workChain != null) {













            uid = workChain.getAttributionUid();













        }













        uid = mapUid(uid);















        mBluetoothScanNesting--;















        if (mBluetoothScanNesting == 0) {















            mHistoryCur.states2 &= ~HistoryItem.STATE2_BLUETOOTH_SCAN_FLAG;









@@ -7207,14 +7223,6 @@ public class BatteryStatsImpl extends BatteryStats {













                .noteBluetoothScanStoppedLocked(elapsedRealtimeMs, isUnoptimized);















    }



























    private int getAttributionUid(int uid, WorkChain workChain) {













        if (workChain != null) {













            return mapUid(workChain.getAttributionUid());













        }

























        return mapUid(uid);













    }



























    @GuardedBy("this")















    public void noteBluetoothScanStoppedFromSourceLocked(WorkSource ws, boolean isUnoptimized) {















        noteBluetoothScanStoppedFromSourceLocked(ws, isUnoptimized,