Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205 Change-Id: I8dae6a8a3fd0ed7cde335ead1e4b760bb5a8d195
This commit is contained in:
@@ -92,7 +92,7 @@ public final class CredentialStorage extends FragmentActivity {
|
||||
final String action = intent.getAction();
|
||||
final UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
|
||||
if (!userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
|
||||
if (ACTION_RESET.equals(action)) {
|
||||
if (ACTION_RESET.equals(action) && checkCallerIsSelf()) {
|
||||
new ResetDialog();
|
||||
} else {
|
||||
if (ACTION_INSTALL.equals(action) && checkCallerIsCertInstallerOrSelfInProfile()) {
|
||||
@@ -341,6 +341,19 @@ public final class CredentialStorage extends FragmentActivity {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user