diff options
author | Amith Yamasani <yamasani@google.com> | 2012-10-07 23:41:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-07 23:41:13 -0700 |
commit | 45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741 (patch) | |
tree | bee75f7680e91d2eaf6853d90a104c85d956d7d5 /services | |
parent | 5fd8cd3e1981ae248ad609a17f88df4b4fd4a159 (diff) | |
parent | 1409c99f8b64adcedf30b8709a22dbb257710f94 (diff) | |
download | frameworks_base-45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741.zip frameworks_base-45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741.tar.gz frameworks_base-45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741.tar.bz2 |
am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev
* commit '1409c99f8b64adcedf30b8709a22dbb257710f94':
Fix resource reading for secondary users
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/am/AppErrorDialog.java | 1 | ||||
-rw-r--r-- | services/java/com/android/server/am/AppNotRespondingDialog.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/services/java/com/android/server/am/AppErrorDialog.java b/services/java/com/android/server/am/AppErrorDialog.java index a9c77fc..ffa1e92 100644 --- a/services/java/com/android/server/am/AppErrorDialog.java +++ b/services/java/com/android/server/am/AppErrorDialog.java @@ -75,6 +75,7 @@ class AppErrorDialog extends BaseErrorDialog { getWindow().addFlags(FLAG_SYSTEM_ERROR); WindowManager.LayoutParams attrs = getWindow().getAttributes(); attrs.setTitle("Application Error: " + app.info.processName); + attrs.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; getWindow().setAttributes(attrs); if (app.persistent) { getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ERROR); diff --git a/services/java/com/android/server/am/AppNotRespondingDialog.java b/services/java/com/android/server/am/AppNotRespondingDialog.java index 58e533b..af61c9b 100644 --- a/services/java/com/android/server/am/AppNotRespondingDialog.java +++ b/services/java/com/android/server/am/AppNotRespondingDialog.java @@ -97,6 +97,7 @@ class AppNotRespondingDialog extends BaseErrorDialog { getWindow().addFlags(FLAG_SYSTEM_ERROR); WindowManager.LayoutParams attrs = getWindow().getAttributes(); attrs.setTitle("Application Not Responding: " + app.info.processName); + attrs.privateFlags = WindowManager.LayoutParams.PRIVATE_FLAG_SHOW_FOR_ALL_USERS; getWindow().setAttributes(attrs); } |