[Settings] Cannot use UnsupportedAppUsage API, use appropriate method to replace it.

Bug: 146537234
Test: make
Change-Id: I818848b0ae323efe8b890cde9d9819d9a606f96d
This commit is contained in:
zoey chen
2019-12-19 17:11:55 +08:00
parent 5536205081
commit 20f67e1b33
2 changed files with 8 additions and 4 deletions

View File

@@ -33,9 +33,13 @@ public class MobileDataContentObserver extends ContentObserver {
super(handler); 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); 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); uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + subId);
} }
return uri; return uri;
@@ -54,7 +58,7 @@ public class MobileDataContentObserver extends ContentObserver {
} }
public void register(Context context, int subId) { public void register(Context context, int subId) {
final Uri uri = getObservableUri(subId); final Uri uri = getObservableUri(context, subId);
context.getContentResolver().registerContentObserver(uri, false, this); context.getContentResolver().registerContentObserver(uri, false, this);
} }

View File

@@ -252,7 +252,7 @@ public class MobileDataSlice implements CustomSliceable {
} }
public void register(Context context, int subId) { 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); context.getContentResolver().registerContentObserver(uri, false, this);
} }