commit a1e5ac7164cbb4556226279de386518c5814c115
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 30 23:28:01 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 30 23:28:01 2023 +0000
tree c4282836f134462ee6c15ae4afc322fc4787433a
parent 26119cf4471c3fb7b10bad40d66975487913eec4
parent 0b7fd5e697427d73f4ac35dc41cd6cd33574ab3d

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23845447'] into udc-release.

Change-Id: I1c5dd79fee1ab7c9ab184da910c356727bdb8791

src/com/android/providers/telephony/ProviderUtil.java

diff --git a/src/com/android/providers/telephony/ProviderUtil.java b/src/com/android/providers/telephony/ProviderUtil.java
index 54ce5ee..fe3ba24 100644
--- a/src/com/android/providers/telephony/ProviderUtil.java
+++ b/src/com/android/providers/telephony/ProviderUtil.java
@@ -158,9 +158,8 @@
                     .getSubscriptionInfoListAssociatedWithUser(userHandle);
         }
 
-        // TODO (b/280821823): Update this logic when backup and restore is supported for
-        //  work profile messages as well.
-        if (allowAccessToRestoredMessages(context, userHandle)) {
+        UserManager userManager = context.getSystemService(UserManager.class);
+        if ((userManager != null) && (!userManager.isManagedProfile(userHandle.getIdentifier()))) {
             // SMS/MMS restored from another device have sub_id=-1.
             // To query/update/delete those messages, sub_id=-1 should be in the selection string.
             SubscriptionInfo invalidSubInfo = new SubscriptionInfo.Builder()
@@ -221,28 +220,4 @@
         }
         return selectionByEmergencyNumber;
     }
-
-    private static boolean allowAccessToRestoredMessages(@NonNull Context context,
-            @NonNull UserHandle userHandle) {
-        UserManager userManager = context.getSystemService(UserManager.class);
-        if (userManager != null && !userManager.isManagedProfile(userHandle.getIdentifier())) {
-            // userHandle is not a managed profile - allow access to restored messages
-            return true;
-        }
-
-        SubscriptionManager subManager = context.getSystemService(SubscriptionManager.class);
-        if (subManager != null) {
-            for(SubscriptionInfo subInfo:
-                    subManager.getActiveSubscriptionInfoList()) {
-                // If there is a SIM association policy set, then work profile telephony feature is
-                // enabled, so do not allow access to restored messages from work profile
-                if (subManager.getSubscriptionUserHandle(
-                        subInfo.getSubscriptionId()) != null) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
 }