commit e1bf1d894da72c8eb66b1287f206758342d4aede
author Junyu Lai <junyulai@google.com> Tue Jan 25 17:11:59 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 25 17:11:59 2022 +0000
tree 51860e625dc9b3d963e2e1fb80482ac48b59db2f
parent 1fa0cb1ed050c2b4e027e1958e94efcc22af1de5
parent 498a92aac89a0e6b6a19a08a1d44adfbacc43497

Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process" am: a6889ec04f am: 498a92aac8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959129

Change-Id: I4503c3deea82643b17975e35edd3d97cf09c9caf

framework-t/src/android/net/TrafficStats.java

diff --git a/framework-t/src/android/net/TrafficStats.java b/framework-t/src/android/net/TrafficStats.java
index 77b7f16..c2f0cdf 100644
--- a/framework-t/src/android/net/TrafficStats.java
+++ b/framework-t/src/android/net/TrafficStats.java
@@ -31,6 +31,7 @@
 import android.os.Binder;
 import android.os.Build;
 import android.os.RemoteException;
+import android.util.Log;
 
 import com.android.server.NetworkManagementSocketTagger;
 
@@ -212,6 +213,13 @@
         }
         final NetworkStatsManager statsManager =
                 context.getSystemService(NetworkStatsManager.class);
+        if (statsManager == null) {
+            // TODO: Currently Process.isSupplemental is not working yet, because it depends on
+            //  process to run in a certain UID range, which is not true for now. Change this
+            //  to Log.wtf once Process.isSupplemental is ready.
+            Log.e(TAG, "TrafficStats not initialized, uid=" + Binder.getCallingUid());
+            return;
+        }
         sStatsService = statsManager.getBinder();
     }