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

Make pre-upgrade footer appear more consistently

Browse Source 
It's useful info regardless of whether the NLS is enabled

Test: PreUpgradePreferenceControllerTest
Fixes: 233963916

Change-Id: Idc6b2cebe18b119052233775bd4dcd561fd8b4fa
This commit is contained in:
Julia Reynolds
2023-01-27 16:38:34 -05:00
parent e0da6513dc
commit 3bab3c429c
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;
}
}