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

Commit 81cb1f06 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Mark SMS_EMERGENCY_CB_RECEIVED_ACTION @removed." into nyc-dev am: 54dd4016 

am: 604449cf

* commit '604449cf':
  Mark SMS_EMERGENCY_CB_RECEIVED_ACTION @removed.

Change-Id: If1ae88a7b0028c96b78044ecb06af1a9ac3240c6
parents 632e9864 604449cf

src/java/android/provider/Telephony.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -1029,9 +1029,10 @@ public final class Telephony { 
             *

             *

             * <p>If a BroadcastReceiver encounters an error while processing

             * <p>If a BroadcastReceiver encounters an error while processing

             * this intent it should set the result code appropriately.</p>

             * this intent it should set the result code appropriately.</p>



             *

             * <p>Requires {@link android.Manifest.permission#RECEIVE_EMERGENCY_BROADCAST} to

             * <p>Requires {@link android.Manifest.permission#RECEIVE_EMERGENCY_BROADCAST} to

             * receive.</p>

             * receive.</p>

             * @removed

             */

             */

            @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

            @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

            public static final String SMS_EMERGENCY_CB_RECEIVED_ACTION =

            public static final String SMS_EMERGENCY_CB_RECEIVED_ACTION =