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

am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev

Browse Source 
* commit 'cf911d107ac931306af80fd02eb696410bb2aaad':
  Check for DeviceAdminInfo type before casting
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-11 16:01:24 +00:00
committed by Android Git Automerger
parent b46eeeb7be cf911d107a
commit 55cd479d55
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/DeviceAdminSettings.java
View File

@@ -126,7 +126,12 @@ public class DeviceAdminSettings extends ListFragment {
@Override @Override
public void onListItemClick(ListView l, View v, int position, long id) { public void onListItemClick(ListView l, View v, int position, long id) {
DeviceAdminInfo dpi = (DeviceAdminInfo) l.getAdapter().getItem(position); Object o = l.getAdapter().getItem(position);
if (!(o instanceof DeviceAdminInfo)) {
// race conditions may cause this
return;
}
DeviceAdminInfo dpi = (DeviceAdminInfo) o;
final Activity activity = getActivity(); final Activity activity = getActivity();
final int userId = getUserId(dpi); final int userId = getUserId(dpi);
if (userId == UserHandle.myUserId() || !isProfileOwner(dpi)) { if (userId == UserHandle.myUserId() || !isProfileOwner(dpi)) {