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/Controller.java b/src/com/android/browser/Controller.java
index 4d96cf5..c0ffd83 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -906,8 +906,8 @@
this.getContext().startActivity(intent);
}
} else {
- if ((Boolean)ReflectHelper.invokeStaticMethod(
- "ActivityManagerNative", "isSystemReady", null, null)) {
+ if ((Boolean)ReflectHelper.invokeMethod(
+ "android.app.ActivityManagerNative", "isSystemReady", null, null)) {
try {
Intent intent = new Intent(INTENT_PICK_NETWORK);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -947,7 +947,7 @@
Object[] params = {new String(PROP_NETSWITCH),
new Boolean(false)};
Class[] type = new Class[] {String.class, boolean.class};
- Boolean result = (Boolean) ReflectHelper.invokeStaticMethod(
+ Boolean result = (Boolean) ReflectHelper.invokeMethod(
"android.os.SystemProperties", "getBoolean",
type, params);
if (result) {
@@ -1164,7 +1164,7 @@
public String[] doInBackground(Void... unused) {
Object[] params = {mActivity.getContentResolver()};
Class[] type = new Class[] {ContentResolver.class};
- return (String[])ReflectHelper.invokeStaticMethod(
+ return (String[])ReflectHelper.invokeMethod(
"android.provider.Browser","getVisitedHistory",
type, params);
}
@@ -2001,7 +2001,7 @@
case R.id.exit_menu_id:
Object[] params = { new String("persist.debug.browsermonkeytest")};
Class[] type = new Class[] {String.class};
- String ret = (String)ReflectHelper.invokeStaticMethod(
+ String ret = (String)ReflectHelper.invokeMethod(
"android.os.SystemProperties","get", type, params);
if (ret != null && ret.equals("enable"))
break;