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

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

Change-Id: If38969dcf5ca08fe5ef5717084e9b9b2e58e164b
This commit is contained in:
Joanne Chung
2021-05-21 02:24:37 +00:00
committed by Automerger Merge Worker

View File

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