diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-10-20 11:07:38 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-10-20 11:12:53 -0700 |
| commit | b69ec7708b61535355d278ac0ea8f9a61540d1fb (patch) | |
| tree | ee8a7843b5c05e75d5b02116cd8173336584930b /tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java | |
| parent | 908a4f9a4372a9627e821b5800936095b0f0b5b0 (diff) | |
| download | frameworks_base-b69ec7708b61535355d278ac0ea8f9a61540d1fb.zip frameworks_base-b69ec7708b61535355d278ac0ea8f9a61540d1fb.tar.gz frameworks_base-b69ec7708b61535355d278ac0ea8f9a61540d1fb.tar.bz2 | |
Check Bridge init before disposing.
In some cases ADT may dispose the Bridge even before init is called on
it. This caused an NPE. Fixed this by checking for the initialization
before disposing resources.
Bug: http://b.android.com/77726
Change-Id: I741d6ea3595a3b7cb816abd0417f23aecca6370e
Diffstat (limited to 'tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java')
| -rw-r--r-- | tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java index bef5181..4993262 100644 --- a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java @@ -213,6 +213,10 @@ public class FontFamily_Delegate { return null; } + @Nullable + /*package*/ static String getFontLocation() { + return sFontLocation; + } // ---- native methods ---- |