PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make pre-upgrade footer appear more consistently"

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-01 18:30:13 +00:00
committed by Android (Google) Code Review
parent 4e03bc2133 3bab3c429c
commit afb30cdd08
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/applications/specialaccess/notificationaccess/PreUpgradePreferenceController.java
View File

@@ -58,19 +58,15 @@ public class PreUpgradePreferenceController extends BasePreferenceController {
@Override
public int getAvailabilityStatus() {
if (mNm.isNotificationListenerAccessGranted(mCn)) {
mNlf = mNm.getListenerFilter(mCn, mUserId);
mNlf = mNm.getListenerFilter(mCn, mUserId);
if (mTargetSdk > Build.VERSION_CODES.S) {
return CONDITIONALLY_UNAVAILABLE;
}
if (!mNlf.areAllTypesAllowed() || !mNlf.getDisallowedPackages().isEmpty()) {
return CONDITIONALLY_UNAVAILABLE;
}
return AVAILABLE;
} else {
if (mTargetSdk > Build.VERSION_CODES.S) {
return CONDITIONALLY_UNAVAILABLE;
}
if (!mNlf.areAllTypesAllowed() || !mNlf.getDisallowedPackages().isEmpty()) {
return CONDITIONALLY_UNAVAILABLE;
}
return AVAILABLE;
}
}