diff options
| author | Qiwen Zhao <zhao@google.com> | 2015-04-01 00:40:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-01 00:40:05 +0000 |
| commit | 9a1ada6df67b51597034de8f743d93048533ce43 (patch) | |
| tree | 9d078c0955c8c66ac7a67970c8a81cd233df8b1a /services | |
| parent | bb251057fba1909152bef3e5e50f4bf70a245c14 (diff) | |
| parent | 9aa7258a172bda6ef0e08c5617c06bf32818f7a4 (diff) | |
| download | frameworks_base-9a1ada6df67b51597034de8f743d93048533ce43.zip frameworks_base-9a1ada6df67b51597034de8f743d93048533ce43.tar.gz frameworks_base-9a1ada6df67b51597034de8f743d93048533ce43.tar.bz2 | |
Merge "Data usage API: any uid is accessible to system apps running in any user"
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkStatsCollection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/net/NetworkStatsCollection.java b/services/core/java/com/android/server/net/NetworkStatsCollection.java index a415a84..15b68c7 100644 --- a/services/core/java/com/android/server/net/NetworkStatsCollection.java +++ b/services/core/java/com/android/server/net/NetworkStatsCollection.java @@ -571,7 +571,7 @@ public class NetworkStatsCollection implements FileRotator.Reader { } private static boolean isAccessibleToUser(int uid, int callerUid) { - return callerUid == android.os.Process.SYSTEM_UID || + return UserHandle.getAppId(callerUid) == android.os.Process.SYSTEM_UID || uid == android.os.Process.SYSTEM_UID || uid == UID_REMOVED || uid == UID_TETHERING || UserHandle.getUserId(uid) == UserHandle.getUserId(callerUid); } |