Merge branch 'develop'

85022e95 · andrewleo · 7b8333ab · 211fcd51 · 85022e95
隐藏空白更改
内联并排

Showing with 3 addition and 3 deletion

src/com/netease/qa/emmagee/utils/ProcessInfo.java src/com/netease/qa/emmagee/utils/ProcessInfo.java +3 -3

未找到文件。
--- a/src/com/netease/qa/emmagee/utils/ProcessInfo.java
+++ b/src/com/netease/qa/emmagee/utils/ProcessInfo.java
@@ -210,9 +210,9 @@ public class ProcessInfo {
 		ActivityManager manager = (ActivityManager) context
 				.getSystemService(Context.ACTIVITY_SERVICE);
 		// Note: getRunningTasks is deprecated in API 21(Official)
-//		if (Build.VERSION.SDK_INT >= 21) {
-//			return Constants.NA;
-//		} 
+		if (Build.VERSION.SDK_INT >= 21) {
+			return Constants.NA;
+		}
 		List<RunningTaskInfo> runningTaskInfos = manager.getRunningTasks(1);
 		if (runningTaskInfos != null)
 			return (runningTaskInfos.get(0).topActivity).toString();