Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix ServicePermissionsTest#testDumpProtected" into sc-dev am: 68662ec826

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

Change-Id: Ib03dbe3e73f545facd059f9ceffaea47f4e87633
This commit is contained in:
Joanne Chung
2021-05-21 02:07:46 +00:00
committed by Automerger Merge Worker
parent 77dccbe7ea 68662ec826
commit c634282f14
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/translation/java/com/android/server/translation/TranslationManagerService.java
View File

@@ -48,6 +48,7 @@ import android.view.translation.UiTranslationSpec;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.os.IResultReceiver; import com.android.internal.os.IResultReceiver;
import com.android.internal.util.DumpUtils;
import com.android.server.infra.AbstractMasterSystemService; import com.android.server.infra.AbstractMasterSystemService;
import com.android.server.infra.FrameworkResourcesServiceNameResolver; import com.android.server.infra.FrameworkResourcesServiceNameResolver;
@@ -289,6 +290,8 @@ public final class TranslationManagerService
*/ */
@Override @Override
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
if (!DumpUtils.checkDumpPermission(getContext(), TAG, pw)) return;
synchronized (mLock) { synchronized (mLock) {
dumpLocked("", pw); dumpLocked("", pw);
} }