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

Commit 88a5de19 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "OMS: do not hide reason for failing transactions (on non-user builds)"... 

Merge "OMS: do not hide reason for failing transactions (on non-user builds)" am: 80ceccc4 am: 4dedb298

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



Change-Id: Ib1ed109a61090d818a749f7075748999d63e7ac1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8b05f8d 4dedb298

services/core/java/com/android/server/om/OverlayManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import android.content.pm.overlay.OverlayPaths; 
import android.content.res.ApkAssets;

import android.net.Uri;

import android.os.Binder;

import android.os.Build;

import android.os.Environment;

import android.os.FabricatedOverlayInternal;

import android.os.HandlerThread;
@@ -876,7 +877,7 @@ public final class OverlayManagerService extends SystemService { 
                    }

                    Slog.d(TAG, "commit failed: " + e.getMessage(), e);

                    throw new SecurityException("commit failed"

                            + (DEBUG ? ": " + e.getMessage() : ""));

                            + (DEBUG || Build.IS_DEBUGGABLE ? ": " + e.getMessage() : ""));

                }

            } finally {

                traceEnd(TRACE_TAG_RRO);