Signed-off-by: unknown <sijunjie@huawei.com>
This commit is contained in:
unknown 2022-02-26 10:39:45 +08:00
parent 4917297206
commit 6a75403b81
4 changed files with 0 additions and 44 deletions

View File

@ -927,7 +927,6 @@ public:
KEY_DUMPSYS_PENDING,
KEY_DUMPSYS_PROCESS,
KEY_DUMPSYS_DATA,
KEY_DUMPSYS_SYSTEM_UI,
};
friend class AbilityStackManager;
@ -1056,7 +1055,6 @@ private:
void DumpWaittingAbilityQueueInner(const std::string &args, std::vector<std::string> &info);
void DumpStateInner(const std::string &args, std::vector<std::string> &info);
void DataDumpStateInner(const std::string &args, std::vector<std::string> &info);
void SystemDumpStateInner(const std::string &args, std::vector<std::string> &info);
void DumpFocusMapInner(const std::string &args, std::vector<std::string> &info);
void DumpWindowModeInner(const std::string &args, std::vector<std::string> &info);
void DumpMissionListInner(const std::string &args, std::vector<std::string> &info);
@ -1095,8 +1093,6 @@ private:
const std::string &args, std::vector<std::string> &info, bool isClient, bool isUserID, int userId);
void DataDumpSysStateInner(
const std::string &args, std::vector<std::string> &info, bool isClient, bool isUserID, int userId);
void SystemDumpSysStateInner(
const std::string &args, std::vector<std::string> &info, bool isClient, bool isUserID, int userId);
void InitConnectManager(int32_t userId, bool switchUser);
void InitDataAbilityManager(int32_t userId, bool switchUser);

View File

@ -90,8 +90,6 @@ const std::map<std::string, AbilityManagerService::DumpKey> AbilityManagerServic
std::map<std::string, AbilityManagerService::DumpKey>::value_type("-e", KEY_DUMP_SERVICE),
std::map<std::string, AbilityManagerService::DumpKey>::value_type("--data", KEY_DUMP_DATA),
std::map<std::string, AbilityManagerService::DumpKey>::value_type("-d", KEY_DUMP_DATA),
std::map<std::string, AbilityManagerService::DumpKey>::value_type("--ui", KEY_DUMP_SYSTEM_UI),
std::map<std::string, AbilityManagerService::DumpKey>::value_type("-u", KEY_DUMP_SYSTEM_UI),
std::map<std::string, AbilityManagerService::DumpKey>::value_type("-focus", KEY_DUMP_FOCUS_ABILITY),
std::map<std::string, AbilityManagerService::DumpKey>::value_type("-f", KEY_DUMP_FOCUS_ABILITY),
std::map<std::string, AbilityManagerService::DumpKey>::value_type("--win-mode", KEY_DUMP_WINDOW_MODE),
@ -117,8 +115,6 @@ const std::map<std::string, AbilityManagerService::DumpsysKey> AbilityManagerSer
std::map<std::string, AbilityManagerService::DumpsysKey>::value_type("-r", KEY_DUMPSYS_PROCESS),
std::map<std::string, AbilityManagerService::DumpsysKey>::value_type("--data", KEY_DUMPSYS_DATA),
std::map<std::string, AbilityManagerService::DumpsysKey>::value_type("-d", KEY_DUMPSYS_DATA),
std::map<std::string, AbilityManagerService::DumpsysKey>::value_type("--ui", KEY_DUMPSYS_SYSTEM_UI),
std::map<std::string, AbilityManagerService::DumpsysKey>::value_type("-k", KEY_DUMPSYS_SYSTEM_UI),
};
const bool REGISTER_RESULT =
@ -1715,7 +1711,6 @@ void AbilityManagerService::DumpFuncInit()
dumpFuncMap_[KEY_DUMP_WAIT_QUEUE] = &AbilityManagerService::DumpWaittingAbilityQueueInner;
dumpFuncMap_[KEY_DUMP_SERVICE] = &AbilityManagerService::DumpStateInner;
dumpFuncMap_[KEY_DUMP_DATA] = &AbilityManagerService::DataDumpStateInner;
dumpFuncMap_[KEY_DUMP_SYSTEM_UI] = &AbilityManagerService::SystemDumpStateInner;
dumpFuncMap_[KEY_DUMP_FOCUS_ABILITY] = &AbilityManagerService::DumpFocusMapInner;
dumpFuncMap_[KEY_DUMP_WINDOW_MODE] = &AbilityManagerService::DumpWindowModeInner;
dumpFuncMap_[KEY_DUMP_MISSION_LIST] = &AbilityManagerService::DumpMissionListInner;
@ -1731,7 +1726,6 @@ void AbilityManagerService::DumpSysFuncInit()
dumpsysFuncMap_[KEY_DUMPSYS_PENDING] = &AbilityManagerService::DumpSysPendingInner;
dumpsysFuncMap_[KEY_DUMPSYS_PROCESS] = &AbilityManagerService::DumpSysProcess;
dumpsysFuncMap_[KEY_DUMPSYS_DATA] = &AbilityManagerService::DataDumpSysStateInner;
dumpsysFuncMap_[KEY_DUMPSYS_SYSTEM_UI] = &AbilityManagerService::SystemDumpSysStateInner;
}
void AbilityManagerService::DumpSysInner(
@ -1951,11 +1945,6 @@ void AbilityManagerService::DataDumpSysStateInner(
}
}
void AbilityManagerService::SystemDumpSysStateInner(
const std::string& args, std::vector<std::string>& info, bool isClient, bool isUserID, int userId)
{
}
void AbilityManagerService::DumpInner(const std::string &args, std::vector<std::string> &info)
{
if (useNewMission_) {
@ -2092,10 +2081,6 @@ void AbilityManagerService::DataDumpStateInner(const std::string &args, std::vec
}
}
void AbilityManagerService::SystemDumpStateInner(const std::string &args, std::vector<std::string> &info)
{
}
void AbilityManagerService::DumpState(const std::string &args, std::vector<std::string> &info)
{
std::vector<std::string> argList;

View File

@ -65,7 +65,6 @@ const std::string HELP_MSG_DUMP = "usage: aa dump <options>\n"
" -s, --stack <number> dump the ability info of a specificed stack\n"
" -m, --mission <number> dump the ability info of a specificed mission\n"
" -l, --stack-list dump the mission list of every stack\n"
" -u, --ui dump the ability list of system ui stack\n"
" -e, --serv dump the service abilities\n"
" -d, --data dump the data abilities\n";
@ -80,7 +79,6 @@ const std::string HELP_MSG_DUMPSYS = "usage: aa dump <options>\n"
" -p, --pending dump pendingWantRecordId\n"
" -r, --process dump process\n"
" -d, --data dump the data abilities\n"
" -k, --ui dump the kenarl ability list ui stack\n"
" -u, --userId userId\n"
" -c, --client client\n"
" -c, -u are auxiliary parameters and cannot be used alone\n"

View File

@ -731,24 +731,6 @@ ErrCode AbilityManagerShellCommand::RunAsDumpsysCommand()
// 'aa dumpsys --data'
break;
}
case 'k': {
if (isfirstCommand == false) {
isfirstCommand = true;
if (isUserID == true) {
result = OHOS::ERR_INVALID_VALUE;
resultReceiver_.append("-k is no userID option\n");
resultReceiver_.append(HELP_MSG_DUMPSYS);
return result;
}
} else {
result = OHOS::ERR_INVALID_VALUE;
resultReceiver_.append(HELP_MSG_DUMPSYS);
return result;
}
// 'aa dumpsys -k'
// 'aa dumpsys --UI'
break;
}
case 'u': {
// 'aa dumpsys -u'
// 'aa dumpsys --userId'
@ -847,11 +829,6 @@ ErrCode AbilityManagerShellCommand::RunAsDumpCommand()
// 'aa dump --stack-list'
break;
}
case 'u': {
// 'aa dump -u'
// 'aa dump --ui'
break;
}
case 'd': {
// 'aa dump -d'
// 'aa dump --data'