LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Change-Id: I4503c3deea82643b17975e35edd3d97cf09c9caf
This commit is contained in:
Junyu Lai
2022-01-25 17:11:59 +00:00
committed by Automerger Merge Worker
parent 1fa0cb1ed0 498a92aac8
commit e1bf1d894d
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework-t/src/android/net/TrafficStats.java
View File

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