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

Commit d70c53fc authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Better handling unknown uid case in network watchlist service"

parents 349f1487 292fa644

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

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

        }

        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);

        tryAggregateRecords();

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

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

            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));

        }

        // Step 2: Add all digests from records