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

Commit 2a376723 authored by Fan Zhang's avatar Fan Zhang
Browse files

Fix a NPE when clicking encryption interstitial header 

Pref tree handler cannot assume preference has non-null key.

Change-Id: I790e75f3b4c888e2a48b297bea89cda0b8dbaabd
Fix: 35855587
Test: runtest --path tests/app/src/com/android/settings/EncryptionInterstitialTest.java
parent 64fee1cf

res/layout/encryption_interstitial_header.xml

+3 −1
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ 
    limitations under the License.

-->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

<TextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/encryption_interstitial_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center_vertical"

src/com/android/settings/EncryptionInterstitial.java

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ public class EncryptionInterstitial extends SettingsActivity { 
        @Override

        public boolean onPreferenceTreeClick(Preference preference) {

            final String key = preference.getKey();

            if (key == null) {

                return super.onPreferenceTreeClick(preference);

            }

            if (key.equals(KEY_ENCRYPT_REQUIRE_PASSWORD)) {

                final boolean accEn = AccessibilityManager.getInstance(getActivity()).isEnabled();

                if (accEn && !mPasswordRequired) {

tests/app/src/com/android/settings/EncryptionInterstitialTest.java

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings;



import android.app.Instrumentation;

import android.content.Context;

import android.content.Intent;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;



import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.matcher.ViewMatchers.withId;



@RunWith(AndroidJUnit4.class)

@SmallTest

public class EncryptionInterstitialTest {



    private Instrumentation mInstrumentation;

    private Context mContext;



    @Before

    public void setUp() {

        mInstrumentation = InstrumentationRegistry.getInstrumentation();

        mContext = mInstrumentation.getTargetContext();

    }



    @Test

    public void clickHeader_shouldNotCrash() {

        mInstrumentation.startActivitySync(

                new Intent().setClassName(mContext, EncryptionInterstitial.class.getName()));

        onView(withId(R.id.encryption_interstitial_header));

        // Nothing should happen

    }

}