From 65dcdf2921ab1208b28813b05034045210f74a8a Mon Sep 17 00:00:00 2001 From: John Wu Date: Tue, 8 Mar 2022 14:50:51 -0800 Subject: [PATCH] Remove key migration related changes Migrating keys across UIDs is no longer required Test: m Bug: 228999189 Change-Id: Icdecbdb3997f9c5b3d470578b1d61e580a1c3537 --- private/access_vectors | 1 - private/system_server.te | 2 -- 2 files changed, 3 deletions(-) diff --git a/private/access_vectors b/private/access_vectors index 0f8dd5f9d..6cd8c4ee5 100644 --- a/private/access_vectors +++ b/private/access_vectors @@ -729,7 +729,6 @@ class keystore2 get_state list lock - migrate_any_key pull_metrics report_off_body reset diff --git a/private/system_server.te b/private/system_server.te index d3ad10044..479cbf96f 100644 --- a/private/system_server.te +++ b/private/system_server.te @@ -963,9 +963,7 @@ allow system_server keystore:keystore2 { clear_ns clear_uid get_state - list lock - migrate_any_key pull_metrics reset unlock