commit 0c447e9389ee669febe441eee2bc25a6ce9c9f15
author The Android Automerger <android-build@android.com> Tue Apr 24 07:03:02 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Apr 24 07:03:02 2012 -0700
tree 5a35a09c8bbe55bf77b83d620179a1a48e390741
parent f6d43ea959a5c4543413ef2ab1d9c4a9939431b4
parent 31cb87f84cc0cb511d8af8477c839e59e7951adc

merge in jb-release history after reset to master

services/java/com/android/server/net/NetworkStatsService.java

diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
index f53e957..1c3e24f 100644
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -1050,11 +1050,14 @@
     }
 
     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);
         }
     }