diff options
author | Ang Li <angli@google.com> | 2017-02-13 16:04:36 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 16:04:36 -0800 |
commit | 0f9ab75ee996dbf8f3f1e9f400c71068df5bfe62 (patch) | |
tree | f3f5d6bb8ad04223d566e8199b6c1744aaebad6a /third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager | |
parent | c3eaca9f974a78ca2c65e94bd796b6f0b325d6aa (diff) | |
download | mobly-snippet-lib-0f9ab75ee996dbf8f3f1e9f400c71068df5bfe62.tar.gz |
Lint source code to AOSP. (#34)
* Add linter for the project.
* Apply AOSP style.
* Bump gradle toolchain version.
* Remove unused code.
* Fix quotation mark usage.
Diffstat (limited to 'third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager')
3 files changed, 21 insertions, 19 deletions
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/ReflectionSnippetManagerFactory.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/ReflectionSnippetManagerFactory.java index eb97481..db90f32 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/ReflectionSnippetManagerFactory.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/ReflectionSnippetManagerFactory.java @@ -21,10 +21,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; - import com.google.android.mobly.snippet.Snippet; import com.google.android.mobly.snippet.util.Log; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -60,9 +58,10 @@ public class ReflectionSnippetManagerFactory implements SnippetManagerFactory { private Set<Class<? extends Snippet>> loadSnippets() { ApplicationInfo appInfo; try { - appInfo = mContext - .getPackageManager() - .getApplicationInfo(mContext.getPackageName(), PackageManager.GET_META_DATA); + appInfo = + mContext.getPackageManager() + .getApplicationInfo( + mContext.getPackageName(), PackageManager.GET_META_DATA); } catch (PackageManager.NameNotFoundException e) { throw new IllegalStateException( "Failed to find ApplicationInfo with package name: " @@ -73,7 +72,9 @@ public class ReflectionSnippetManagerFactory implements SnippetManagerFactory { if (snippets == null) { throw new IllegalStateException( "AndroidManifest.xml does not contain a <metadata> tag with " - + "name=\"" + METADATA_TAG_NAME + "\""); + + "name=\"" + + METADATA_TAG_NAME + + "\""); } String[] snippetClassNames = snippets.split("\\s*,\\s*"); Set<Class<? extends Snippet>> receiverSet = new HashSet<>(); diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java index e27c473..da5a56d 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManager.java @@ -17,7 +17,11 @@ package com.google.android.mobly.snippet.manager; import android.os.Build; - +import com.google.android.mobly.snippet.Snippet; +import com.google.android.mobly.snippet.rpc.MethodDescriptor; +import com.google.android.mobly.snippet.rpc.RpcMinSdk; +import com.google.android.mobly.snippet.util.Log; +import com.google.android.mobly.snippet.util.SnippetLibException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -27,16 +31,11 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeSet; -import com.google.android.mobly.snippet.Snippet; -import com.google.android.mobly.snippet.rpc.MethodDescriptor; -import com.google.android.mobly.snippet.rpc.RpcMinSdk; -import com.google.android.mobly.snippet.util.Log; -import com.google.android.mobly.snippet.util.SnippetLibException; - public class SnippetManager { private final Map<Class<? extends Snippet>, Snippet> mReceivers; /** A map of strings to known RPCs. */ - private final Map<String, MethodDescriptor> mKnownRpcs = new HashMap<String, MethodDescriptor>(); + private final Map<String, MethodDescriptor> mKnownRpcs = + new HashMap<String, MethodDescriptor>(); public SnippetManager(Collection<Class<? extends Snippet>> classList) { mReceivers = new HashMap<>(); @@ -47,8 +46,8 @@ public class SnippetManager { if (mKnownRpcs.containsKey(m.getName())) { // We already know an RPC of the same name. We don't catch this anywhere because // this is a programming error. - throw new RuntimeException("An RPC with the name " + m.getName() - + " is already known."); + throw new RuntimeException( + "An RPC with the name " + m.getName() + " is already known."); } mKnownRpcs.put(m.getName(), m); } @@ -69,7 +68,8 @@ public class SnippetManager { int requiredSdkLevel = method.getAnnotation(RpcMinSdk.class).value(); if (Build.VERSION.SDK_INT < requiredSdkLevel) { throw new SnippetLibException( - String.format("%s requires API level %d, current level is %d", + String.format( + "%s requires API level %d, current level is %d", method.getName(), requiredSdkLevel, Build.VERSION.SDK_INT)); } } diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManagerFactory.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManagerFactory.java index 9acb273..50a3552 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManagerFactory.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/manager/SnippetManagerFactory.java @@ -19,6 +19,7 @@ package com.google.android.mobly.snippet.manager; import java.util.Map; public interface SnippetManagerFactory { - SnippetManager create(Integer UID); - Map<Integer, SnippetManager> getSnippetManagers(); + SnippetManager create(Integer UID); + + Map<Integer, SnippetManager> getSnippetManagers(); } |