diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-04-17 17:29:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-17 17:29:00 +0000 |
| commit | 20141feb21ee64323c420d411d0d0d06fe30b4cc (patch) | |
| tree | 482bc316aff3ab43b1593c0b556c05bc97ae01a9 /src | |
| parent | 0e43493f8ff2f2b443043e12d952286c2cc5ea77 (diff) | |
| parent | 932f25ee1827c8edde023cf403831bfb07059baa (diff) | |
| download | android_packages_apps_Trebuchet-20141feb21ee64323c420d411d0d0d06fe30b4cc.tar.gz android_packages_apps_Trebuchet-20141feb21ee64323c420d411d0d0d06fe30b4cc.tar.bz2 android_packages_apps_Trebuchet-20141feb21ee64323c420d411d0d0d06fe30b4cc.zip | |
Merge "Updating getApplicationInfo to handle NameNotFoundException" into ub-launcher3-dorval
am: 932f25ee18
Change-Id: I126ce1c79ae58ee251d2f77e8aa8fd78c01f9d12
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/compat/LauncherAppsCompatVO.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVO.java b/src/com/android/launcher3/compat/LauncherAppsCompatVO.java index 95f2e74f4..d145539c7 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVO.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVO.java @@ -16,10 +16,12 @@ package com.android.launcher3.compat; +import android.annotation.TargetApi; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.LauncherActivityInfo; import android.content.pm.LauncherApps; +import android.content.pm.PackageManager; import android.os.Build; import android.os.Process; import android.os.UserHandle; @@ -33,6 +35,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; +@TargetApi(26) public class LauncherAppsCompatVO extends LauncherAppsCompatVL { LauncherAppsCompatVO(Context context) { @@ -41,9 +44,18 @@ public class LauncherAppsCompatVO extends LauncherAppsCompatVL { @Override public ApplicationInfo getApplicationInfo(String packageName, int flags, UserHandle user) { - ApplicationInfo info = mLauncherApps.getApplicationInfo(packageName, flags, user); - return info == null || (info.flags & ApplicationInfo.FLAG_INSTALLED) == 0 || !info.enabled - ? null : info; + try { + // TODO: Temporary workaround until the API signature is updated + if (false) { + throw new PackageManager.NameNotFoundException(); + } + + ApplicationInfo info = mLauncherApps.getApplicationInfo(packageName, flags, user); + return (info.flags & ApplicationInfo.FLAG_INSTALLED) == 0 || !info.enabled + ? null : info; + } catch (PackageManager.NameNotFoundException e) { + return null; + } } @Override |