Merge "Clear identity when checking if bandwidth enabled."

1 files changed, 3 insertions, 0 deletions

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index f53e9570d7a6..1c3e24f7e521 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -1050,11 +1050,14 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
     }
 
     private boolean isBandwidthControlEnabled() {
+        final long token = Binder.clearCallingIdentity();
         try {
             return mNetworkManager.isBandwidthControlEnabled();
         } catch (RemoteException e) {
             // ignored; service lives in system_server
             return false;
+        } finally {
+            Binder.restoreCallingIdentity(token);
         }
     }