diff options
author | Fan Zhang <zhfan@google.com> | 2016-10-31 12:45:49 -0700 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-11-01 11:00:57 -0700 |
commit | 819bbf1e649c2dfe823275cf531c5b4e5aa7cb26 (patch) | |
tree | 85f96b38c1ceffed468d192804558f7cfd73b953 | |
parent | fe319bc1cb478bdcdea652876372be78625adbc7 (diff) | |
download | packages_apps_Settings-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26.tar.gz packages_apps_Settings-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26.tar.bz2 packages_apps_Settings-819bbf1e649c2dfe823275cf531c5b4e5aa7cb26.zip |
Fix crash when opening account sync detail for external appandroid-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r6android-7.1.1_r43android-7.1.1_r41android-7.1.1_r4android-7.1.1_r39android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c31f3f9fa751647197b8b2ca5cdb0fb6)
(cherry picked from commit c9cdc25f4110a4e2224890f81f3be77c604ae536)
-rw-r--r-- | src/com/android/settings/accounts/AccountPreferenceBase.java | 5 | ||||
-rw-r--r-- | src/com/android/settings/utils/LocalClassLoaderContextThemeWrapper.java | 41 |
2 files changed, 44 insertions, 2 deletions
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java index 65d5887809..c6581ac525 100644 --- a/src/com/android/settings/accounts/AccountPreferenceBase.java +++ b/src/com/android/settings/accounts/AccountPreferenceBase.java @@ -33,10 +33,10 @@ import android.os.UserManager; import android.support.v7.preference.PreferenceScreen; import android.text.format.DateFormat; import android.util.Log; -import android.view.ContextThemeWrapper; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; +import com.android.settings.utils.LocalClassLoaderContextThemeWrapper; import com.android.settingslib.accounts.AuthenticatorHelper; import java.util.ArrayList; @@ -156,7 +156,8 @@ abstract class AccountPreferenceBase extends SettingsPreferenceFragment desc.packageName, 0, mUserHandle); final Theme baseTheme = getResources().newTheme(); baseTheme.applyStyle(com.android.settings.R.style.Theme_SettingsBase, true); - final Context themedCtx = new ContextThemeWrapper(targetCtx, 0); + final Context themedCtx = + new LocalClassLoaderContextThemeWrapper(getClass(), targetCtx, 0); themedCtx.getTheme().setTo(baseTheme); prefs = getPreferenceManager().inflateFromResource(themedCtx, desc.accountPreferencesId, parent); diff --git a/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapper.java b/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapper.java new file mode 100644 index 0000000000..2569b6b5df --- /dev/null +++ b/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapper.java @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2016 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.utils; + +import android.annotation.StyleRes; +import android.content.Context; +import android.view.ContextThemeWrapper; + +/** + * {@link ContextThemeWrapper} that provides a local classloader. This guarantees we have a + * valid {@link ClassLoader} when base context is from an external app. + */ +public class LocalClassLoaderContextThemeWrapper extends ContextThemeWrapper { + + private Class mLocalClass; + + public LocalClassLoaderContextThemeWrapper(Class clazz, Context base, + @StyleRes int themeResId) { + super(base, themeResId); + mLocalClass = clazz; + } + + @Override + public ClassLoader getClassLoader() { + return mLocalClass.getClassLoader(); + } +} |