Merge "Add caller check to com.android.credentials.RESET" (72f9e8ea) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/security/CredentialStorage.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,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()) {
		@@ -318,6 +318,19 @@ public final class CredentialStorage extends FragmentActivity {
		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.
		*/