Merge "Revert the removal of FBE related checks." am: c1d6f96846 (f02e4a71) · Commits · e / os / android_frameworks_opt_telephony

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

+18 −15

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import android.content.ContentValues;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.database.Cursor;
		import android.database.SQLException;
		@@ -46,8 +47,10 @@ 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.os.storage.StorageManager;
		import android.provider.Telephony;
		import android.provider.Telephony.Sms.Intents;
		import android.service.carrier.CarrierMessagingService;
		@@ -657,18 +660,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);

		@@ -1034,9 +1037,9 @@ public abstract class InboundSmsHandler extends StateMachine {
		@UnsupportedAppUsage
		private void showNewMessageNotification() {
		// Do not show the notification on non-FBE devices.
		// if (!StorageManager.isFileEncryptedNativeOrEmulated()) {
		// return;
		// }
		if (!StorageManager.isFileEncryptedNativeOrEmulated()) {
		return;
		}
		log("Show new message notification.");
		PendingIntent intent = PendingIntent.getBroadcast(
		mContext,