aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Verifying the install shortcut intent before casting the extras to various object types" into ub-launcher3-burnaby-polish

Browse Source
This commit is contained in:
Sunny Goyal
2015-12-08 21:43:10 +00:00
committed by Android (Google) Code Review
parent 655daaed3e 7606a412c5
commit 06538a7784
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/com/android/launcher3/InstallShortcutReceiver.java
View File

@@ -144,29 +144,45 @@ public class InstallShortcutReceiver extends BroadcastReceiver {
if (!ACTION_INSTALL_SHORTCUT.equals(data.getAction())) {
return;
}
PendingInstallShortcutInfo info = new PendingInstallShortcutInfo(data, context);
if (info.launchIntent == null || info.label == null) {
if (DBG) Log.e(TAG, "Invalid install shortcut intent");
return;
PendingInstallShortcutInfo info = createPendingInfo(context, data);
if (info != null) {
queuePendingShortcutInfo(info, context);
}
info = convertToLauncherActivityIfPossible(info);
queuePendingShortcutInfo(info, context);
}
public static ShortcutInfo fromShortcutIntent(Context context, Intent data) {
/**
* @return true is the extra is either null or is of type {@param type}
*/
private static boolean isValidExtraType(Intent intent, String key, Class type) {
Object extra = intent.getParcelableExtra(key);
return extra == null || type.isInstance(extra);
}
/**
* Verifies the intent and creates a {@link PendingInstallShortcutInfo}
*/
private static PendingInstallShortcutInfo createPendingInfo(Context context, Intent data) {
if (!isValidExtraType(data, Intent.EXTRA_SHORTCUT_INTENT, Intent.class) ||
!(isValidExtraType(data, Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
Intent.ShortcutIconResource.class)) ||
!(isValidExtraType(data, Intent.EXTRA_SHORTCUT_ICON, Bitmap.class))) {
if (DBG) Log.e(TAG, "Invalid install shortcut intent");
return null;
}
PendingInstallShortcutInfo info = new PendingInstallShortcutInfo(data, context);
if (info.launchIntent == null || info.label == null) {
if (DBG) Log.e(TAG, "Invalid install shortcut intent");
return null;
}
info = convertToLauncherActivityIfPossible(info);
return info.getShortcutInfo();
return convertToLauncherActivityIfPossible(info);
}
static void queueInstallShortcut(LauncherActivityInfoCompat info, Context context) {
queuePendingShortcutInfo(new PendingInstallShortcutInfo(info, context), context);
public static ShortcutInfo fromShortcutIntent(Context context, Intent data) {
PendingInstallShortcutInfo info = createPendingInfo(context, data);
return info == null ? null : info.getShortcutInfo();
}
private static void queuePendingShortcutInfo(PendingInstallShortcutInfo info, Context context) {