Merge "Derestrict Resources.getDisplayAdjustments()." am: ea01ff86d0 am: e48c5194db am: 37c7d893b1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic62efe2198ec8b30b509aed5821b13822f81273f
This commit is contained in:
Mathew Inwood
2021-01-07 11:12:18 +00:00
committed by Automerger Merge Worker

View File

@@ -2057,7 +2057,7 @@ public class Resources {
}
/** @hide */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
@UnsupportedAppUsage(trackingBug = 176190631)
public DisplayAdjustments getDisplayAdjustments() {
final DisplayAdjustments overrideDisplayAdjustments = mOverrideDisplayAdjustments;
if (overrideDisplayAdjustments != null) {