From 35cb2735928babaf677fe33e841af9d4e850b187 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 9 Sep 2016 16:47:47 +0800
Subject: [PATCH] SuppressLint

---
 src/main/res/drawable/ic_arrow_drop_down.xml                   | 1 +
 src/main/res/drawable/ic_content_add.xml                       | 1 +
 src/main/res/drawable/ic_content_copy.xml                      | 1 +
 src/main/res/drawable/ic_content_create.xml                    | 1 +
 src/main/res/drawable/ic_content_paste.xml                     | 1 +
 src/main/res/drawable/ic_device_nfc.xml                        | 1 +
 src/main/res/drawable/ic_done_all.xml                          | 1 +
 src/main/res/drawable/ic_image_camera_alt.xml                  | 1 +
 src/main/res/drawable/ic_social_share.xml                      | 1 +
 src/main/res/drawable/ic_start_busy.xml                        | 3 ++-
 src/main/res/drawable/ic_start_connected.xml                   | 3 ++-
 src/main/res/drawable/ic_start_idle.xml                        | 3 ++-
 src/main/res/values/styles.xml                                 | 1 +
 .../scala/com/github/shadowsocks/ShadowsocksVpnService.scala   | 2 ++
 14 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/res/drawable/ic_arrow_drop_down.xml b/src/main/res/drawable/ic_arrow_drop_down.xml
index f93ac49fec..10c32e72b3 100644
--- a/src/main/res/drawable/ic_arrow_drop_down.xml
+++ b/src/main/res/drawable/ic_arrow_drop_down.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/src/main/res/drawable/ic_content_add.xml b/src/main/res/drawable/ic_content_add.xml
index b9b8eca8b9..dd8a0dd0c2 100644
--- a/src/main/res/drawable/ic_content_add.xml
+++ b/src/main/res/drawable/ic_content_add.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_content_copy.xml b/src/main/res/drawable/ic_content_copy.xml
index e50927b224..ae1540bb39 100644
--- a/src/main/res/drawable/ic_content_copy.xml
+++ b/src/main/res/drawable/ic_content_copy.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_content_create.xml b/src/main/res/drawable/ic_content_create.xml
index 35a774a517..72237acb62 100644
--- a/src/main/res/drawable/ic_content_create.xml
+++ b/src/main/res/drawable/ic_content_create.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_content_paste.xml b/src/main/res/drawable/ic_content_paste.xml
index 7d2f624c9d..d7ee963303 100644
--- a/src/main/res/drawable/ic_content_paste.xml
+++ b/src/main/res/drawable/ic_content_paste.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_device_nfc.xml b/src/main/res/drawable/ic_device_nfc.xml
index 1dccf93255..b702301d85 100644
--- a/src/main/res/drawable/ic_device_nfc.xml
+++ b/src/main/res/drawable/ic_device_nfc.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_done_all.xml b/src/main/res/drawable/ic_done_all.xml
index 3fa4edb582..76ccd5ed7b 100644
--- a/src/main/res/drawable/ic_done_all.xml
+++ b/src/main/res/drawable/ic_done_all.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_image_camera_alt.xml b/src/main/res/drawable/ic_image_camera_alt.xml
index 4fa7158a03..59012e9f35 100644
--- a/src/main/res/drawable/ic_image_camera_alt.xml
+++ b/src/main/res/drawable/ic_image_camera_alt.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_social_share.xml b/src/main/res/drawable/ic_social_share.xml
index e3fe874d61..f9d9c5bb4b 100644
--- a/src/main/res/drawable/ic_social_share.xml
+++ b/src/main/res/drawable/ic_social_share.xml
@@ -1,3 +1,4 @@
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/src/main/res/drawable/ic_start_busy.xml b/src/main/res/drawable/ic_start_busy.xml
index 80d33108b5..89504f7b1f 100755
--- a/src/main/res/drawable/ic_start_busy.xml
+++ b/src/main/res/drawable/ic_start_busy.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -11,4 +12,4 @@
     <path
         android:fillColor="#fff"
         android:pathData="M 9.45 17.56 L 9.46 22 L 12.09 18.41 L 9.45 17.56 L 9.45 17.56 Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/src/main/res/drawable/ic_start_connected.xml b/src/main/res/drawable/ic_start_connected.xml
index 9df136c964..a1c86a1a07 100755
--- a/src/main/res/drawable/ic_start_connected.xml
+++ b/src/main/res/drawable/ic_start_connected.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -11,4 +12,4 @@
     <path
         android:fillColor="#fff"
         android:pathData="M 9.45 17.56 L 12.09 18.41 L 9.46 22 L 9.45 17.56 Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/src/main/res/drawable/ic_start_idle.xml b/src/main/res/drawable/ic_start_idle.xml
index 01e14cb4f2..0f430236de 100755
--- a/src/main/res/drawable/ic_start_idle.xml
+++ b/src/main/res/drawable/ic_start_idle.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -22,4 +23,4 @@
     <path
         android:fillColor="#fff"
         android:pathData="M8.56,8.56L0,12.8l6.83,2.57,4.64-3.9ZM6.44,13.08L5,12.55l5-2.47Z" />
-</vector>
\ No newline at end of file
+</vector>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index bd6258a618..d73f18a5f9 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
     </style>
 
     <style name="Theme.Material" parent="Theme.AppCompat.Light.NoActionBar">
+        <!--suppress NewApi -->
         <item name="android:navigationBarColor">@color/material_accent_700</item>
         <item name="colorAccent">@color/material_accent_500</item>
         <item name="colorButtonNormal">@color/material_accent_500</item>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
index dabd0a3c44..1074946ab8 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
@@ -42,6 +42,7 @@ package com.github.shadowsocks
 import java.io.File
 import java.util.Locale
 
+import android.annotation.SuppressLint
 import android.content._
 import android.content.pm.PackageManager.NameNotFoundException
 import android.net.VpnService
@@ -325,6 +326,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
     pdnsdProcess = new GuardedProcess(cmd).start()
   }
 
+  @SuppressLint(Array("NewApi"))
   def startVpn(): Int = {
 
     val builder = new Builder()