From 0df2b56095400076f0b48a2e6093e73e6dd491c7 Mon Sep 17 00:00:00 2001 From: atanasovg Date: Fri, 7 Aug 2015 17:14:29 +0300 Subject: [PATCH] Fix the way the default application label is retrieved. Check for invalid value. --- ui/action-bar/action-bar.android.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts index ed5b4a16f..628f48d64 100644 --- a/ui/action-bar/action-bar.android.ts +++ b/ui/action-bar/action-bar.android.ts @@ -182,8 +182,12 @@ export class ActionBar extends common.ActionBar { if (types.isDefined(title)) { actionBar.setTitle(title); } else { - var defaultLabel = application.android.nativeApp.getApplicationInfo().labelRes; - actionBar.setTitle(defaultLabel); + var appContext = application.android.context; + var appInfo = appContext.getApplicationInfo(); + var appLabel = appContext.getPackageManager().getApplicationLabel(appInfo); + if (appLabel) { + actionBar.setTitle(appLabel); + } } } }