Merge "OMS: do not hide reason for failing transactions (on non-user builds)"
This commit is contained in:
@@ -56,6 +56,7 @@ import android.content.pm.overlay.OverlayPaths;
|
|||||||
import android.content.res.ApkAssets;
|
import android.content.res.ApkAssets;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Binder;
|
import android.os.Binder;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.FabricatedOverlayInternal;
|
import android.os.FabricatedOverlayInternal;
|
||||||
import android.os.HandlerThread;
|
import android.os.HandlerThread;
|
||||||
@@ -876,7 +877,7 @@ public final class OverlayManagerService extends SystemService {
|
|||||||
}
|
}
|
||||||
Slog.d(TAG, "commit failed: " + e.getMessage(), e);
|
Slog.d(TAG, "commit failed: " + e.getMessage(), e);
|
||||||
throw new SecurityException("commit failed"
|
throw new SecurityException("commit failed"
|
||||||
+ (DEBUG ? ": " + e.getMessage() : ""));
|
+ (DEBUG || Build.IS_DEBUGGABLE ? ": " + e.getMessage() : ""));
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
traceEnd(TRACE_TAG_RRO);
|
traceEnd(TRACE_TAG_RRO);
|
||||||
|
|||||||
Reference in New Issue
Block a user