From fd95a4f1af137c44bf0050f4941eb8085330b0e8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 17 Jan 2018 04:16:03 -0500 Subject: [PATCH] Optimize imports in android-smsmms module --- .../database/sqlite/SqliteWrapper.java | 2 +- .../java/android/net/NetworkTemplate.java | 4 ++- .../internal/telephony/GsmAlphabet.java | 2 +- .../main/java/com/android/mms/MmsConfig.java | 9 +++--- .../com/android/mms/dom/NamedNodeMapImpl.java | 4 +-- .../java/com/android/mms/dom/NodeImpl.java | 7 ++--- .../com/android/mms/dom/NodeListImpl.java | 4 +-- .../mms/dom/events/EventTargetImpl.java | 6 ++-- .../ElementParallelTimeContainerImpl.java | 5 ++-- .../ElementSequentialTimeContainerImpl.java | 5 ++-- .../android/mms/dom/smil/ElementTimeImpl.java | 6 ++-- .../mms/dom/smil/SmilDocumentImpl.java | 5 ++-- .../android/mms/dom/smil/SmilElementImpl.java | 3 +- .../mms/dom/smil/SmilLayoutElementImpl.java | 3 +- .../mms/dom/smil/SmilMediaElementImpl.java | 8 ++--- .../mms/dom/smil/SmilParElementImpl.java | 4 +-- .../com/android/mms/dom/smil/SmilPlayer.java | 12 ++++---- .../mms/dom/smil/SmilRegionElementImpl.java | 4 +-- .../android/mms/dom/smil/TimeListImpl.java | 4 +-- .../dom/smil/parser/SmilContentHandler.java | 8 ++--- .../mms/dom/smil/parser/SmilXmlParser.java | 7 ++--- .../dom/smil/parser/SmilXmlSerializer.java | 14 ++++----- .../mms/layout/HVGALayoutParameters.java | 3 +- .../com/android/mms/layout/LayoutManager.java | 3 +- .../android/mms/service_alt/ApnSettings.java | 3 +- .../mms/service_alt/DownloadRequest.java | 6 ---- .../android/mms/service_alt/MmsConfig.java | 1 - .../mms/service_alt/MmsConfigManager.java | 1 - .../service_alt/MmsConfigXmlProcessor.java | 5 ++-- .../mms/service_alt/MmsHttpClient.java | 7 ++--- .../mms/service_alt/MmsNetworkManager.java | 6 ++-- .../android/mms/service_alt/MmsRequest.java | 5 ++-- .../android/mms/service_alt/SendRequest.java | 6 +--- .../service_alt/SubscriptionIdChecker.java | 1 - .../mms/transaction/DefaultRetryScheme.java | 3 +- .../android/mms/transaction/HttpUtils.java | 30 +++++++++---------- .../mms/transaction/MessageStatusService.java | 3 +- .../mms/transaction/MmsMessageSender.java | 3 +- .../transaction/MmsPushOutboxMessages.java | 3 +- .../transaction/MmsSystemEventReceiver.java | 4 +-- .../transaction/NotificationTransaction.java | 3 +- .../transaction/ProgressCallbackEntity.java | 2 -- .../mms/transaction/ReadRecTransaction.java | 7 ++--- .../mms/transaction/RetryScheduler.java | 1 - .../mms/transaction/SendTransaction.java | 1 - .../android/mms/transaction/Transaction.java | 8 ++--- .../mms/transaction/TransactionService.java | 6 ---- .../mms/transaction/TransactionSettings.java | 6 ++-- .../com/android/mms/util/DownloadManager.java | 6 ++-- .../com/android/mms/util/RateController.java | 1 - .../mms/util/SendingProgressTokenManager.java | 4 +-- .../java/com/google/android/collect/Sets.java | 6 +++- .../google/android/mms/pdu_alt/PduParser.java | 1 - .../google/android/mms/pdu_alt/SendReq.java | 3 +- .../google/android/mms/smil/SmilHelper.java | 8 +++-- .../mms/util_alt/DrmConvertSession.java | 2 +- .../android/mms/util_alt/SqliteWrapper.java | 2 +- .../klinker/android/send_message/Utils.java | 2 -- 58 files changed, 112 insertions(+), 176 deletions(-) diff --git a/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java b/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java index 73e2f70c..e0a5439f 100755 --- a/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java +++ b/android-smsmms/src/main/java/android/database/sqlite/SqliteWrapper.java @@ -22,8 +22,8 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import com.klinker.android.logger.Log; import android.widget.Toast; +import com.klinker.android.logger.Log; /** * @hide diff --git a/android-smsmms/src/main/java/android/net/NetworkTemplate.java b/android-smsmms/src/main/java/android/net/NetworkTemplate.java index cb8b0e55..ad731732 100755 --- a/android-smsmms/src/main/java/android/net/NetworkTemplate.java +++ b/android-smsmms/src/main/java/android/net/NetworkTemplate.java @@ -21,7 +21,9 @@ import android.os.Parcelable; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.Objects; -import static android.net.ConnectivityManager.*; +import static android.net.ConnectivityManager.TYPE_ETHERNET; +import static android.net.ConnectivityManager.TYPE_WIFI; +import static android.net.ConnectivityManager.TYPE_WIMAX; import static android.net.NetworkIdentity.COMBINE_SUBTYPE_ENABLED; import static android.net.NetworkIdentity.scrubSubscriberId; import static com.android.internal.util.ArrayUtils.contains; diff --git a/android-smsmms/src/main/java/com/android/internal/telephony/GsmAlphabet.java b/android-smsmms/src/main/java/com/android/internal/telephony/GsmAlphabet.java index 7acb3594..74723bb1 100755 --- a/android-smsmms/src/main/java/com/android/internal/telephony/GsmAlphabet.java +++ b/android-smsmms/src/main/java/com/android/internal/telephony/GsmAlphabet.java @@ -17,8 +17,8 @@ package com.android.internal.telephony; import android.text.TextUtils; -import com.klinker.android.logger.Log; import android.util.SparseIntArray; +import com.klinker.android.logger.Log; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/android-smsmms/src/main/java/com/android/mms/MmsConfig.java b/android-smsmms/src/main/java/com/android/mms/MmsConfig.java index b29b00e4..2b43103b 100755 --- a/android-smsmms/src/main/java/com/android/mms/MmsConfig.java +++ b/android-smsmms/src/main/java/com/android/mms/MmsConfig.java @@ -16,15 +16,14 @@ package com.android.mms; -import java.io.IOException; - +import android.content.Context; +import android.content.res.XmlResourceParser; +import com.klinker.android.logger.Log; import com.klinker.android.send_message.R; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import android.content.Context; -import android.content.res.XmlResourceParser; -import com.klinker.android.logger.Log; +import java.io.IOException; public class MmsConfig { private static final String TAG = "MmsConfig"; diff --git a/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java index 2fb0e24b..c08d44c4 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/NamedNodeMapImpl.java @@ -17,12 +17,12 @@ package com.android.mms.dom; -import java.util.Vector; - import org.w3c.dom.DOMException; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; +import java.util.Vector; + public class NamedNodeMapImpl implements NamedNodeMap { private Vector mNodes = new Vector(); diff --git a/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java index d7b1b2e2..d21bfa1a 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/NodeImpl.java @@ -17,9 +17,7 @@ package com.android.mms.dom; -import java.util.NoSuchElementException; -import java.util.Vector; - +import com.android.mms.dom.events.EventTargetImpl; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -31,7 +29,8 @@ import org.w3c.dom.events.EventException; import org.w3c.dom.events.EventListener; import org.w3c.dom.events.EventTarget; -import com.android.mms.dom.events.EventTargetImpl; +import java.util.NoSuchElementException; +import java.util.Vector; public abstract class NodeImpl implements Node, EventTarget { private Node mParentNode; diff --git a/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java index 4df651ae..80938896 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/NodeListImpl.java @@ -17,11 +17,11 @@ package com.android.mms.dom; -import java.util.ArrayList; - import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import java.util.ArrayList; + public class NodeListImpl implements NodeList { private ArrayList mSearchNodes; private ArrayList mStaticNodes; diff --git a/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java index 71d5569b..dbaa304e 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/events/EventTargetImpl.java @@ -17,15 +17,13 @@ package com.android.mms.dom.events; import com.android.mms.logs.LogTag; - -import java.util.ArrayList; - +import com.klinker.android.logger.Log; import org.w3c.dom.events.Event; import org.w3c.dom.events.EventException; import org.w3c.dom.events.EventListener; import org.w3c.dom.events.EventTarget; -import com.klinker.android.logger.Log; +import java.util.ArrayList; public class EventTargetImpl implements EventTarget { private static final String TAG = LogTag.TAG; diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java index bb617049..13be9f2c 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementParallelTimeContainerImpl.java @@ -17,8 +17,7 @@ package com.android.mms.dom.smil; -import java.util.ArrayList; - +import com.android.mms.dom.NodeListImpl; import org.w3c.dom.DOMException; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -28,7 +27,7 @@ import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.Time; import org.w3c.dom.smil.TimeList; -import com.android.mms.dom.NodeListImpl; +import java.util.ArrayList; public abstract class ElementParallelTimeContainerImpl extends ElementTimeContainerImpl implements ElementParallelTimeContainer { diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java index 34ae7195..801ae527 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementSequentialTimeContainerImpl.java @@ -17,15 +17,14 @@ package com.android.mms.dom.smil; -import java.util.ArrayList; - +import com.android.mms.dom.NodeListImpl; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.smil.ElementSequentialTimeContainer; import org.w3c.dom.smil.ElementTime; import org.w3c.dom.smil.SMILElement; -import com.android.mms.dom.NodeListImpl; +import java.util.ArrayList; public abstract class ElementSequentialTimeContainerImpl extends ElementTimeContainerImpl implements ElementSequentialTimeContainer { diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java index 018eee01..40bad2b2 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/ElementTimeImpl.java @@ -17,16 +17,14 @@ package com.android.mms.dom.smil; import com.android.mms.logs.LogTag; - -import java.util.ArrayList; - +import com.klinker.android.logger.Log; import org.w3c.dom.DOMException; import org.w3c.dom.smil.ElementTime; import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.Time; import org.w3c.dom.smil.TimeList; -import com.klinker.android.logger.Log; +import java.util.ArrayList; public abstract class ElementTimeImpl implements ElementTime { private static final String TAG = LogTag.TAG; diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java index b668ed01..7c722147 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilDocumentImpl.java @@ -16,6 +16,8 @@ package com.android.mms.dom.smil; +import com.android.mms.dom.DocumentImpl; +import com.android.mms.dom.events.EventImpl; import org.w3c.dom.DOMException; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -29,9 +31,6 @@ import org.w3c.dom.smil.SMILElement; import org.w3c.dom.smil.SMILLayoutElement; import org.w3c.dom.smil.TimeList; -import com.android.mms.dom.DocumentImpl; -import com.android.mms.dom.events.EventImpl; - public class SmilDocumentImpl extends DocumentImpl implements SMILDocument, DocumentEvent { /* * The sequential time container cannot be initialized here because the real container diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java index 8944dfa4..122f23f1 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilElementImpl.java @@ -17,11 +17,10 @@ package com.android.mms.dom.smil; +import com.android.mms.dom.ElementImpl; import org.w3c.dom.DOMException; import org.w3c.dom.smil.SMILElement; -import com.android.mms.dom.ElementImpl; - public class SmilElementImpl extends ElementImpl implements SMILElement { /** * This constructor is used by the factory methods of the SmilDocument. diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java index aae4be43..9cf4e69c 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilLayoutElementImpl.java @@ -17,12 +17,11 @@ package com.android.mms.dom.smil; +import com.android.mms.layout.LayoutManager; import org.w3c.dom.NodeList; import org.w3c.dom.smil.SMILLayoutElement; import org.w3c.dom.smil.SMILRootLayoutElement; -import com.android.mms.layout.LayoutManager; - public class SmilLayoutElementImpl extends SmilElementImpl implements SMILLayoutElement { SmilLayoutElementImpl(SmilDocumentImpl owner, String tagName) { diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java index dbebc8ed..08a43e8b 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilMediaElementImpl.java @@ -16,6 +16,9 @@ package com.android.mms.dom.smil; +import com.android.mms.dom.events.EventImpl; +import com.android.mms.logs.LogTag; +import com.klinker.android.logger.Log; import org.w3c.dom.DOMException; import org.w3c.dom.events.DocumentEvent; import org.w3c.dom.events.Event; @@ -23,11 +26,6 @@ import org.w3c.dom.smil.ElementTime; import org.w3c.dom.smil.SMILMediaElement; import org.w3c.dom.smil.TimeList; -import com.klinker.android.logger.Log; - -import com.android.mms.logs.LogTag; -import com.android.mms.dom.events.EventImpl; - public class SmilMediaElementImpl extends SmilElementImpl implements SMILMediaElement { public final static String SMIL_MEDIA_START_EVENT = "SmilMediaStart"; diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java index 258e9ab0..2d09f276 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilParElementImpl.java @@ -17,8 +17,6 @@ package com.android.mms.dom.smil; -import java.util.ArrayList; - import org.w3c.dom.DOMException; import org.w3c.dom.NodeList; import org.w3c.dom.events.DocumentEvent; @@ -29,6 +27,8 @@ import org.w3c.dom.smil.SMILParElement; import org.w3c.dom.smil.Time; import org.w3c.dom.smil.TimeList; +import java.util.ArrayList; + public class SmilParElementImpl extends SmilElementImpl implements SMILParElement { public final static String SMIL_SLIDE_START_EVENT = "SmilSlideStart"; public final static String SMIL_SLIDE_END_EVENT = "SmilSlideEnd"; diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilPlayer.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilPlayer.java index efb79e83..bf153557 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilPlayer.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilPlayer.java @@ -17,12 +17,7 @@ package com.android.mms.dom.smil; import com.android.mms.logs.LogTag; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; - +import com.klinker.android.logger.Log; import org.w3c.dom.NodeList; import org.w3c.dom.events.DocumentEvent; import org.w3c.dom.events.Event; @@ -33,7 +28,10 @@ import org.w3c.dom.smil.ElementTime; import org.w3c.dom.smil.Time; import org.w3c.dom.smil.TimeList; -import com.klinker.android.logger.Log; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; /** * The SmilPlayer is responsible for playing, stopping, pausing and resuming a SMIL tree. diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java index a7846af8..efd62f0c 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/SmilRegionElementImpl.java @@ -17,13 +17,11 @@ package com.android.mms.dom.smil; import com.android.mms.logs.LogTag; - +import com.klinker.android.logger.Log; import org.w3c.dom.DOMException; import org.w3c.dom.smil.SMILDocument; import org.w3c.dom.smil.SMILRegionElement; -import com.klinker.android.logger.Log; - public class SmilRegionElementImpl extends SmilElementImpl implements SMILRegionElement { diff --git a/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java b/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java index a844df13..4ad4be75 100755 --- a/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java +++ b/android-smsmms/src/main/java/com/android/mms/dom/smil/TimeListImpl.java @@ -17,11 +17,11 @@ package com.android.mms.dom.smil; -import java.util.ArrayList; - import org.w3c.dom.smil.Time; import org.w3c.dom.smil.TimeList; +import java.util.ArrayList; + public class TimeListImpl implements TimeList { private final ArrayList