From 910cd7b2abe2c9e7c76a4e9f528bce6f8eac9929 Mon Sep 17 00:00:00 2001 From: Hongming Jin Date: Wed, 23 Jan 2019 11:19:07 -0800 Subject: Migrate emergency default app to role manager. Bug: 123293861 Test: atest DefaultEmergencyPickerTest Change-Id: I7ca729fa457c23ba7a3e7a00f271a601cd124290 --- .../com/android/server/policy/role/LegacyRoleResolutionPolicy.java | 6 ++++++ services/core/java/com/android/server/role/RoleManagerService.java | 1 + 2 files changed, 7 insertions(+) diff --git a/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java b/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java index 888dd9992bdf..77bf930fb4d7 100644 --- a/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java +++ b/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java @@ -130,6 +130,12 @@ public class LegacyRoleResolutionPolicy implements RoleManagerService.RoleHolder String packageName = componentName != null ? componentName.getPackageName() : null; return CollectionUtils.singletonOrEmpty(packageName); } + case RoleManager.ROLE_EMERGENCY: { + String defaultEmergencyApp = Settings.Secure.getStringForUser( + mContext.getContentResolver(), + Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION, userId); + return CollectionUtils.singletonOrEmpty(defaultEmergencyApp); + } default: { Slog.e(LOG_TAG, "Don't know how to find legacy role holders for " + roleName); return Collections.emptyList(); diff --git a/services/core/java/com/android/server/role/RoleManagerService.java b/services/core/java/com/android/server/role/RoleManagerService.java index c145a22de6cd..17d3066bd37a 100644 --- a/services/core/java/com/android/server/role/RoleManagerService.java +++ b/services/core/java/com/android/server/role/RoleManagerService.java @@ -237,6 +237,7 @@ public class RoleManagerService extends SystemService implements RoleUserState.C migrateRoleIfNecessary(RoleManager.ROLE_SMS, userId); migrateRoleIfNecessary(RoleManager.ROLE_ASSISTANT, userId); migrateRoleIfNecessary(RoleManager.ROLE_DIALER, userId); + migrateRoleIfNecessary(RoleManager.ROLE_EMERGENCY, userId); // Some vital packages state has changed since last role grant // Run grants again -- cgit v1.2.3-59-g8ed1b