diff options
| author | Craig Mautner <cmautner@google.com> | 2014-01-10 18:27:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-10 18:27:49 +0000 |
| commit | 5ab77ac4a539e2117425e2dffeff7a29b6bc03d6 (patch) | |
| tree | 39aaa07d3cc99a9cb79fbffedcc23e72bbb16c33 /core/java/android/app/ActivityThread.java | |
| parent | c9eff80ecac251f19af38b277760e960bbf1a655 (diff) | |
| parent | 96ada57b2c0c456e9d3a1f43e3ff691f14ec1459 (diff) | |
| download | frameworks_base-5ab77ac4a539e2117425e2dffeff7a29b6bc03d6.zip frameworks_base-5ab77ac4a539e2117425e2dffeff7a29b6bc03d6.tar.gz frameworks_base-5ab77ac4a539e2117425e2dffeff7a29b6bc03d6.tar.bz2 | |
am 96ada57b: Merge "Allow for the possibility of null ActivityContainer" into klp-modular-dev
* commit '96ada57b2c0c456e9d3a1f43e3ff691f14ec1459':
Allow for the possibility of null ActivityContainer
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 94ebff9..5239cc6 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -2235,7 +2235,8 @@ public final class ActivityThread { try { IActivityContainer container = ActivityManagerNative.getDefault().getEnclosingActivityContainer(r.token); - final int displayId = container.getDisplayId(); + final int displayId = + container == null ? Display.DEFAULT_DISPLAY : container.getDisplayId(); if (displayId > Display.DEFAULT_DISPLAY) { Display display = dm.getRealDisplay(displayId, r.token); baseContext = appContext.createDisplayContext(display); |