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

Do no crash when profile is deleted

Browse Source 
Catch the exception and finish the activity.

Change-Id: I45deec32fd49119ab7943a941158bca82b63c432
Fix: 122823738
Test: manual
This commit is contained in:
Rubin Xu
2019-03-22 15:06:56 +00:00
parent 4db6ebbf4d
commit 654a78b56e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
View File

@@ -21,6 +21,7 @@ import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.BiometricManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.LinearLayout; import android.widget.LinearLayout;
@@ -35,6 +36,7 @@ import com.android.settings.Utils;
public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity { public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {
private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED"; private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED";
private static final String TAG = "ConfirmDeviceCredentialBaseActivity";
enum ConfirmCredentialTheme { enum ConfirmCredentialTheme {
NORMAL, NORMAL,
@@ -56,8 +58,15 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
@Override @Override
protected void onCreate(Bundle savedState) { protected void onCreate(Bundle savedState) {
int credentialOwnerUserId = Utils.getCredentialOwnerUserId(this, final int credentialOwnerUserId;
Utils.getUserIdFromBundle(this, getIntent().getExtras(), isInternalActivity())); try {
credentialOwnerUserId = Utils.getCredentialOwnerUserId(this,
Utils.getUserIdFromBundle(this, getIntent().getExtras(), isInternalActivity()));
} catch (SecurityException e) {
Log.e(TAG, "Invalid user Id supplied", e);
finish();
return;
}
if (UserManager.get(this).isManagedProfile(credentialOwnerUserId)) { if (UserManager.get(this).isManagedProfile(credentialOwnerUserId)) {
setTheme(R.style.Theme_ConfirmDeviceCredentialsWork); setTheme(R.style.Theme_ConfirmDeviceCredentialsWork);
mConfirmCredentialTheme = ConfirmCredentialTheme.WORK; mConfirmCredentialTheme = ConfirmCredentialTheme.WORK;