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

Commit 292fa644 authored by Ricky Wai's avatar Ricky Wai
Browse files

Better handling unknown uid case in network watchlist service 

Bug: 72995507
Test: Hard coded empty digest and it still works
Change-Id: Ieec509aaefc8c8e24b4ab3ecf0c6175a062340db
parent 7b2354ec

services/core/java/com/android/server/net/watchlist/WatchlistLoggingHandler.java

+11 −2
Original line number Original line Diff line number Diff line
@@ -180,6 +180,10 @@ class WatchlistLoggingHandler extends Handler { 
            return true;

            return true;

        }

        }

        final byte[] digest = getDigestFromUid(uid);

        final byte[] digest = getDigestFromUid(uid);

        if (digest == null) {

            Slog.e(TAG, "Cannot get digest from uid: " + uid);

            return false;

        }

        final boolean result = mDbHelper.insertNewRecord(digest, cncHost, timestamp);

        final boolean result = mDbHelper.insertNewRecord(digest, cncHost, timestamp);

        tryAggregateRecords();

        tryAggregateRecords();

        return result;

        return result;
@@ -242,6 +246,11 @@ class WatchlistLoggingHandler extends Handler { 
        final int size = apps.size();

        final int size = apps.size();

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

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

            byte[] digest = getDigestFromUid(apps.get(i).uid);

            byte[] digest = getDigestFromUid(apps.get(i).uid);

            if (digest == null) {

                Slog.e(TAG, "Cannot get digest from uid: " + apps.get(i).uid

                        + ",pkg: " + apps.get(i).packageName);

                continue;

            }

            result.add(HexDump.toHexString(digest));

            result.add(HexDump.toHexString(digest));

        }

        }

        // Step 2: Add all digests from records

        // Step 2: Add all digests from records