SuppressLint

shadowsocks · Sep 9, 2016 · 35cb273 · 35cb273
1 parent b76f410
commit 35cb273
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>
+</vector>
diff --git 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>
+</vector>
diff --git 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>
+</vector>
diff --git 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
@@ -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()