Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 7a26ec1976 e48c5194db
commit 37c7d893b1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/res/Resources.java
View File

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