Loading quickstep/src/com/android/quickstep/InstantAppResolverImpl.java +1 −26 Original line number Original line Diff line number Diff line Loading @@ -19,16 +19,11 @@ package com.android.quickstep; import android.content.ComponentName; import android.content.ComponentName; import android.content.Context; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo; import android.content.pm.InstantAppInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager; import android.util.Log; import com.android.launcher3.AppInfo; import com.android.launcher3.AppInfo; import com.android.launcher3.util.InstantAppResolver; import com.android.launcher3.util.InstantAppResolver; import java.util.ArrayList; import java.util.List; /** /** * Implementation of InstantAppResolver using platform APIs * Implementation of InstantAppResolver using platform APIs */ */ Loading @@ -40,8 +35,7 @@ public class InstantAppResolverImpl extends InstantAppResolver { private final PackageManager mPM; private final PackageManager mPM; public InstantAppResolverImpl(Context context) public InstantAppResolverImpl(Context context) { throws NoSuchMethodException, ClassNotFoundException { mPM = context.getPackageManager(); mPM = context.getPackageManager(); } } Loading @@ -55,23 +49,4 @@ public class InstantAppResolverImpl extends InstantAppResolver { ComponentName cn = info.getTargetComponent(); ComponentName cn = info.getTargetComponent(); return cn != null && cn.getClassName().equals(COMPONENT_CLASS_MARKER); return cn != null && cn.getClassName().equals(COMPONENT_CLASS_MARKER); } } @Override public List<ApplicationInfo> getInstantApps() { try { List<ApplicationInfo> result = new ArrayList<>(); for (InstantAppInfo iai : mPM.getInstantApps()) { ApplicationInfo info = iai.getApplicationInfo(); if (info != null) { result.add(info); } } return result; } catch (SecurityException se) { Log.w(TAG, "getInstantApps failed. Launcher may not be the default home app.", se); } catch (Exception e) { Log.e(TAG, "Error calling API: getInstantApps", e); } return super.getInstantApps(); } } } src/com/android/launcher3/util/InstantAppResolver.java +0 −7 Original line number Original line Diff line number Diff line Loading @@ -24,9 +24,6 @@ import android.util.Log; import com.android.launcher3.AppInfo; import com.android.launcher3.AppInfo; import com.android.launcher3.R; import com.android.launcher3.R; import java.util.Collections; import java.util.List; /** /** * A wrapper class to access instant app related APIs. * A wrapper class to access instant app related APIs. */ */ Loading Loading @@ -55,8 +52,4 @@ public class InstantAppResolver implements ResourceBasedOverride { } } return false; return false; } } public List<ApplicationInfo> getInstantApps() { return Collections.emptyList(); } } } Loading
quickstep/src/com/android/quickstep/InstantAppResolverImpl.java +1 −26 Original line number Original line Diff line number Diff line Loading @@ -19,16 +19,11 @@ package com.android.quickstep; import android.content.ComponentName; import android.content.ComponentName; import android.content.Context; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo; import android.content.pm.InstantAppInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager; import android.util.Log; import com.android.launcher3.AppInfo; import com.android.launcher3.AppInfo; import com.android.launcher3.util.InstantAppResolver; import com.android.launcher3.util.InstantAppResolver; import java.util.ArrayList; import java.util.List; /** /** * Implementation of InstantAppResolver using platform APIs * Implementation of InstantAppResolver using platform APIs */ */ Loading @@ -40,8 +35,7 @@ public class InstantAppResolverImpl extends InstantAppResolver { private final PackageManager mPM; private final PackageManager mPM; public InstantAppResolverImpl(Context context) public InstantAppResolverImpl(Context context) { throws NoSuchMethodException, ClassNotFoundException { mPM = context.getPackageManager(); mPM = context.getPackageManager(); } } Loading @@ -55,23 +49,4 @@ public class InstantAppResolverImpl extends InstantAppResolver { ComponentName cn = info.getTargetComponent(); ComponentName cn = info.getTargetComponent(); return cn != null && cn.getClassName().equals(COMPONENT_CLASS_MARKER); return cn != null && cn.getClassName().equals(COMPONENT_CLASS_MARKER); } } @Override public List<ApplicationInfo> getInstantApps() { try { List<ApplicationInfo> result = new ArrayList<>(); for (InstantAppInfo iai : mPM.getInstantApps()) { ApplicationInfo info = iai.getApplicationInfo(); if (info != null) { result.add(info); } } return result; } catch (SecurityException se) { Log.w(TAG, "getInstantApps failed. Launcher may not be the default home app.", se); } catch (Exception e) { Log.e(TAG, "Error calling API: getInstantApps", e); } return super.getInstantApps(); } } }
src/com/android/launcher3/util/InstantAppResolver.java +0 −7 Original line number Original line Diff line number Diff line Loading @@ -24,9 +24,6 @@ import android.util.Log; import com.android.launcher3.AppInfo; import com.android.launcher3.AppInfo; import com.android.launcher3.R; import com.android.launcher3.R; import java.util.Collections; import java.util.List; /** /** * A wrapper class to access instant app related APIs. * A wrapper class to access instant app related APIs. */ */ Loading Loading @@ -55,8 +52,4 @@ public class InstantAppResolver implements ResourceBasedOverride { } } return false; return false; } } public List<ApplicationInfo> getInstantApps() { return Collections.emptyList(); } } }