Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dc2a0d7 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Gerrit Code Review
Browse files

Merge "Remove usage of Telephonymanager getDefault() and from() hidden APIs"

parents 3c397a62 40472f1e

services/core/java/com/android/server/am/BatteryExternalStatsWorker.java

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync { 
        if ((updateFlags & BatteryStatsImpl.ExternalStatsSync.UPDATE_RADIO) != 0) {

            // We were asked to fetch Telephony data.

            if (mTelephony == null) {

                mTelephony = TelephonyManager.from(mContext);

                mTelephony = mContext.getSystemService(TelephonyManager.class);

            }



            if (mTelephony != null) {

services/core/java/com/android/server/am/BatteryStatsService.java

+1 −1
Original line number Diff line number Diff line
@@ -731,7 +731,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub 


    public void notePhoneState(int state) {

        enforceCallingPermission();

        int simState = TelephonyManager.getDefault().getSimState();

        int simState = mContext.getSystemService(TelephonyManager.class).getSimState();

        synchronized (mStats) {

            mStats.notePhoneStateLocked(state, simState);

        }