diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-14 16:22:31 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-09-14 16:22:31 -0400 |
| commit | 3ea5dcc98a15e1cc1b273a7526b91e1ac90d1d4b (patch) | |
| tree | 2ead00834d3d0373b613278b0b33c2923fde8c42 | |
| parent | 68d4435105bd08756e938a5aaead65ad76d4e0f7 (diff) | |
| download | sdl_android-3ea5dcc98a15e1cc1b273a7526b91e1ac90d1d4b.tar.gz | |
Make requested review changes
4 files changed, 7 insertions, 5 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java index d7853371f..603435800 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenDeviceIconManager.java @@ -206,7 +206,7 @@ class LockScreenDeviceIconManager { */ private void clearIconDirectory() { File iconDir = new File(context.getCacheDir() + "/" + STORED_ICON_DIRECTORY_PATH); - if (iconDir != null && iconDir.listFiles() != null) { + if (iconDir.listFiles() != null) { for (File child : iconDir.listFiles()) { if (child != null) { child.delete(); diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java index f818695c6..5f2452125 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java @@ -29,9 +29,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
-
- */
package com.smartdevicelink.trace;
import android.bluetooth.BluetoothAdapter;
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java index c8a0443d7..e7d915b1e 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java +++ b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java @@ -336,7 +336,9 @@ public class RPCStruct { if(valueForString != null){
try {
return valueForString.invoke(null, (String) s);
- } catch (IllegalAccessException | InvocationTargetException e) {
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ } catch (InvocationTargetException e) {
e.printStackTrace();
}
}
diff --git a/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java b/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java index 25b0e940c..3648bd8fc 100644 --- a/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java +++ b/base/src/main/java/com/smartdevicelink/transport/SiphonServer.java @@ -239,6 +239,9 @@ public class SiphonServer { deltaTimeMills = (int)(currentDateTime - m_startTimeStamp);
switch(direction) {
+ case fromSdl:
+ siphonDataTypeIndicator = 0x00;
+ break;
case fromApp:
siphonDataTypeIndicator = 0x01;
break;
|