Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a26df737 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix null pointer exception when surveys are turned off"

parents 86c492ff d7fe1fb9

src/com/android/settings/overlay/SurveyFeatureProvider.java

+8 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.IntentFilter;

import android.support.annotation.Nullable;

import android.support.v4.content.LocalBroadcastManager;



/**

 * An interface for classes wishing to provide the ability to serve surveys to implement.
@@ -81,5 +82,11 @@ public interface SurveyFeatureProvider { 
     * after a call to {@link #createAndRegisterReceiver(Activity)}.

     * @param activity The activity that was used to register the BroadcastReceiver.

     */

    void unregisterReceiver(Activity activity, BroadcastReceiver receiver);

    static void unregisterReceiver(Activity activity, BroadcastReceiver receiver) {

        if (activity == null) {

            throw new IllegalStateException("Cannot unregister receiver if activity is null");

        }



        LocalBroadcastManager.getInstance(activity).unregisterReceiver(receiver);

    }

}

src/com/android/settings/survey/SurveyMixin.java

+2 −3
Original line number Diff line number Diff line
@@ -74,9 +74,8 @@ public class SurveyMixin implements LifecycleObserver, OnResume, OnPause { 
    public void onPause() {

        Activity activity = mFragment.getActivity();

        if (mReceiver != null && activity != null) {

            SurveyFeatureProvider provider =

                    FeatureFactory.getFactory(activity).getSurveyFeatureProvider(activity);

            provider.unregisterReceiver(activity, mReceiver);

            SurveyFeatureProvider.unregisterReceiver(activity, mReceiver);

            mReceiver = null;

        }

    }

}

tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java

+15 −5
Original line number Diff line number Diff line 
package com.android.settings.survey;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.never;
@@ -11,11 +12,15 @@ import static org.mockito.Mockito.when; 
import android.app.Activity;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.IntentFilter;

import android.support.v4.content.LocalBroadcastManager;

import com.android.settings.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.overlay.SurveyFeatureProvider;

import com.android.settings.testutils.FakeFeatureFactory;

import java.util.ArrayList;

import java.util.HashMap;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -24,6 +29,7 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.Robolectric;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -102,7 +108,7 @@ public class SurveyMixinTest { 
    }



    @Test

    public void onPause_removesReceiverWhenInstantiated() {

    public void onPause_removesReceiverIfPreviouslySet() {

        // Pretend there is a survey in memory

        when(mProvider.getSurveyExpirationDate(any(), any())).thenReturn(-1L);
@@ -110,12 +116,16 @@ public class SurveyMixinTest { 
        Activity temp = Robolectric.setupActivity(Activity.class);

        when(mFragment.getActivity()).thenReturn(temp);

        when(mProvider.createAndRegisterReceiver(any())).thenReturn(mReceiver);

        LocalBroadcastManager manager = LocalBroadcastManager.getInstance(temp);

        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);

        mixin.onResume();

        manager.registerReceiver(mReceiver, new IntentFilter());

        mixin.onPause();



        // Verify we remove the receiver

        verify(mProvider, times(1)).unregisterReceiver(any(), any());

        HashMap<BroadcastReceiver, ArrayList<IntentFilter>> map =

                ReflectionHelpers.getField(manager, "mReceivers");

        assertThat(map.containsKey(mReceiver)).isFalse();

    }



    @Test
@@ -129,15 +139,15 @@ public class SurveyMixinTest { 
        SurveyMixin mixin = new SurveyMixin(mFragment, FAKE_KEY);

        mixin.onPause();



        // Verify we do nothing

        verify(mProvider, never()).unregisterReceiver(any(), any());

        // Verify we do nothing;

        verify(mProvider, never()).showSurveyIfAvailable(any(), any());



        // pretend the activity died before onPause

        when(mFragment.getActivity()).thenReturn(null);

        mixin.onPause();



        // Verify we do nothing

        verify(mProvider, never()).unregisterReceiver(any(), any());

        verify(mProvider, never()).showSurveyIfAvailable(any(), any());

    }



}