diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-06-19 01:08:12 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2011-06-19 01:08:12 -0700 |
| commit | b09540f33a6cabe50edec0ef32d0b1d0b0d96fff (patch) | |
| tree | c185b8dd5cd0ad100803547c684c74c59346bc5c /core/java/android/net/NetworkIdentity.java | |
| parent | 1b5a2a96f793211bfbd39aa29cc41031dfa23950 (diff) | |
| download | frameworks_base-b09540f33a6cabe50edec0ef32d0b1d0b0d96fff.zip frameworks_base-b09540f33a6cabe50edec0ef32d0b1d0b0d96fff.tar.gz frameworks_base-b09540f33a6cabe50edec0ef32d0b1d0b0d96fff.tar.bz2 | |
Handle removed UIDs in network stats and policy.
When UID_REMOVED, clean up any existing UID network policy so it
doesn't linger for future apps. Also move any NetworkStatsHistory
to special UID_REMOVED tracking bucket.
Tests for new removal code. Also test detailed UID stats, including
network changes to verify template matching logic.
Bug: 4584212
Change-Id: I9faadf6b6f3830eb45d86c7f1980a27cdbcdb11e
Diffstat (limited to 'core/java/android/net/NetworkIdentity.java')
| -rw-r--r-- | core/java/android/net/NetworkIdentity.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/net/NetworkIdentity.java b/core/java/android/net/NetworkIdentity.java index f82d922..23ebbab 100644 --- a/core/java/android/net/NetworkIdentity.java +++ b/core/java/android/net/NetworkIdentity.java @@ -95,9 +95,13 @@ public class NetworkIdentity { final String subscriberId; if (isNetworkTypeMobile(type)) { - final TelephonyManager telephony = (TelephonyManager) context.getSystemService( - Context.TELEPHONY_SERVICE); - subscriberId = telephony.getSubscriberId(); + if (state.subscriberId != null) { + subscriberId = state.subscriberId; + } else { + final TelephonyManager telephony = (TelephonyManager) context.getSystemService( + Context.TELEPHONY_SERVICE); + subscriberId = telephony.getSubscriberId(); + } } else { subscriberId = null; } |