Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75c2a618 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent Theme#dump from restricting minimum severity" into sc-dev am: 0793a489 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13791606

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e400ef0266991f642f5d285cdd794cee11b4368
parents a55d9aac 0793a489

libs/androidfw/AssetManager2.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -226,8 +226,6 @@ void AssetManager2::BuildDynamicRefTable() { 
}

}





void AssetManager2::DumpToLog() const {

void AssetManager2::DumpToLog() const {

  base::ScopedLogSeverity _log(base::INFO);



  LOG(INFO) << base::StringPrintf("AssetManager2(this=%p)", this);

  LOG(INFO) << base::StringPrintf("AssetManager2(this=%p)", this);





  std::string list;

  std::string list;
@@ -1721,7 +1719,6 @@ base::expected<std::monostate, IOError> Theme::SetTo(const Theme& o) { 
}

}





void Theme::Dump() const {

void Theme::Dump() const {

  base::ScopedLogSeverity _log(base::INFO);

  LOG(INFO) << base::StringPrintf("Theme(this=%p, AssetManager2=%p)", this, asset_manager_);

  LOG(INFO) << base::StringPrintf("Theme(this=%p, AssetManager2=%p)", this, asset_manager_);





  for (int p = 0; p < packages_.size(); p++) {

  for (int p = 0; p < packages_.size(); p++) {