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

Merge "[Settings] Replace TelephonyManager#from()" am: 19cebd9eca am: fb72a1094f am: 737783d5e4

Browse Source 
Change-Id: I392268bd41ff76960107f137ae10ebf3dd151170
This commit is contained in:
Automerger Merge Worker
2019-12-23 03:04:51 +00:00
parent 74d79b5cda 737783d5e4
commit 778653fe71
13 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datausage/DataUsageBaseFragment.java
View File

@@ -51,7 +51,7 @@ public abstract class DataUsageBaseFragment extends DashboardFragment {
services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager);
services.mTelephonyManager = TelephonyManager.from(context);
services.mTelephonyManager = context.getSystemService(TelephonyManager.class);
services.mSubscriptionManager = SubscriptionManager.from(context);
services.mUserManager = UserManager.get(context);
}

5
src/com/android/settings/datausage/DataUsageUtils.java
View File

@@ -33,7 +33,6 @@ import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
import android.util.Log;
import java.util.ArrayList;
import java.util.List;
/**
@@ -72,7 +71,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
return false;
}
final TelephonyManager telephonyManager = TelephonyManager.from(context);
final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
final NetworkStatsManager networkStatsManager =
context.getSystemService(NetworkStatsManager.class);
boolean hasEthernetUsage = false;
@@ -115,7 +114,7 @@ public final class DataUsageUtils extends com.android.settingslib.net.DataUsageU
}
return false;
}
final TelephonyManager tele = TelephonyManager.from(context);
final TelephonyManager tele = context.getSystemService(TelephonyManager.class);
// require both supported network and ready SIM
boolean isReady = true;
for (SubscriptionInfo subInfo : subInfoList) {