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

Commit 4c8c505a authored by Peter Wang's avatar Peter Wang Committed by android-build-merger
Browse files

Merge "Removed call to isOnlyCoreApps()" 

am: 3d0ca615

Change-Id: Ieb55c1914b88a9affdf31d0dbd63a53a44a59024
parents 93e1e872 3d0ca615

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

+12 −14
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.content.ContentValues; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.IPackageManager;

import android.database.Cursor;

import android.database.SQLException;

import android.net.Uri;
@@ -47,7 +46,6 @@ import android.os.IDeviceIdleController; 
import android.os.Message;

import android.os.PowerManager;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Telephony;
@@ -664,18 +662,18 @@ public abstract class InboundSmsHandler extends StateMachine { 
            return Intents.RESULT_SMS_HANDLED;

        }



        // onlyCore indicates if the device is in cryptkeeper

        boolean onlyCore = false;

        try {

            onlyCore = IPackageManager.Stub.asInterface(ServiceManager.getService("package")).

                    isOnlyCoreApps();

        } catch (RemoteException e) {

        }

        if (onlyCore) {

            // Device is unable to receive SMS in encrypted state

            log("Received a short message in encrypted state. Rejecting.");

            return Intents.RESULT_SMS_GENERIC_ERROR;

        }

//        // onlyCore indicates if the device is in cryptkeeper

//        boolean onlyCore = false;

//        try {

//            onlyCore = IPackageManager.Stub.asInterface(ServiceManager.getService("package")).

//                    isOnlyCoreApps();

//        } catch (RemoteException e) {

//        }

//        if (onlyCore) {

//            // Device is unable to receive SMS in encrypted state

//            log("Received a short message in encrypted state. Rejecting.");

//            return Intents.RESULT_SMS_GENERIC_ERROR;

//        }



        int result = dispatchMessageRadioSpecific(smsb);