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

Commit e07c943c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove telephony hidden api usages from commands"

parents f6ea5afa e3b535b9

cmds/telecom/src/com/android/commands/telecom/Telecom.java

+9 −8
Original line number Diff line number Diff line
@@ -16,10 +16,12 @@ 


package com.android.commands.telecom;



import android.app.ActivityThread;

import android.content.ComponentName;

import android.content.Context;

import android.net.Uri;

import android.os.IUserManager;

import android.os.Looper;

import android.os.Process;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -33,7 +35,6 @@ import android.text.TextUtils; 


import com.android.internal.os.BaseCommand;

import com.android.internal.telecom.ITelecomService;

import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.TelephonyProperties;



import java.io.PrintStream;
@@ -83,7 +84,7 @@ public final class Telecom extends BaseCommand { 
    private ComponentName mComponent;

    private String mAccountId;

    private ITelecomService mTelecomService;

    private ITelephony mTelephonyService;

    private TelephonyManager mTelephonyManager;

    private IUserManager mUserManager;



    @Override
@@ -154,9 +155,10 @@ public final class Telecom extends BaseCommand { 
            return;

        }



        mTelephonyService = ITelephony.Stub.asInterface(

                ServiceManager.getService(Context.TELEPHONY_SERVICE));

        if (mTelephonyService == null) {

        Looper.prepareMainLooper();

        Context context = ActivityThread.systemMain().getSystemContext();

        mTelephonyManager = context.getSystemService(TelephonyManager.class);

        if (mTelephonyManager == null) {

            Log.w(this, "onRun: Can't access telephony service.");

            showError("Error: Could not access the Telephony Service. Is the system running?");

            return;
@@ -352,7 +354,7 @@ public final class Telecom extends BaseCommand { 
        }

        int numSims = Integer.parseInt(nextArgRequired());

        System.out.println("Setting sim count to " + numSims + ". Device may reboot");

        mTelephonyService.switchMultiSimConfig(numSims);

        mTelephonyManager.switchMultiSimConfig(numSims);

    }



    /**
@@ -366,8 +368,7 @@ public final class Telecom extends BaseCommand { 


    private void runGetMaxPhones() throws RemoteException {

        // This assumes the max number of SIMs is 2, which it currently is

        if (TelephonyManager.MULTISIM_ALLOWED

                == mTelephonyService.isMultiSimSupported("com.android.commands.telecom")) {

        if (TelephonyManager.MULTISIM_ALLOWED == mTelephonyManager.isMultiSimSupported()) {

            System.out.println("2");

        } else {

            System.out.println("1");