diff options
| author | Daisuke Niwa <daisuke.niwa@sony.com> | 2019-03-01 11:30:31 +0900 |
|---|---|---|
| committer | Fan Zhang <zhfan@google.com> | 2019-04-15 13:09:58 -0700 |
| commit | fc63619d492af6f6af34b059d8002bb10eaf9843 (patch) | |
| tree | 60f96cd422079fc6784b2edb27773bb42bee7bb3 /packages/SettingsLib/RestrictedLockUtils | |
| parent | 4bea465dbb5f1613ab0a3c331c6b78c647e47894 (diff) | |
Avoid NPE when accessing to EnforcedAdmin
NPE happens when "modify" is tapped on the carrier wifi network
connected using CarrierConfig information. null is passed to
sendShowAdminSupportDetailsIntent method through 2nd argument.
Bug: 128188146
Test: Manually verified the crash scenario
Test: RunSettingsLibRoboTests
Signed-off-by: Daichi Ueura <daichi.ueura@sony.com>
(Cherry-pick from pa/1302748)
Change-Id: If92c12041b91dbab0f083a1b49d263b201e87699
Diffstat (limited to 'packages/SettingsLib/RestrictedLockUtils')
| -rw-r--r-- | packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java index 87b5b57c7d9e..4f4aef0b0fae 100644 --- a/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java +++ b/packages/SettingsLib/RestrictedLockUtils/src/com/android/settingslib/RestrictedLockUtils.java @@ -76,11 +76,13 @@ public class RestrictedLockUtils { public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) { final Intent intent = getShowAdminSupportDetailsIntent(context, admin); int targetUserId = UserHandle.myUserId(); - if (admin != null && admin.user != null - && isCurrentUserOrProfile(context, admin.user.getIdentifier())) { - targetUserId = admin.user.getIdentifier(); + if (admin != null) { + if (admin.user != null + && isCurrentUserOrProfile(context, admin.user.getIdentifier())) { + targetUserId = admin.user.getIdentifier(); + } + intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, admin.enforcedRestriction); } - intent.putExtra(DevicePolicyManager.EXTRA_RESTRICTION, admin.enforcedRestriction); context.startActivityAsUser(intent, UserHandle.of(targetUserId)); } |