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

Commit cbaa45bb authored by Wink Saville's avatar Wink Saville
Browse files

Clean up 

 - Add @Overrides where needed.
 - Update javadoc comments
 - Remove extra semi-colons
 - Rename DataConnection.java to DataConnectionBase.java
 - Rename GsmDataConnection.java to DataConnection.java
 - Add defaults to switch statements
 - Remove/fix most "if (false)" statements. Fixed by using a CONSTANT
 - Fix hidden variables by hoisting to base class or renaming
 - Tweak some debug output

Change-Id: If38de2fdeaacafbf40cdfd7f84dc5c52030ba2a3
parent 4918296a

src/java/android/provider/Telephony.java

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.Intent; 
import android.database.Cursor;

import android.database.sqlite.SqliteWrapper;

import android.net.Uri;

import android.os.Environment;

import android.telephony.SmsMessage;

import android.text.TextUtils;

import android.telephony.Rlog;
@@ -44,8 +43,6 @@ import java.util.regex.Pattern; 
 */

public final class Telephony {

    private static final String TAG = "Telephony";

    private static final boolean DEBUG = true;

    private static final boolean LOCAL_LOGV = false;



    // Constructor

    public Telephony() {
@@ -1243,7 +1240,6 @@ public final class Telephony { 
     */

    public static final class Threads implements ThreadsColumns {

        private static final String[] ID_PROJECTION = { BaseColumns._ID };

        private static final String STANDARD_ENCODING = "UTF-8";

        private static final Uri THREAD_ID_CONTENT_URI = Uri.parse(

                "content://mms-sms/threadID");

        public static final Uri CONTENT_URI = Uri.withAppendedPath(

src/java/android/telephony/CellBroadcastMessage.java

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.telephony; 
import android.content.ContentValues;

import android.content.Context;

import android.database.Cursor;

import android.graphics.Typeface;

import android.os.Parcel;

import android.os.Parcelable;

import android.provider.Telephony;
@@ -27,10 +26,7 @@ import android.telephony.SmsCbCmasInfo; 
import android.telephony.SmsCbEtwsInfo;

import android.telephony.SmsCbLocation;

import android.telephony.SmsCbMessage;

import android.text.Spannable;

import android.text.SpannableStringBuilder;

import android.text.format.DateUtils;

import android.text.style.StyleSpan;



/**

 * Application wrapper for {@link SmsCbMessage}. This is Parcelable so that
@@ -76,10 +72,12 @@ public class CellBroadcastMessage implements Parcelable { 
    }



    /** Parcelable: no special flags. */

    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(Parcel out, int flags) {

        mSmsCbMessage.writeToParcel(out, flags);

        out.writeLong(mDeliveryTime);
@@ -88,10 +86,12 @@ public class CellBroadcastMessage implements Parcelable { 


    public static final Parcelable.Creator<CellBroadcastMessage> CREATOR

            = new Parcelable.Creator<CellBroadcastMessage>() {

        @Override

        public CellBroadcastMessage createFromParcel(Parcel in) {

            return new CellBroadcastMessage(in);

        }



        @Override

        public CellBroadcastMessage[] newArray(int size) {

            return new CellBroadcastMessage[size];

        }

src/java/android/telephony/SmsCbCmasInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -297,10 +297,12 @@ public class SmsCbCmasInfo implements Parcelable { 
    /** Creator for unparcelling objects. */

    public static final Parcelable.Creator<SmsCbCmasInfo>

            CREATOR = new Parcelable.Creator<SmsCbCmasInfo>() {

        @Override

        public SmsCbCmasInfo createFromParcel(Parcel in) {

            return new SmsCbCmasInfo(in);

        }



        @Override

        public SmsCbCmasInfo[] newArray(int size) {

            return new SmsCbCmasInfo[size];

        }

src/java/android/telephony/SmsCbEtwsInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class SmsCbEtwsInfo implements Parcelable { 
        time.second = second;



        // Timezone offset is in quarter hours.

        return time.toMillis(true) - (long) (timezoneOffset * 15 * 60 * 1000);

        return time.toMillis(true) - timezoneOffset * 15 * 60 * 1000;

    }



    /**
@@ -195,10 +195,12 @@ public class SmsCbEtwsInfo implements Parcelable { 


    /** Creator for unparcelling objects. */

    public static final Creator<SmsCbEtwsInfo> CREATOR = new Creator<SmsCbEtwsInfo>() {

        @Override

        public SmsCbEtwsInfo createFromParcel(Parcel in) {

            return new SmsCbEtwsInfo(in);

        }



        @Override

        public SmsCbEtwsInfo[] newArray(int size) {

            return new SmsCbEtwsInfo[size];

        }

src/java/android/telephony/SmsCbLocation.java

+0 −2
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@ 


package android.telephony;



import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.telephony.gsm.GsmCellLocation;



/**

 * Represents the location and geographical scope of a cell broadcast message.