Handle all exceptions resetPassword can throw.

AndrewScull · AndrewScull · commit 7782b2a33785 · 2016-07-11T10:25:17.000+01:00
Bug: 29266358
Change-Id: Id1101b7aba613b344246dc4a055d895e3771dfc2
diff --git a/app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java b/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);
             }

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