From 156fe37a60c91b021242bc59ae5e2ec0c18028ec Mon Sep 17 00:00:00 2001 From: Alan Evans Date: Thu, 23 May 2019 11:38:24 -0300 Subject: [PATCH] Get SubscriptionManager by name due to ContextCompat bug for API 22. Fixes #8826 --- src/org/thoughtcrime/securesms/util/ServiceUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/thoughtcrime/securesms/util/ServiceUtil.java b/src/org/thoughtcrime/securesms/util/ServiceUtil.java index 8cb1111c6d..348df1fd61 100644 --- a/src/org/thoughtcrime/securesms/util/ServiceUtil.java +++ b/src/org/thoughtcrime/securesms/util/ServiceUtil.java @@ -12,7 +12,6 @@ import android.os.Vibrator; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; -import android.support.v4.content.ContextCompat; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.view.WindowManager; @@ -57,6 +56,6 @@ public class ServiceUtil { @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1) public static @Nullable SubscriptionManager getSubscriptionManager(@NonNull Context context) { - return ContextCompat.getSystemService(context, SubscriptionManager.class); + return (SubscriptionManager) context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE); } }