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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idebdb5ee7a25eabc83e7d9486384bfc4877c90fa
This commit is contained in:
Mathew Inwood
2021-01-07 10:51:25 +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) {