diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-07 23:44:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-07 23:44:35 -0700 |
| commit | 1a8d0f7a946e23d09a497c72e54db7a422512dba (patch) | |
| tree | f4c09deb9d351b9d02fba7339895816fe3afbd4b /services | |
| parent | e45155297efa3b947056d9532e868e9f136c585a (diff) | |
| parent | 45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741 (diff) | |
| download | frameworks_base-1a8d0f7a946e23d09a497c72e54db7a422512dba.zip frameworks_base-1a8d0f7a946e23d09a497c72e54db7a422512dba.tar.gz frameworks_base-1a8d0f7a946e23d09a497c72e54db7a422512dba.tar.bz2 | |
am 45e3c4f0: am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev
* commit '45e3c4f0c75eafc1ee6d3fe97d42992eab6c3741':
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); } |