summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-08-11 16:52:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-11 16:52:59 +0000
commit0f5379b2a32282fa2bd0e5d1fd5b088b9f791e22 (patch)
tree81859230a67ac05300199d770b471970b74aab38
parentdae0744422618cb48d2712cc99a28cbc88d58822 (diff)
parent32d460af2c7d62d7d681047d1ec9371cb39daa9a (diff)
downloadframeworks_base-0f5379b2a32282fa2bd0e5d1fd5b088b9f791e22.zip
frameworks_base-0f5379b2a32282fa2bd0e5d1fd5b088b9f791e22.tar.gz
frameworks_base-0f5379b2a32282fa2bd0e5d1fd5b088b9f791e22.tar.bz2
am b0c60f1b: am b789a8ee: Block access to call logs from the corp profile
* commit 'b0c60f1b858b51e11f6715fe1ed078255cff1cd5': Block access to call logs from the corp profile
-rw-r--r--core/java/android/provider/CallLog.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 47cfa7d..8db99a5 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -510,9 +510,10 @@ public class CallLog {
for (int i = 0; i < count; i++) {
final UserInfo user = users.get(i);
final UserHandle userHandle = user.getUserHandle();
- if (userManager.isUserRunning(userHandle) &&
- !userManager.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS,
- userHandle)) {
+ if (userManager.isUserRunning(userHandle)
+ && !userManager.hasUserRestriction(UserManager.DISALLOW_OUTGOING_CALLS,
+ userHandle)
+ && !user.isManagedProfile()) {
Uri uri = addEntryAndRemoveExpiredEntries(context,
ContentProvider.maybeAddUserId(CONTENT_URI, user.id), values);
if (user.id == currentUserId) {