summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/policy/GlobalActions.java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-05-07 21:19:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-07 21:19:59 +0000
commit6a8c79bb2b4b0c749e76dc3628ec5200efec4f40 (patch)
tree002d055790131d35f38e5a4d0ff68b198e6f1714 /services/core/java/com/android/server/policy/GlobalActions.java
parent6fc03e6523ee566ed278c3b64aa344ae95c8d824 (diff)
parente54d245b993e1347cb32c23a6bdc907a45fab324 (diff)
downloadframeworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.zip
frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.tar.gz
frameworks_base-6a8c79bb2b4b0c749e76dc3628ec5200efec4f40.tar.bz2
Merge "Improve keying for theme caches, rebase system theme on config change" into mnc-dev
Diffstat (limited to 'services/core/java/com/android/server/policy/GlobalActions.java')
-rw-r--r--services/core/java/com/android/server/policy/GlobalActions.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java
index b431b33..3cee927 100644
--- a/services/core/java/com/android/server/policy/GlobalActions.java
+++ b/services/core/java/com/android/server/policy/GlobalActions.java
@@ -1138,7 +1138,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
public GlobalActionsDialog(Context context, AlertParams params) {
super(context, getDialogTheme(context));
- mContext = context;
+ mContext = getContext();
mAlert = new AlertController(mContext, this, getWindow());
mAdapter = (MyAdapter) params.mAdapter;
mWindowTouchSlop = ViewConfiguration.get(context).getScaledWindowTouchSlop();