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

Merge "Fix crash on "Connection preferences"" am: b75c952800 am: 3cda0e9872 am: 32129f14f5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157

Change-Id: I46ad006bdb3700ac4cba29711db589e5afaca448
This commit is contained in:
Treehugger Robot
2020-11-04 09:18:32 +00:00
committed by Automerger Merge Worker
parent 9afa792c12 32129f14f5
commit e0347c87fd
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/print/PrintSettingPreferenceController.java
View File

@@ -60,6 +60,7 @@ public class PrintSettingPreferenceController extends BasePreferenceController i
@Override
public int getAvailabilityStatus() {
return mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING)
&& mPrintManager != null
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@@ -71,12 +72,16 @@ public class PrintSettingPreferenceController extends BasePreferenceController i
@Override
public void onStart() {
mPrintManager.addPrintJobStateChangeListener(this);
if (mPrintManager != null) {
mPrintManager.addPrintJobStateChangeListener(this);
}
}
@Override
public void onStop() {
mPrintManager.removePrintJobStateChangeListener(this);
if (mPrintManager != null) {
mPrintManager.removePrintJobStateChangeListener(this);
}
}
@Override