diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-04-22 10:59:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 11:00:02 +0000 |
| commit | 6d6290d2821c6b1e497e4990c5d42aee1dbc8a29 (patch) | |
| tree | e0fcac13e55a4010be2f4a6cfb8ba54b285ad68d /services/devicepolicy | |
| parent | c649dae8e0c78bc9f0194befe44279f3ea0012c9 (diff) | |
| parent | 78c05f97426e941b1a398e0d00b53603603f292b (diff) | |
| download | frameworks_base-6d6290d2821c6b1e497e4990c5d42aee1dbc8a29.zip frameworks_base-6d6290d2821c6b1e497e4990c5d42aee1dbc8a29.tar.gz frameworks_base-6d6290d2821c6b1e497e4990c5d42aee1dbc8a29.tar.bz2 | |
Merge "Check for null packages in setLockTaskPackages"
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c2e8ccc..8486705 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5664,7 +5664,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (packages != null) { for (int j = 0; j < packages.length; j++) { String pkg = packages[j]; - policy.mLockTaskPackages.add(pkg); + if (pkg != null) { + policy.mLockTaskPackages.add(pkg); + } } } |