PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Added check of the restriction if a user is allowed to change their icon. BUG: 25305966"

Browse Source
This commit is contained in:
Oleksandr Peletskyi
2016-01-22 20:31:41 +00:00
committed by Android (Google) Code Review
parent f9d330448b ef1584312b
commit 239e8a895f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/users/EditUserPhotoController.java
View File

@@ -32,6 +32,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.UserManager;
import android.provider.ContactsContract.DisplayPhoto;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
@@ -95,6 +96,10 @@ public class EditUserPhotoController {
showUpdatePhotoPopup();
}
});
final UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
if (um.hasUserRestriction(UserManager.DISALLOW_SET_USER_ICON)) {
mImageView.setEnabled(false);
}
mNewUserPhotoBitmap = bitmap;
mNewUserPhotoDrawable = drawable;
}