summaryrefslogtreecommitdiff
path: root/services/devicepolicy
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-05-12 16:15:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-05-12 16:15:14 +0000
commit55bf41c913484b0410ce631a960bf0f3b0f89d5d (patch)
tree19d68c593b93f0d78aac109c8939d4a664747a15 /services/devicepolicy
parent084b2de544356b62a25a1265fa66774852812d76 (diff)
parentb9a011b9e1c5e7c10ccee65348339793a0f0a768 (diff)
Merge "Don't suspend personal SMS app" into rvc-dev
Diffstat (limited to 'services/devicepolicy')
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java b/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java
index da716eaed82b..c687184265c1 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/PersonalAppsSuspensionHelper.java
@@ -30,6 +30,7 @@ import android.content.pm.ResolveInfo;
import android.os.IBinder;
import android.os.ServiceManager;
import android.provider.Settings;
+import android.provider.Telephony;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Slog;
@@ -84,6 +85,7 @@ public class PersonalAppsSuspensionHelper {
result.removeAll(getSystemLauncherPackages());
result.removeAll(getAccessibilityServices());
result.removeAll(getInputMethodPackages());
+ result.remove(Telephony.Sms.getDefaultSmsPackage(mContext));
result.remove(getSettingsPackageName());
final String[] unsuspendablePackages =