diff options
| author | Diego Perez <diegoperez@google.com> | 2015-08-04 13:23:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-08-04 13:23:58 +0000 |
| commit | 566a6095578766caecd13d637cc15831f278ac22 (patch) | |
| tree | 87f99e6fb9c083df5ca024007e66926a24624320 /android | |
| parent | 9ab040594f7522c25ce55f161db2a550686ccb16 (diff) | |
| parent | e1b87b9289aa9080c9a5b78b539768fd9bee9df2 (diff) | |
| download | idea-566a6095578766caecd13d637cc15831f278ac22.tar.gz | |
Merge "Avoid crash in new SDK preview" into studio-1.4-dev automerge: 94cb585
automerge: e1b87b9
* commit 'e1b87b9289aa9080c9a5b78b539768fd9bee9df2':
Avoid crash in new SDK preview
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/com/android/tools/swing/layoutlib/GraphicsLayoutRenderer.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android/src/com/android/tools/swing/layoutlib/GraphicsLayoutRenderer.java b/android/src/com/android/tools/swing/layoutlib/GraphicsLayoutRenderer.java index f1566827e34..01ed0570518 100644 --- a/android/src/com/android/tools/swing/layoutlib/GraphicsLayoutRenderer.java +++ b/android/src/com/android/tools/swing/layoutlib/GraphicsLayoutRenderer.java @@ -188,6 +188,8 @@ public class GraphicsLayoutRenderer { logger, target instanceof CompatibilityRenderTarget ? target.getVersion().getApiLevel() : 0); params.setForceNoDecor(); params.setAssetRepository(new AssetRepositoryImpl(facet)); + // The App Label needs to be not null + params.setAppLabel(""); RenderSecurityManager mySecurityManager = RenderSecurityManagerFactory.create(module, platform); return new GraphicsLayoutRenderer(layoutLib, params, mySecurityManager, hardwareConfig, resourceLookupChain, credential); |