Modified last of reflection calls to use ReflectHelper class
Also modified ReflectHelper class to consolidate the API and
modified browser code to reflect the API changes.
Change-Id: I708f43cf3c1432adc7cd78c25264330a673ffeb5
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 34ba56b..e3f31c0 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -43,7 +43,6 @@
import java.io.InputStream;
import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Locale;
@@ -358,16 +357,16 @@
// add for carrier useragent feature
String ua = null;
- try {
- Class c = Class.forName("com.qrd.useragent.UserAgentHandler");
- Object cObj = c.newInstance();
- Method m = c.getDeclaredMethod("getUAString", Context.class);
- ua = (String)m.invoke(cObj, mContext);
- } catch (Exception e) {
- Log.e(TAG, "plug in Load failed, err " + e);
+ Object objUserAgentHandler = ReflectHelper.newObject(
+ "com.qrd.useragent.UserAgentHandler", null, null);
+ Object[] params = {mContext};
+ Class[] type = new Class[] {Context.class};
+ ua = (String) ReflectHelper.invokeMethod(objUserAgentHandler,"getUAString",
+ type, params);
+ if (ua == null)
ua = mCustomUserAgents.get(settings);
- }
- if (ua != null) {
+
+ if (ua != null){
settings.setUserAgentString(ua);
} else {
settings.setUserAgentString(USER_AGENTS[getUserAgent()]);