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

Commit e9197d68 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Replace some hidden API/constant usages with public/system alternatives." am: 2c979cd6 

Change-Id: I43233e74cb7a83cb090ceb87d1851fa1a59caf1b
parents 2ec3b715 2c979cd6

src/java/com/android/internal/telephony/CarrierSignalAgent.java

+2 −2
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ public class CarrierSignalAgent extends Handler { 
                    Rlog.e(LOG_TAG, "Register default network exception: " + ar.exception);

                    return;

                }

                final ConnectivityManager connectivityMgr =  ConnectivityManager

                        .from(mPhone.getContext());

                final ConnectivityManager connectivityMgr =  mPhone.getContext()

                        .getSystemService(ConnectivityManager.class);

                if ((boolean) ar.result) {

                    mNetworkCallback = new ConnectivityManager.NetworkCallback() {

                        @Override

src/java/com/android/internal/telephony/DeviceStateMonitor.java

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.net.ConnectivityManager; 
import android.net.Network;

import android.net.NetworkCapabilities;

import android.net.NetworkRequest;

import android.net.TetheringManager;

import android.os.BatteryManager;

import android.os.Handler;

import android.os.Message;
@@ -226,9 +227,9 @@ public class DeviceStateMonitor extends Handler { 
                    msg = obtainMessage(EVENT_CHARGING_STATE_CHANGED);

                    msg.arg1 = 0;   // not charging

                    break;

                case ConnectivityManager.ACTION_TETHER_STATE_CHANGED:

                case TetheringManager.ACTION_TETHER_STATE_CHANGED:

                    ArrayList<String> activeTetherIfaces = intent.getStringArrayListExtra(

                            ConnectivityManager.EXTRA_ACTIVE_TETHER);

                            TetheringManager.EXTRA_ACTIVE_TETHER);



                    boolean isTetheringOn = activeTetherIfaces != null

                            && activeTetherIfaces.size() > 0;

src/java/com/android/internal/telephony/InboundSmsHandler.java

+4 −3
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
            // by user policy.

            for (int i = users.length - 1; i >= 0; i--) {

                UserHandle targetUser = UserHandle.of(users[i]);

                if (users[i] != UserHandle.USER_SYSTEM) {

                if (users[i] != UserHandle.SYSTEM.getIdentifier()) {

                    // Is the user not allowed to use SMS?

                    if (hasUserRestriction(UserManager.DISALLOW_SMS, targetUser)) {

                        continue;
@@ -1168,11 +1168,12 @@ public abstract class InboundSmsHandler extends StateMachine { 
                        continue;

                    }

                }

                // Only pass in the resultReceiver when the USER_SYSTEM is processed.

                // Only pass in the resultReceiver when the user SYSTEM is processed.

                try {

                    mContext.createPackageContextAsUser(mContext.getPackageName(), 0, targetUser)

                            .sendOrderedBroadcast(intent, permission, appOp, opts,

                                    users[i] == UserHandle.USER_SYSTEM ? resultReceiver : null,

                                    users[i] == UserHandle.SYSTEM.getIdentifier()

                                            ? resultReceiver : null,

                                    getHandler(), Activity.RESULT_OK, null /* initialData */,

                                    null /* initialExtras */);

                } catch (PackageManager.NameNotFoundException ignored) {

src/java/com/android/internal/telephony/SMSDispatcher.java

+1 −4
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.content.DialogInterface; 
import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageInfo;

import android.content.pm.PackageItemInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.database.ContentObserver;
@@ -1405,9 +1404,7 @@ public abstract class SMSDispatcher extends Handler { 
        try {

            ApplicationInfo appInfo = pm.getApplicationInfoAsUser(appPackage, 0,

                UserHandle.getUserHandleForUid(userId));

            return appInfo.loadSafeLabel(pm, PackageItemInfo.DEFAULT_MAX_LABEL_SIZE_PX,

                    PackageItemInfo.SAFE_LABEL_FLAG_TRIM

                            | PackageItemInfo.SAFE_LABEL_FLAG_FIRST_LINE);

            return appInfo.loadSafeLabel(pm);

        } catch (PackageManager.NameNotFoundException e) {

            Rlog.e(TAG, "PackageManager Name Not Found for package " + appPackage);

            return appPackage;  // fall back to package name if we can't get app label

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -3978,7 +3978,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 


        // Create the snapshot of total video call data usage.

        NetworkStats vtDataUsageSnapshot = new NetworkStats(currentTime, 1);

        vtDataUsageSnapshot.combineAllValues(mVtDataUsageSnapshot);

        vtDataUsageSnapshot = vtDataUsageSnapshot.add(mVtDataUsageSnapshot);

        // Since the modem only reports the total vt data usage rather than rx/tx separately,

        // the only thing we can do here is splitting the usage into half rx and half tx.

        // Uid -1 indicates this is for the overall device data usage.