Merge "Handle all exceptions resetPassword can throw." into ub-testdpc-nyc

Author: AndrewScull

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

@@ -970,9 +970,10 @@ public void onClick(DialogInterface dialogInterface, int which) {
                 boolean ok = false;
                 try {
                     ok = mDevicePolicyManager.resetPassword(password, flags);
-                } catch (IllegalArgumentException iae) {
-                    // Bad password, eg. 2 characters where system minimum length is 4.
-                    Log.w(TAG, "Failed to reset password", iae);
+                } catch (IllegalArgumentException | IllegalStateException | SecurityException e) {
+                    // Not allowed to set password or trying to set a bad password, eg. 2 characters
+                    // where system minimum length is 4.
+                    Log.w(TAG, "Failed to reset password", e);
                 }
                 showToast(ok ? R.string.password_reset_success : R.string.password_reset_failed);
             }