From 20f67e1b33cf642cb0428b5eb42ce2616b094194 Mon Sep 17 00:00:00 2001 From: zoey chen Date: Thu, 19 Dec 2019 17:11:55 +0800 Subject: [PATCH] [Settings] Cannot use UnsupportedAppUsage API, use appropriate method to replace it. Bug: 146537234 Test: make Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d --- .../settings/network/MobileDataContentObserver.java | 10 +++++++--- .../settings/network/telephony/MobileDataSlice.java | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/MobileDataContentObserver.java b/src/com/android/settings/network/MobileDataContentObserver.java index b8a1c8c1a5a..15e726f5f53 100644 --- a/src/com/android/settings/network/MobileDataContentObserver.java +++ b/src/com/android/settings/network/MobileDataContentObserver.java @@ -33,9 +33,13 @@ public class MobileDataContentObserver extends ContentObserver { super(handler); } - public static Uri getObservableUri(int subId) { + /** + * Return a URI of mobile data(ON vs OFF) + */ + public static Uri getObservableUri(Context context, int subId) { Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA); - if (TelephonyManager.getDefault().getSimCount() != 1) { + TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); + if (telephonyManager.getSimCount() != 1) { uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + subId); } return uri; @@ -54,7 +58,7 @@ public class MobileDataContentObserver extends ContentObserver { } public void register(Context context, int subId) { - final Uri uri = getObservableUri(subId); + final Uri uri = getObservableUri(context, subId); context.getContentResolver().registerContentObserver(uri, false, this); } diff --git a/src/com/android/settings/network/telephony/MobileDataSlice.java b/src/com/android/settings/network/telephony/MobileDataSlice.java index 152028c05ca..c70ae1a89da 100644 --- a/src/com/android/settings/network/telephony/MobileDataSlice.java +++ b/src/com/android/settings/network/telephony/MobileDataSlice.java @@ -252,7 +252,7 @@ public class MobileDataSlice implements CustomSliceable { } public void register(Context context, int subId) { - final Uri uri = MobileDataContentObserver.getObservableUri(subId); + final Uri uri = MobileDataContentObserver.getObservableUri(context, subId); context.getContentResolver().registerContentObserver(uri, false, this); }