PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Surround shortcut API calls with try-catch." into ub-launcher3-calgary

Browse Source
This commit is contained in:
Tony Wickham
2016-06-27 20:43:14 +00:00
committed by Android (Google) Code Review
parent 136a822e02 acd86ff486
commit f50b3cb3cb
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherModel.java
+1 -4
View File
@@ -1932,10 +1932,7 @@ public class LauncherModel extends BroadcastReceiver
List<ShortcutInfoCompat> fullDetails = mDeepShortcutManager List<ShortcutInfoCompat> fullDetails = mDeepShortcutManager
.queryForFullDetails(packageName, .queryForFullDetails(packageName,
Collections.singletonList(shortcutId), user); Collections.singletonList(shortcutId), user);
if (fullDetails == null || fullDetails.isEmpty()) { if (fullDetails != null && !fullDetails.isEmpty()) {
itemsToRemove.add(id);
continue;
} else {
pinnedShortcut = fullDetails.get(0); pinnedShortcut = fullDetails.get(0);
shouldPin = true; shouldPin = true;
} }
src/com/android/launcher3/shortcuts/DeepShortcutManager.java
+33 -8
View File
@@ -25,6 +25,7 @@ import android.content.pm.ShortcutInfo;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import com.android.launcher3.Utilities; import com.android.launcher3.Utilities;
import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserHandleCompat;
@@ -37,6 +38,7 @@ import java.util.List;
* Performs operations related to deep shortcuts, such as querying for them, pinning them, etc. * Performs operations related to deep shortcuts, such as querying for them, pinning them, etc.
*/ */
public class DeepShortcutManager { public class DeepShortcutManager {
private static final String TAG = "DeepShortcutManager";
// TODO: Replace this with platform constants when the new sdk is available. // TODO: Replace this with platform constants when the new sdk is available.
public static final int FLAG_MATCH_DYNAMIC = 1 << 0; public static final int FLAG_MATCH_DYNAMIC = 1 << 0;
@@ -87,7 +89,11 @@ public class DeepShortcutManager {
UserHandleCompat user = key.user; UserHandleCompat user = key.user;
List<String> pinnedIds = extractIds(queryForPinnedShortcuts(packageName, user)); List<String> pinnedIds = extractIds(queryForPinnedShortcuts(packageName, user));
pinnedIds.remove(id); pinnedIds.remove(id);
mLauncherApps.pinShortcuts(packageName, pinnedIds, user.getUser()); try {
mLauncherApps.pinShortcuts(packageName, pinnedIds, user.getUser());
} catch (SecurityException e) {
Log.e(TAG, Log.getStackTraceString(e));
}
} }
} }
@@ -103,7 +109,11 @@ public class DeepShortcutManager {
UserHandleCompat user = key.user; UserHandleCompat user = key.user;
List<String> pinnedIds = extractIds(queryForPinnedShortcuts(packageName, user)); List<String> pinnedIds = extractIds(queryForPinnedShortcuts(packageName, user));
pinnedIds.add(id); pinnedIds.add(id);
mLauncherApps.pinShortcuts(packageName, pinnedIds, user.getUser()); try {
mLauncherApps.pinShortcuts(packageName, pinnedIds, user.getUser());
} catch (SecurityException e) {
Log.e(TAG, Log.getStackTraceString(e));
}
} }
} }
@@ -111,16 +121,26 @@ public class DeepShortcutManager {
public void startShortcut(String packageName, String id, Rect sourceBounds, public void startShortcut(String packageName, String id, Rect sourceBounds,
Bundle startActivityOptions, UserHandleCompat user) { Bundle startActivityOptions, UserHandleCompat user) {
if (Utilities.isNycMR1OrAbove()) { if (Utilities.isNycMR1OrAbove()) {
mLauncherApps.startShortcut(packageName, id, sourceBounds, try {
startActivityOptions, user.getUser()); mLauncherApps.startShortcut(packageName, id, sourceBounds,
startActivityOptions, user.getUser());
} catch (SecurityException e) {
Log.e(TAG, Log.getStackTraceString(e));
}
} }
} }
@TargetApi(25) @TargetApi(25)
public Drawable getShortcutIconDrawable(ShortcutInfoCompat shortcutInfo, int density) { public Drawable getShortcutIconDrawable(ShortcutInfoCompat shortcutInfo, int density) {
return Utilities.isNycMR1OrAbove() if (Utilities.isNycMR1OrAbove()) {
? mLauncherApps.getShortcutIconDrawable(shortcutInfo.getShortcutInfo(), density) try {
: null; return mLauncherApps.getShortcutIconDrawable(shortcutInfo.getShortcutInfo(),
density);
} catch (SecurityException e) {
Log.e(TAG, Log.getStackTraceString(e));
}
}
return null;
} }
/** /**
@@ -162,7 +182,12 @@ public class DeepShortcutManager {
q.setActivity(activity); q.setActivity(activity);
q.setShortcutIds(shortcutIds); q.setShortcutIds(shortcutIds);
} }
List<ShortcutInfo> shortcutInfos = mLauncherApps.getShortcuts(q, user.getUser()); List<ShortcutInfo> shortcutInfos = null;
try {
shortcutInfos = mLauncherApps.getShortcuts(q, user.getUser());
} catch (SecurityException e) {
Log.e(TAG, Log.getStackTraceString(e));
}
if (shortcutInfos == null) { if (shortcutInfos == null) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }