diff options
| author | Julian Kast <julian@livio.com> | 2020-08-11 11:19:18 -0400 |
|---|---|---|
| committer | Julian Kast <julian@livio.com> | 2020-08-11 11:19:18 -0400 |
| commit | 7728a94c9aad33a6dd9a3f171dcc4ec5f577db24 (patch) | |
| tree | 06605bb0d9d0863bd0eebb60d59a9c7439365d32 | |
| parent | 47f8e30637323682593a57fd935f172e8e765593 (diff) | |
| download | sdl_android-7728a94c9aad33a6dd9a3f171dcc4ec5f577db24.tar.gz | |
Edit imports to use androidX, fixing merge conflicts
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/SdlConnection/ISdlSessionListener.java | 2 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/base/src/main/java/com/smartdevicelink/SdlConnection/ISdlSessionListener.java b/base/src/main/java/com/smartdevicelink/SdlConnection/ISdlSessionListener.java index caab51b74..3cd6c23c9 100644 --- a/base/src/main/java/com/smartdevicelink/SdlConnection/ISdlSessionListener.java +++ b/base/src/main/java/com/smartdevicelink/SdlConnection/ISdlSessionListener.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.SdlConnection; -import android.support.annotation.RestrictTo; +import androidx.annotation.RestrictTo; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCMessage; diff --git a/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java b/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java index decc8205d..69cbfb8a7 100644 --- a/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java +++ b/base/src/main/java/com/smartdevicelink/protocol/ISdlProtocol.java @@ -33,7 +33,7 @@ package com.smartdevicelink.protocol; -import android.support.annotation.RestrictTo; +import androidx.annotation.RestrictTo; import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.security.SdlSecurityBase; |