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

Commit b6f9da0b authored by Prerepa Viswanadham's avatar Prerepa Viswanadham
Browse files

Merge commit '17455a3d' into master_merge

parents 9dc9c87a 17455a3d

api/current.txt

+10 −4
Original line number Diff line number Diff line
@@ -28885,13 +28885,17 @@ package android.service.carrier { 
    method public android.os.IBinder onBind(android.content.Intent);

    method public void onDownloadMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Integer>);

    method public void onFilterSms(android.service.carrier.MessagePdu, java.lang.String, int, int, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Boolean>);

    method public void onSendDataSms(byte[], int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public deprecated void onSendDataSms(byte[], int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public void onSendDataSms(byte[], int, java.lang.String, int, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public void onSendMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMmsResult>);

    method public void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);

    method public void onSendTextSms(java.lang.String, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public deprecated void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);

    method public void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);

    method public deprecated void onSendTextSms(java.lang.String, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public void onSendTextSms(java.lang.String, int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    field public static final int DOWNLOAD_STATUS_ERROR = 2; // 0x2

    field public static final int DOWNLOAD_STATUS_OK = 0; // 0x0

    field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1

    field public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1; // 0x1

    field public static final int SEND_STATUS_ERROR = 2; // 0x2

    field public static final int SEND_STATUS_OK = 0; // 0x0

    field public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1
@@ -30822,6 +30826,7 @@ package android.telecom { 
    method public static boolean isPaused(int);

    method public static boolean isReceptionEnabled(int);

    method public static boolean isTransmissionEnabled(int);

    method public static java.lang.String videoStateToString(int);

    field public static final int AUDIO_ONLY = 0; // 0x0

    field public static final int BIDIRECTIONAL = 3; // 0x3

    field public static final int PAUSED = 4; // 0x4
@@ -31242,7 +31247,8 @@ package android.telephony { 
  public class SmsMessage {

    method public static int[] calculateLength(java.lang.CharSequence, boolean);

    method public static int[] calculateLength(java.lang.String, boolean);

    method public static android.telephony.SmsMessage createFromPdu(byte[]);

    method public static deprecated android.telephony.SmsMessage createFromPdu(byte[]);

    method public static android.telephony.SmsMessage createFromPdu(byte[], java.lang.String);

    method public java.lang.String getDisplayMessageBody();

    method public java.lang.String getDisplayOriginatingAddress();

    method public java.lang.String getEmailBody();

api/system-current.txt

+11 −4
Original line number Diff line number Diff line
@@ -20885,6 +20885,7 @@ package android.net.wifi { 
    field public static final int REASON_INVALID_LISTENER = -3; // 0xfffffffd

    field public static final int REASON_INVALID_REQUEST = -4; // 0xfffffffc

    field public static final int REASON_NOT_AVAILABLE = -2; // 0xfffffffe

    field public static final int REASON_PERMISSION_DENIED = -5; // 0xfffffffb

    field public static final int REASON_UNSPECIFIED = -1; // 0xffffffff

    field public static final int RTT_BW_10_SUPPORT = 2; // 0x2

    field public static final int RTT_BW_160_SUPPORT = 32; // 0x20
@@ -30896,13 +30897,17 @@ package android.service.carrier { 
    method public android.os.IBinder onBind(android.content.Intent);

    method public void onDownloadMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Integer>);

    method public void onFilterSms(android.service.carrier.MessagePdu, java.lang.String, int, int, android.service.carrier.CarrierMessagingService.ResultCallback<java.lang.Boolean>);

    method public void onSendDataSms(byte[], int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public deprecated void onSendDataSms(byte[], int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public void onSendDataSms(byte[], int, java.lang.String, int, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public void onSendMms(android.net.Uri, int, android.net.Uri, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMmsResult>);

    method public void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);

    method public void onSendTextSms(java.lang.String, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public deprecated void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);

    method public void onSendMultipartTextSms(java.util.List<java.lang.String>, int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendMultipartSmsResult>);

    method public deprecated void onSendTextSms(java.lang.String, int, java.lang.String, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    method public void onSendTextSms(java.lang.String, int, java.lang.String, int, android.service.carrier.CarrierMessagingService.ResultCallback<android.service.carrier.CarrierMessagingService.SendSmsResult>);

    field public static final int DOWNLOAD_STATUS_ERROR = 2; // 0x2

    field public static final int DOWNLOAD_STATUS_OK = 0; // 0x0

    field public static final int DOWNLOAD_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1

    field public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1; // 0x1

    field public static final int SEND_STATUS_ERROR = 2; // 0x2

    field public static final int SEND_STATUS_OK = 0; // 0x0

    field public static final int SEND_STATUS_RETRY_ON_CARRIER_NETWORK = 1; // 0x1
@@ -32982,6 +32987,7 @@ package android.telecom { 
    method public static boolean isPaused(int);

    method public static boolean isReceptionEnabled(int);

    method public static boolean isTransmissionEnabled(int);

    method public static java.lang.String videoStateToString(int);

    field public static final int AUDIO_ONLY = 0; // 0x0

    field public static final int BIDIRECTIONAL = 3; // 0x3

    field public static final int PAUSED = 4; // 0x4
@@ -33404,7 +33410,8 @@ package android.telephony { 
  public class SmsMessage {

    method public static int[] calculateLength(java.lang.CharSequence, boolean);

    method public static int[] calculateLength(java.lang.String, boolean);

    method public static android.telephony.SmsMessage createFromPdu(byte[]);

    method public static deprecated android.telephony.SmsMessage createFromPdu(byte[]);

    method public static android.telephony.SmsMessage createFromPdu(byte[], java.lang.String);

    method public java.lang.String getDisplayMessageBody();

    method public java.lang.String getDisplayOriginatingAddress();

    method public java.lang.String getEmailBody();

core/java/android/service/carrier/CarrierMessagingService.java

+71 −6
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ public abstract class CarrierMessagingService extends Service { 
     */

    public static final int DOWNLOAD_STATUS_ERROR = 2;



    /**

     * Flag to request SMS delivery status report.

     */

    public static final int SEND_FLAG_REQUEST_DELIVERY_STATUS = 1;



    private final ICarrierMessagingWrapper mWrapper = new ICarrierMessagingWrapper();



    /**
@@ -103,12 +108,14 @@ public abstract class CarrierMessagingService extends Service { 


    /**

     * Override this method to intercept text SMSs sent from the device.

     * @deprecated Override {@link #onSendTextSms} below instead.

     *

     * @param text the text to send

     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param callback result callback. Call with a {@link SendSmsResult}.

     */

    @Deprecated

    public void onSendTextSms(

            @NonNull String text, int subId, @NonNull String destAddress,

            @NonNull ResultCallback<SendSmsResult> callback) {
@@ -119,8 +126,26 @@ public abstract class CarrierMessagingService extends Service { 
        }

    }



    /**

     * Override this method to intercept text SMSs sent from the device.

     *

     * @param text the text to send

     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param sendSmsFlag Flag for sending SMS. Acceptable values are 0 and

     *        {@link #SEND_FLAG_REQUEST_DELIVERY_STATUS}.

     * @param callback result callback. Call with a {@link SendSmsResult}.

     */

    public void onSendTextSms(

            @NonNull String text, int subId, @NonNull String destAddress,

            int sendSmsFlag, @NonNull ResultCallback<SendSmsResult> callback) {

        // optional

        onSendTextSms(text, subId, destAddress, callback);

    }



    /**

     * Override this method to intercept binary SMSs sent from the device.

     * @deprecated Override {@link #onSendDataSms} below instead.

     *

     * @param data the binary content

     * @param subId SMS subscription ID of the SIM
@@ -128,6 +153,7 @@ public abstract class CarrierMessagingService extends Service { 
     * @param destPort the destination port

     * @param callback result callback. Call with a {@link SendSmsResult}.

     */

    @Deprecated

    public void onSendDataSms(@NonNull byte[] data, int subId,

            @NonNull String destAddress, int destPort,

            @NonNull ResultCallback<SendSmsResult> callback) {
@@ -138,14 +164,34 @@ public abstract class CarrierMessagingService extends Service { 
        }

    }



    /**

     * Override this method to intercept binary SMSs sent from the device.

     *

     * @param data the binary content

     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param destPort the destination port

     * @param sendSmsFlag Flag for sending SMS. Acceptable values are 0 and

     *        {@link #SEND_FLAG_REQUEST_DELIVERY_STATUS}.

     * @param callback result callback. Call with a {@link SendSmsResult}.

     */

    public void onSendDataSms(@NonNull byte[] data, int subId,

            @NonNull String destAddress, int destPort, int sendSmsFlag,

            @NonNull ResultCallback<SendSmsResult> callback) {

        // optional

        onSendDataSms(data, subId, destAddress, destPort, callback);

    }



    /**

     * Override this method to intercept long SMSs sent from the device.

     * @deprecated Override {@link #onSendMultipartTextSms} below instead.

     *

     * @param parts a {@link List} of the message parts

     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param callback result callback. Call with a {@link SendMultipartSmsResult}.

     */

    @Deprecated

    public void onSendMultipartTextSms(@NonNull List<String> parts,

            int subId, @NonNull String destAddress,

            @NonNull ResultCallback<SendMultipartSmsResult> callback) {
@@ -157,6 +203,23 @@ public abstract class CarrierMessagingService extends Service { 
        }

    }



    /**

     * Override this method to intercept long SMSs sent from the device.

     *

     * @param parts a {@link List} of the message parts

     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param sendSmsFlag Flag for sending SMS. Acceptable values are 0 and

     *        {@link #SEND_FLAG_REQUEST_DELIVERY_STATUS}.

     * @param callback result callback. Call with a {@link SendMultipartSmsResult}.

     */

    public void onSendMultipartTextSms(@NonNull List<String> parts,

            int subId, @NonNull String destAddress, int sendSmsFlag,

            @NonNull ResultCallback<SendMultipartSmsResult> callback) {

        // optional

        onSendMultipartTextSms(parts, subId, destAddress, callback);

    }



    /**

     * Override this method to intercept MMSs sent from the device.

     *
@@ -355,8 +418,9 @@ public abstract class CarrierMessagingService extends Service { 


        @Override

        public void sendTextSms(String text, int subId, String destAddress,

                                final ICarrierMessagingCallback callback) {

            onSendTextSms(text, subId, destAddress, new ResultCallback<SendSmsResult>() {

                int sendSmsFlag, final ICarrierMessagingCallback callback) {

            onSendTextSms(text, subId, destAddress, sendSmsFlag,

                    new ResultCallback<SendSmsResult>() {

                    @Override

                    public void onReceiveResult(final SendSmsResult result) throws RemoteException {

                        callback.onSendSmsComplete(result.getSendStatus(), result.getMessageRef());
@@ -366,8 +430,9 @@ public abstract class CarrierMessagingService extends Service { 


        @Override

        public void sendDataSms(byte[] data, int subId, String destAddress, int destPort,

                                final ICarrierMessagingCallback callback) {

            onSendDataSms(data, subId, destAddress, destPort, new ResultCallback<SendSmsResult>() {

                int sendSmsFlag, final ICarrierMessagingCallback callback) {

            onSendDataSms(data, subId, destAddress, destPort, sendSmsFlag,

                    new ResultCallback<SendSmsResult>() {

                    @Override

                    public void onReceiveResult(final SendSmsResult result) throws RemoteException {

                        callback.onSendSmsComplete(result.getSendStatus(), result.getMessageRef());
@@ -377,8 +442,8 @@ public abstract class CarrierMessagingService extends Service { 


        @Override

        public void sendMultipartTextSms(List<String> parts, int subId, String destAddress,

                                         final ICarrierMessagingCallback callback) {

                onSendMultipartTextSms(parts, subId, destAddress,

                int sendSmsFlag, final ICarrierMessagingCallback callback) {

            onSendMultipartTextSms(parts, subId, destAddress, sendSmsFlag,

                        new ResultCallback<SendMultipartSmsResult>() {

                                @Override

                                public void onReceiveResult(final SendMultipartSmsResult result)

core/java/android/service/carrier/ICarrierMessagingService.aidl

+6 −3
Original line number Diff line number Diff line
@@ -48,9 +48,10 @@ oneway interface ICarrierMessagingService { 
     * @param text the text to send

     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param sendSmsFlag flag for sending SMS

     * @param callback the callback to notify upon completion

     */

    void sendTextSms(String text, int subId, String destAddress,

    void sendTextSms(String text, int subId, String destAddress, int sendSmsFlag,

            in ICarrierMessagingCallback callback);



    /**
@@ -62,10 +63,11 @@ oneway interface ICarrierMessagingService { 
     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param destPort port number of the recipient of the message

     * @param sendSmsFlag flag for sending SMS

     * @param callback the callback to notify upon completion

     */

    void sendDataSms(in byte[] data, int subId, String destAddress, int destPort,

            in ICarrierMessagingCallback callback);

            int sendSmsFlag, in ICarrierMessagingCallback callback);



    /**

     * Request sending a new multi-part text SMS from the device.
@@ -75,10 +77,11 @@ oneway interface ICarrierMessagingService { 
     * @param parts the parts of the multi-part text SMS to send

     * @param subId SMS subscription ID of the SIM

     * @param destAddress phone number of the recipient of the message

     * @param sendSmsFlag flag for sending SMS

     * @param callback the callback to notify upon completion

     */

    void sendMultipartTextSms(in List<String> parts, int subId, String destAddress,

            in ICarrierMessagingCallback callback);

            int sendSmsFlag, in ICarrierMessagingCallback callback);



    /**

     * Request sending a new MMS PDU from the device.

services/core/java/com/android/server/net/DelayedDiskWrite.java

+9 −3
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ public class DelayedDiskWrite { 
    }



    public void write(final String filePath, final Writer w) {

        write(filePath, w, true);

    }



    public void write(final String filePath, final Writer w, final boolean open) {

        if (TextUtils.isEmpty(filePath)) {

            throw new IllegalArgumentException("empty file path");

        }
@@ -54,16 +58,18 @@ public class DelayedDiskWrite { 
        mDiskWriteHandler.post(new Runnable() {

            @Override

            public void run() {

                doWrite(filePath, w);

                doWrite(filePath, w, open);

            }

        });

    }



    private void doWrite(String filePath, Writer w) {

    private void doWrite(String filePath, Writer w, boolean open) {

        DataOutputStream out = null;

        try {

            if (open) {

                out = new DataOutputStream(new BufferedOutputStream(

                        new FileOutputStream(filePath)));

            }

            w.onWriteCalled(out);

        } catch (IOException e) {

            loge("Error writing data file " + filePath);