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

Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Ibc94e102fc69e4e2052526e1ee000684c5d7724f
This commit is contained in:
TreeHugger Robot
2022-01-13 19:18:08 +00:00
committed by Automerger Merge Worker
parent 7f848f44b6 1ef5f42b54
commit f43f129dc0
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/security/CredentialStorage.java
View File

@@ -85,7 +85,7 @@ public final class CredentialStorage extends FragmentActivity {
final String action = intent.getAction(); final String action = intent.getAction();
final UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE); final UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
if (!userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) { if (!userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
if (ACTION_RESET.equals(action)) { if (ACTION_RESET.equals(action) && checkCallerIsSelf()) {
new ResetDialog(); new ResetDialog();
} else { } else {
if (ACTION_INSTALL.equals(action) && checkCallerIsCertInstallerOrSelfInProfile()) { if (ACTION_INSTALL.equals(action) && checkCallerIsCertInstallerOrSelfInProfile()) {
@@ -317,6 +317,19 @@ public final class CredentialStorage extends FragmentActivity {
finish(); finish();
} }
/**
* Check that the caller is Settings.
*/
private boolean checkCallerIsSelf() {
try {
return Process.myUid() == android.app.ActivityManager.getService()
.getLaunchedFromUid(getActivityToken());
} catch (RemoteException re) {
// Error talking to ActivityManager, just give up
return false;
}
}
/** /**
* Check that the caller is either certinstaller or Settings running in a profile of this user. * Check that the caller is either certinstaller or Settings running in a profile of this user.
*/ */