commit eda6d60e05592db8255f3821c4f429f9f2e2a53c
author Hugh Chen <hughchen@google.com> Mon Oct 12 15:49:23 2020 +0800
committer Hugh Chen <hughchen@google.com> Tue Nov 03 11:02:38 2020 +0800
tree cb72cb3aa18860a1a035f8a496486e4cdb5fa46d
parent cd4ca97828955364bebc5c08d7898192720b9b6b

Fix crash on "Connection preferences"

This CL adds a null check condition to avoid crash for
some device not support PrintManager.

Bug: 159848003
Test: make -j42 SettingsGoogle
Change-Id: Ic6c4c17bb563458f4f5a61dc0d93ae22b05f8763

src/com/android/settings/print/PrintSettingPreferenceController.java

diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java
index 16c4320..c0adfa3 100644
--- a/src/com/android/settings/print/PrintSettingPreferenceController.java
+++ b/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -60,6 +60,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING)
+                && mPrintManager != null
                 ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
@@ -71,12 +72,16 @@
 
     @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

tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
index 69db28f..e24eb8f 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
@@ -19,14 +19,19 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.print.PrintJob;
 import android.print.PrintJobInfo;
@@ -61,6 +66,8 @@
     private UserManager mUserManager;
     @Mock
     private RestrictedPreference mPreference;
+    @Mock
+    private PackageManager mPackageManager;
 
     private Context mContext;
     private PrintSettingPreferenceController mController;
@@ -77,6 +84,7 @@
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         ReflectionHelpers.setField(mController, "mPrintManager", mPrintManager);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
         mLifecycle.addObserver(mController);
     }
 
@@ -90,6 +98,17 @@
     }
 
     @Test
+    public void onStartStop_printManagerIsNull_doNothing() {
+        ReflectionHelpers.setField(mController, "mPrintManager", null);
+
+        mLifecycle.handleLifecycleEvent(ON_START);
+        mLifecycle.handleLifecycleEvent(ON_STOP);
+
+        verify(mPrintManager, never()).addPrintJobStateChangeListener(mController);
+        verify(mPrintManager, never()).removePrintJobStateChangeListener(mController);
+    }
+
+    @Test
     public void updateState_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
         final List<PrintJob> printJobs = new ArrayList<>();
         final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
@@ -133,4 +152,29 @@
         mController.updateState(mPreference);
         verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_PRINTING);
     }
+
+    @Test
+    public void getAvailabilityStatus_hasFeature_returnsAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noFeature_returnsUnsupported() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_printManagerIsNull_returnsUnsupported() {
+        ReflectionHelpers.setField(mController, "mPrintManager", null);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
 }