core/java NetworkManagement: Don't untag sockets willy-nilly

Tagging is conditional on having some useful info to tag.
But untagging had not such restriction leading to unnecessary kernel
calls that just fail with EINVAL.

b/5165619

Change-Id: Idd4b1dc45db04429f85e3ba37656640a8d33046a

1 files changed, 2 insertions, 1 deletions

diff --git a/core/java/com/android/server/NetworkManagementSocketTagger.java b/core/java/com/android/server/NetworkManagementSocketTagger.java
index 23af37e6188d..9f6ab315c304 100644
--- a/core/java/com/android/server/NetworkManagementSocketTagger.java
+++ b/core/java/com/android/server/NetworkManagementSocketTagger.java
@@ -115,7 +115,8 @@ public final class NetworkManagementSocketTagger extends SocketTagger {
 
     private void unTagSocketFd(FileDescriptor fd) throws IOException {
         int fdNum = fd.getInt$();
-        if (fdNum == -1) return;
+        final SocketTags options = threadSocketTags.get();
+        if (fdNum == -1 || (options.statsTag == -1 && options.statsUid == -1)) return;
         String cmd = "u " + fdNum;
         internalModuleCtrl(cmd);
     }