diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-11 20:10:27 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-11 20:10:27 -0400 |
commit | d1ed6bce02a78dcd23ecf3c10287c13b27c12396 (patch) | |
tree | 9057a897166e55defd4f595169e91b64825d0b0e | |
parent | d310b527347f26696d320228a3b1fc29ec5fa4bb (diff) | |
parent | 833c1ed1dc5a4427d51d89e9b211764d0b8ae556 (diff) | |
download | sdl_android-feature/issue_1048_remove_symlinks.tar.gz |
Merge branch 'develop' into feature/issue_1048_remove_symlinksfeature/issue_1048_remove_symlinks
3 files changed, 2 insertions, 4 deletions
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java index 92a609309..e3ab2f2ff 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java @@ -31,8 +31,6 @@ */
package com.smartdevicelink.proxy.rpc;
-import android.support.annotation.NonNull;
-
import com.smartdevicelink.protocol.enums.FunctionID;
import com.smartdevicelink.proxy.RPCNotification;
import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java index 79c6d7663..e17d9b7d9 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowState.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.proxy.rpc; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.RPCStruct; diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowStatus.java index 509f5ed99..075d5f142 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowStatus.java +++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/WindowStatus.java @@ -31,7 +31,7 @@ */ package com.smartdevicelink.proxy.rpc; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.smartdevicelink.proxy.RPCStruct; |