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

Commit bc94e86d authored by Ji Yang's avatar Ji Yang Committed by Android (Google) Code Review
Browse files

Merge "Rename carrier messaging API constant name." into nyc-dev

parents f6d865fd 4184a832

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.internal.telephony;

package com.android.internal.telephony;





import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;

import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;

import static android.service.carrier.CarrierMessagingService.RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE;

import static android.service.carrier.CarrierMessagingService.RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE;





import android.app.Activity;

import android.app.Activity;

import android.app.ActivityManagerNative;

import android.app.ActivityManagerNative;
@@ -1399,7 +1399,7 @@ public abstract class InboundSmsHandler extends StateMachine { 
     */

     */

    private boolean isSkipNotifyFlagSet(int callbackResult) {

    private boolean isSkipNotifyFlagSet(int callbackResult) {

        return (callbackResult

        return (callbackResult

            & RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_ENCRYPTED_STORAGE_UNAVAILABLE) > 0;

            & RECEIVE_OPTIONS_SKIP_NOTIFY_WHEN_CREDENTIAL_PROTECTED_STORAGE_UNAVAILABLE) > 0;

    }

    }





    /**

    /**