Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PeopleSpaceWidgetManager: log exceptions" into tm-dev

Browse Source
This commit is contained in:
Julia Tuttle
2022-04-05 21:05:57 +00:00
committed by Android (Google) Code Review
parent b6e4780466 e0876efb83
commit b497365a27
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
View File

@@ -466,7 +466,7 @@ public class PeopleSpaceUtils {
} }
} }
} catch (SQLException e) { } catch (SQLException e) {
Log.e(TAG, "Failed to query contact: " + e); Log.e(TAG, "Failed to query contact", e);
} finally { } finally {
if (cursor != null) { if (cursor != null) {
cursor.close(); cursor.close();
@@ -527,7 +527,7 @@ public class PeopleSpaceUtils {
lookupKeysWithBirthdaysToday.add(lookupKey); lookupKeysWithBirthdaysToday.add(lookupKey);
} }
} catch (SQLException e) { } catch (SQLException e) {
Log.e(TAG, "Failed to query birthdays: " + e); Log.e(TAG, "Failed to query birthdays", e);
} finally { } finally {
if (cursor != null) { if (cursor != null) {
cursor.close(); cursor.close();

24
packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java
View File

@@ -275,7 +275,7 @@ public class PeopleSpaceWidgetManager {
updateSingleConversationWidgets(widgetIds); updateSingleConversationWidgets(widgetIds);
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Exception: " + e); Log.e(TAG, "failed to update widgets", e);
} }
} }
@@ -348,7 +348,7 @@ public class PeopleSpaceWidgetManager {
try { try {
return getTileForExistingWidgetThrowing(appWidgetId); return getTileForExistingWidgetThrowing(appWidgetId);
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Failed to retrieve conversation for tile: " + e); Log.e(TAG, "failed to retrieve tile for widget ID " + appWidgetId, e);
return null; return null;
} }
} }
@@ -423,7 +423,7 @@ public class PeopleSpaceWidgetManager {
// Add current state. // Add current state.
return getTileWithCurrentState(storedTile.build(), ACTION_BOOT_COMPLETED); return getTileWithCurrentState(storedTile.build(), ACTION_BOOT_COMPLETED);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Could not retrieve data: " + e); Log.e(TAG, "getTileFromPersistentStorage failing", e);
return null; return null;
} }
} }
@@ -476,7 +476,7 @@ public class PeopleSpaceWidgetManager {
updateWidgetIdsBasedOnNotifications(tilesUpdated, notifications); updateWidgetIdsBasedOnNotifications(tilesUpdated, notifications);
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Throwing exception: " + e); Log.e(TAG, "updateWidgetsWithNotificationChangedInBackground failing", e);
} }
} }
@@ -499,7 +499,7 @@ public class PeopleSpaceWidgetManager {
id -> getAugmentedTileForExistingWidget(id, groupedNotifications))) id -> getAugmentedTileForExistingWidget(id, groupedNotifications)))
.forEach((id, tile) -> updateAppWidgetOptionsAndViewOptional(id, tile)); .forEach((id, tile) -> updateAppWidgetOptionsAndViewOptional(id, tile));
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Exception updating widgets: " + e); Log.e(TAG, "updateWidgetIdsBasedOnNotifications failing", e);
} }
} }
@@ -851,7 +851,7 @@ public class PeopleSpaceWidgetManager {
Collections.singletonList(tile.getId()), Collections.singletonList(tile.getId()),
tile.getUserHandle(), LauncherApps.FLAG_CACHE_PEOPLE_TILE_SHORTCUTS); tile.getUserHandle(), LauncherApps.FLAG_CACHE_PEOPLE_TILE_SHORTCUTS);
} catch (Exception e) { } catch (Exception e) {
Log.w(TAG, "Exception caching shortcut:" + e); Log.w(TAG, "failed to cache shortcut", e);
} }
PeopleSpaceTile finalTile = tile; PeopleSpaceTile finalTile = tile;
mBgExecutor.execute( mBgExecutor.execute(
@@ -959,7 +959,7 @@ public class PeopleSpaceWidgetManager {
UserHandle.of(key.getUserId()), UserHandle.of(key.getUserId()),
LauncherApps.FLAG_CACHE_PEOPLE_TILE_SHORTCUTS); LauncherApps.FLAG_CACHE_PEOPLE_TILE_SHORTCUTS);
} catch (Exception e) { } catch (Exception e) {
Log.d(TAG, "Exception uncaching shortcut:" + e); Log.d(TAG, "failed to uncache shortcut", e);
} }
} }
@@ -1042,7 +1042,7 @@ public class PeopleSpaceWidgetManager {
packageName, userHandle.getIdentifier(), shortcutId); packageName, userHandle.getIdentifier(), shortcutId);
tile = PeopleSpaceUtils.getTile(channel, mLauncherApps); tile = PeopleSpaceUtils.getTile(channel, mLauncherApps);
} catch (Exception e) { } catch (Exception e) {
Log.w(TAG, "Exception getting tiles: " + e); Log.w(TAG, "failed to get conversation or tile", e);
return null; return null;
} }
if (tile == null) { if (tile == null) {
@@ -1091,7 +1091,7 @@ public class PeopleSpaceWidgetManager {
} }
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
// Delete data for uninstalled widgets. // Delete data for uninstalled widgets.
Log.e(TAG, "Package no longer found for tile: " + e); Log.e(TAG, "package no longer found for tile", e);
JobScheduler jobScheduler = mContext.getSystemService(JobScheduler.class); JobScheduler jobScheduler = mContext.getSystemService(JobScheduler.class);
if (jobScheduler != null if (jobScheduler != null
&& jobScheduler.getPendingJob(PeopleBackupFollowUpJob.JOB_ID) != null) { && jobScheduler.getPendingJob(PeopleBackupFollowUpJob.JOB_ID) != null) {
@@ -1301,7 +1301,7 @@ public class PeopleSpaceWidgetManager {
try { try {
editor.putString(newId, (String) entry.getValue()); editor.putString(newId, (String) entry.getValue());
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Malformed entry value: " + entry.getValue()); Log.e(TAG, "malformed entry value: " + entry.getValue(), e);
} }
editor.remove(key); editor.remove(key);
break; break;
@@ -1311,7 +1311,7 @@ public class PeopleSpaceWidgetManager {
try { try {
oldWidgetIds = (Set<String>) entry.getValue(); oldWidgetIds = (Set<String>) entry.getValue();
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Malformed entry value: " + entry.getValue()); Log.e(TAG, "malformed entry value: " + entry.getValue(), e);
editor.remove(key); editor.remove(key);
break; break;
} }
@@ -1342,7 +1342,7 @@ public class PeopleSpaceWidgetManager {
try { try {
oldWidgetIds = (Set<String>) entry.getValue(); oldWidgetIds = (Set<String>) entry.getValue();
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Malformed entry value: " + entry.getValue()); Log.e(TAG, "malformed entry value: " + entry.getValue(), e);
followUpEditor.remove(key); followUpEditor.remove(key);
continue; continue;
} }