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

Commit b9fd1e11 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

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

Merge "[MS69.1] Fix TrafficStats.init crashs for supplemental process" am: 0cc43d72 am: 35f59e77

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

Change-Id: I4503c3deea82643b17975e35edd3d97cf09c9caf
parents ca3d9920 35f59e77

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.media.MediaPlayer; 
import android.os.Binder;

import android.os.Binder;

import android.os.Build;

import android.os.Build;

import android.os.RemoteException;

import android.os.RemoteException;

import android.util.Log;





import com.android.server.NetworkManagementSocketTagger;

import com.android.server.NetworkManagementSocketTagger;
@@ -212,6 +213,13 @@ public class TrafficStats { 
        }

        }

        final NetworkStatsManager statsManager =

        final NetworkStatsManager statsManager =

                context.getSystemService(NetworkStatsManager.class);

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

        sStatsService = statsManager.getBinder();

    }

    }