Skip to content

Commit c730216

Browse files
yurushaoyurushao
committed
fix several typos
1 parent 32c7260 commit c730216

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/BaseActivityManagerService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public String getProcessNameByPid(int pid) {
8282
public void onReportMyProcessName(int callingPid, int callingUid, String stubProcessName, String targetProcessName, String targetPkg) {
8383
}
8484

85-
public abstract void onActivtyOnNewIntent(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo, Intent intent);
85+
public abstract void onActivityOnNewIntent(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo, Intent intent);
8686

8787
private static class ProcessCookie {
8888
private ProcessCookie(int pid, int uid) {
@@ -137,19 +137,19 @@ public boolean unregisterApplicationCallback(int callingPid, int callingUid, IAp
137137
public void onActivityCreated(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo) {
138138
}
139139

140-
public void onActivityDestory(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo) {
140+
public void onActivityDestroy(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo) {
141141
}
142142

143143
public void onServiceCreated(int callingPid, int callingUid, ServiceInfo stubInfo, ServiceInfo targetInfo) {
144144
}
145145

146-
public void onServiceDestory(int callingPid, int callingUid, ServiceInfo stubInfo, ServiceInfo targetInfo) {
146+
public void onServiceDestroy(int callingPid, int callingUid, ServiceInfo stubInfo, ServiceInfo targetInfo) {
147147
}
148148

149149
public void onProviderCreated(int callingPid, int callingUid, ProviderInfo stubInfo, ProviderInfo targetInfo) {
150150
}
151151

152-
public void onDestory() {
152+
public void onDestroy() {
153153
mRemoteCallbackList.kill();
154154
mRemoteCallbackList = null;
155155
}

‎project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/MyActivityManagerService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class MyActivityManagerService extends BaseActivityManagerService {
5959

6060
private static final String TAG = MyActivityManagerService.class.getSimpleName();
6161
private StaticProcessList mStaticProcessList = new StaticProcessList();
62-
private RunningProcesList mRunningProcessList = new RunningProcesList();
62+
private RunningProcessList mRunningProcessList = new RunningProcessList();
6363

6464
public MyActivityManagerService(Context hostContext) {
6565
super(hostContext);
@@ -75,11 +75,11 @@ public void onCreate(IPluginManagerImpl pluginManagerImpl) throws Exception {
7575
}
7676

7777
@Override
78-
public void onDestory() {
78+
public void onDestroy() {
7979
mRunningProcessList.clear();
8080
mStaticProcessList.clear();
8181
runProcessGC();
82-
super.onDestory();
82+
super.onDestroy();
8383
}
8484

8585
@Override
@@ -237,13 +237,13 @@ public void onActivityCreated(int callingPid, int callingUid, ActivityInfo stubI
237237
}
238238

239239
@Override
240-
public void onActivityDestory(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo) {
240+
public void onActivityDestroy(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo) {
241241
mRunningProcessList.removeActivityInfo(callingPid, callingUid, stubInfo, targetInfo);
242242
runProcessGC();
243243
}
244244

245245
@Override
246-
public void onActivtyOnNewIntent(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo, Intent intent) {
246+
public void onActivityOnNewIntent(int callingPid, int callingUid, ActivityInfo stubInfo, ActivityInfo targetInfo, Intent intent) {
247247
mRunningProcessList.addActivityInfo(callingPid, callingUid, stubInfo, targetInfo);
248248
}
249249

@@ -253,7 +253,7 @@ public void onServiceCreated(int callingPid, int callingUid, ServiceInfo stubInf
253253
}
254254

255255
@Override
256-
public void onServiceDestory(int callingPid, int callingUid, ServiceInfo stubInfo, ServiceInfo targetInfo) {
256+
public void onServiceDestroy(int callingPid, int callingUid, ServiceInfo stubInfo, ServiceInfo targetInfo) {
257257
mRunningProcessList.removeServiceInfo(callingPid, callingUid, stubInfo, targetInfo);
258258
runProcessGC();
259259
}

‎project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/RunningProcesList.java renamed to ‎project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/am/RunningProcessList.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
* 正在运行的进程列表
5151
* Created by Andy Zhang(zhangyong232@gmail.com) on 2015/3/10.
5252
*/
53-
class RunningProcesList {
53+
class RunningProcessList {
5454

5555
private static final Collator sCollator = Collator.getInstance();
56-
private static final String TAG = RunningProcesList.class.getSimpleName();
56+
private static final String TAG = RunningProcessList.class.getSimpleName();
5757
private static Comparator sComponentInfoComparator = new Comparator<ComponentInfo>() {
5858
@Override
5959
public int compare(ComponentInfo lhs, ComponentInfo rhs) {

‎project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/hook/handle/PluginInstrumentation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public void callActivityOnDestroy(Activity activity) {
242242
try {
243243
onActivityDestory(activity);
244244
} catch (RemoteException e) {
245-
Log.e(TAG, "callActivityOnDestroy:onActivityDestory", e);
245+
Log.e(TAG, "callActivityOnDestroy:onActivityDestroy", e);
246246
}
247247
}
248248
}

‎project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/IPluginManagerImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@ public void onActivityCreated(ActivityInfo stubInfo, ActivityInfo targetInfo) th
12331233

12341234
@Override
12351235
public void onActivityDestory(ActivityInfo stubInfo, ActivityInfo targetInfo) throws RemoteException {
1236-
mActivityManagerService.onActivityDestory(Binder.getCallingPid(), Binder.getCallingUid(), stubInfo, targetInfo);
1236+
mActivityManagerService.onActivityDestroy(Binder.getCallingPid(), Binder.getCallingUid(), stubInfo, targetInfo);
12371237
}
12381238

12391239
@Override
@@ -1243,7 +1243,7 @@ public void onServiceCreated(ServiceInfo stubInfo, ServiceInfo targetInfo) throw
12431243

12441244
@Override
12451245
public void onServiceDestory(ServiceInfo stubInfo, ServiceInfo targetInfo) throws RemoteException {
1246-
mActivityManagerService.onServiceDestory(Binder.getCallingPid(), Binder.getCallingUid(), stubInfo, targetInfo);
1246+
mActivityManagerService.onServiceDestroy(Binder.getCallingPid(), Binder.getCallingUid(), stubInfo, targetInfo);
12471247
}
12481248

12491249
@Override
@@ -1257,12 +1257,12 @@ public void reportMyProcessName(String stubProcessName, String targetProcessName
12571257
}
12581258

12591259
public void onDestroy() {
1260-
mActivityManagerService.onDestory();
1260+
mActivityManagerService.onDestroy();
12611261
}
12621262

12631263
@Override
12641264
public void onActivtyOnNewIntent(ActivityInfo stubInfo, ActivityInfo targetInfo, Intent intent) throws RemoteException {
1265-
mActivityManagerService.onActivtyOnNewIntent(Binder.getCallingPid(), Binder.getCallingUid(), stubInfo, targetInfo, intent);
1265+
mActivityManagerService.onActivityOnNewIntent(Binder.getCallingPid(), Binder.getCallingUid(), stubInfo, targetInfo, intent);
12661266
}
12671267

12681268
@Override

‎project/Libraries/DroidPlugin/src/com/morgoo/droidplugin/pm/PluginManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ public void onActivityDestory(ActivityInfo stubInfo, ActivityInfo targetInfo) th
922922
} catch (RemoteException e) {
923923
throw e;
924924
} catch (Exception e) {
925-
Log.e(TAG, "onActivityDestory", e);
925+
Log.e(TAG, "onActivityDestroy", e);
926926
}
927927
}
928928

@@ -949,7 +949,7 @@ public void onServiceDestory(ServiceInfo stubInfo, ServiceInfo targetInfo) {
949949
Log.w(TAG, "Plugin Package Manager Service not be connect");
950950
}
951951
} catch (Exception e) {
952-
Log.e(TAG, "onServiceDestory", e);
952+
Log.e(TAG, "onServiceDestroy", e);
953953
}
954954
}
955955

@@ -1022,7 +1022,7 @@ public void onActivtyOnNewIntent(ActivityInfo stubInfo, ActivityInfo targetInfo,
10221022
} catch (RemoteException e) {
10231023
throw e;
10241024
} catch (Exception e) {
1025-
Log.e(TAG, "onActivtyOnNewIntent", e);
1025+
Log.e(TAG, "onActivityOnNewIntent", e);
10261026
}
10271027
}
10281028

0 commit comments

Comments
 (0)