PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Remove usage of TelephonyManager getDefault() hidden API"

Browse Source 
am: 990b0527aa

Change-Id: I04c6d51db223bbdbcb18007e77c75103aed150ba
This commit is contained in:
Zoey Chen
2019-12-22 19:35:11 -08:00
committed by android-build-merger
parent fb72a1094f 990b0527aa
commit c9e4e0b881
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/network/MobileDataContentObserver.java
View File

@@ -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);
}

2
src/com/android/settings/network/telephony/MobileDataSlice.java
View File

@@ -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);
}