diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-18 12:22:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-18 12:22:49 -0700 |
| commit | e7d9cd363d6095d37ca25d393c5e86067d3cc5e5 (patch) | |
| tree | 58dc6cd7926ba1c3cf5d8685e4363ce12d6b74dc /services/java/com/android/server/ConnectivityService.java | |
| parent | 23a2ce1fad31fc8467f3f53d39428e2d1f0a000e (diff) | |
| parent | 15ec7d6d7f23ec197a88619b5e03320cfebd2240 (diff) | |
| download | frameworks_base-e7d9cd363d6095d37ca25d393c5e86067d3cc5e5.zip frameworks_base-e7d9cd363d6095d37ca25d393c5e86067d3cc5e5.tar.gz frameworks_base-e7d9cd363d6095d37ca25d393c5e86067d3cc5e5.tar.bz2 | |
Merge "Add ALLOW_METERED column to DownloadManager."
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 359074a..722e312 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -865,27 +865,39 @@ private NetworkStateTracker makeWimaxStateTracker() { @Override public NetworkQuotaInfo getActiveNetworkQuotaInfo() { enforceAccessPermission(); - final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork); - if (state != null) { - try { - return mPolicyManager.getNetworkQuotaInfo(state); - } catch (RemoteException e) { + + final long token = Binder.clearCallingIdentity(); + try { + final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork); + if (state != null) { + try { + return mPolicyManager.getNetworkQuotaInfo(state); + } catch (RemoteException e) { + } } + return null; + } finally { + Binder.restoreCallingIdentity(token); } - return null; } @Override public boolean isActiveNetworkMetered() { enforceAccessPermission(); - final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork); - if (state != null) { - try { - return mPolicyManager.isNetworkMetered(state); - } catch (RemoteException e) { + + final long token = Binder.clearCallingIdentity(); + try { + final NetworkState state = getNetworkStateUnchecked(mActiveDefaultNetwork); + if (state != null) { + try { + return mPolicyManager.isNetworkMetered(state); + } catch (RemoteException e) { + } } + return false; + } finally { + Binder.restoreCallingIdentity(token); } - return false; } public boolean setRadios(boolean turnOn) { |