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

Merge "Add more logging to confirm storage issue" into sc-dev

Browse Source
This commit is contained in:
Anna Zappone
2021-04-08 15:37:14 +00:00
committed by Android (Google) Code Review
parent d8e4ff38d4 8ebe79c94e
commit f461b422d5
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/people/java/com/android/server/people/data/DataManager.java
View File

@@ -63,6 +63,7 @@ import android.text.TextUtils;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet; import android.util.ArraySet;
import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
@@ -105,6 +106,7 @@ import java.util.function.Function;
public class DataManager { public class DataManager {
private static final String TAG = "DataManager"; private static final String TAG = "DataManager";
private static final boolean DEBUG = false;
private static final long RECENT_NOTIFICATIONS_MAX_AGE_MS = 10 * DateUtils.DAY_IN_MILLIS; private static final long RECENT_NOTIFICATIONS_MAX_AGE_MS = 10 * DateUtils.DAY_IN_MILLIS;
private static final long QUERY_EVENTS_MAX_AGE_MS = 5L * DateUtils.MINUTE_IN_MILLIS; private static final long QUERY_EVENTS_MAX_AGE_MS = 5L * DateUtils.MINUTE_IN_MILLIS;
@@ -217,6 +219,7 @@ public class DataManager {
List<ShortcutInfo> shortcuts = getShortcuts(packageName, userId, List<ShortcutInfo> shortcuts = getShortcuts(packageName, userId,
Collections.singletonList(shortcutId)); Collections.singletonList(shortcutId));
if (shortcuts != null && !shortcuts.isEmpty()) { if (shortcuts != null && !shortcuts.isEmpty()) {
if (DEBUG) Log.d(TAG, "Found shortcut for " + shortcuts.get(0).getLabel());
return shortcuts.get(0); return shortcuts.get(0);
} }
return null; return null;
@@ -258,6 +261,7 @@ public class DataManager {
} }
ShortcutInfo shortcutInfo = getShortcut(packageName, userId, shortcutId); ShortcutInfo shortcutInfo = getShortcut(packageName, userId, shortcutId);
if (shortcutInfo == null) { if (shortcutInfo == null) {
Slog.e(TAG, " Shortcut no longer found: " + shortcutId);
return null; return null;
} }
int uid = mPackageManagerInternal.getPackageUid(packageName, 0, userId); int uid = mPackageManagerInternal.getPackageUid(packageName, 0, userId);
@@ -705,6 +709,7 @@ public class DataManager {
} }
}); });
for (String packageName : packagesToDelete) { for (String packageName : packagesToDelete) {
if (DEBUG) Log.d(TAG, "Deleting packages data for: " + packageName);
userData.deletePackageData(packageName); userData.deletePackageData(packageName);
} }
} }
@@ -716,6 +721,7 @@ public class DataManager {
@ShortcutQuery.QueryFlags int queryFlags = ShortcutQuery.FLAG_MATCH_DYNAMIC @ShortcutQuery.QueryFlags int queryFlags = ShortcutQuery.FLAG_MATCH_DYNAMIC
| ShortcutQuery.FLAG_MATCH_PINNED | ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER | ShortcutQuery.FLAG_MATCH_PINNED | ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER
| ShortcutQuery.FLAG_MATCH_CACHED | ShortcutQuery.FLAG_GET_PERSONS_DATA; | ShortcutQuery.FLAG_MATCH_CACHED | ShortcutQuery.FLAG_GET_PERSONS_DATA;
if (DEBUG) Log.d(TAG, " Get shortcuts with IDs: " + shortcutIds);
return mShortcutServiceInternal.getShortcuts( return mShortcutServiceInternal.getShortcuts(
UserHandle.USER_SYSTEM, mContext.getPackageName(), UserHandle.USER_SYSTEM, mContext.getPackageName(),
/*changedSince=*/ 0, packageName, shortcutIds, /*locusIds=*/ null, /*changedSince=*/ 0, packageName, shortcutIds, /*locusIds=*/ null,
@@ -742,7 +748,7 @@ public class DataManager {
TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class); TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
String defaultDialer = telecomManager != null String defaultDialer = telecomManager != null
? telecomManager.getDefaultDialerPackage( ? telecomManager.getDefaultDialerPackage(
new UserHandle(userData.getUserId())) : null; new UserHandle(userData.getUserId())) : null;
userData.setDefaultDialer(defaultDialer); userData.setDefaultDialer(defaultDialer);
} }
@@ -848,6 +854,9 @@ public class DataManager {
ConversationStore conversationStore = packageData.getConversationStore(); ConversationStore conversationStore = packageData.getConversationStore();
ConversationInfo oldConversationInfo = ConversationInfo oldConversationInfo =
conversationStore.getConversation(shortcutInfo.getId()); conversationStore.getConversation(shortcutInfo.getId());
if (oldConversationInfo == null) {
if (DEBUG) Log.d(TAG, "Nothing previously stored about conversation.");
}
ConversationInfo.Builder builder = oldConversationInfo != null ConversationInfo.Builder builder = oldConversationInfo != null
? new ConversationInfo.Builder(oldConversationInfo) ? new ConversationInfo.Builder(oldConversationInfo)
: new ConversationInfo.Builder(); : new ConversationInfo.Builder();
@@ -1083,6 +1092,7 @@ public class DataManager {
Set<String> shortcutIds = new HashSet<>(); Set<String> shortcutIds = new HashSet<>();
for (ShortcutInfo shortcutInfo : shortcuts) { for (ShortcutInfo shortcutInfo : shortcuts) {
if (packageData != null) { if (packageData != null) {
if (DEBUG) Log.d(TAG, "Deleting shortcut: " + shortcutInfo.getId());
packageData.deleteDataForConversation(shortcutInfo.getId()); packageData.deleteDataForConversation(shortcutInfo.getId());
} }
shortcutIds.add(shortcutInfo.getId()); shortcutIds.add(shortcutInfo.getId());
@@ -1309,6 +1319,7 @@ public class DataManager {
int userId = getChangingUserId(); int userId = getChangingUserId();
UserData userData = getUnlockedUserData(userId); UserData userData = getUnlockedUserData(userId);
if (userData != null) { if (userData != null) {
if (DEBUG) Log.d(TAG, "Delete package data for: " + packageName);
userData.deletePackageData(packageName); userData.deletePackageData(packageName);
} }
} }