Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea944

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391

Change-Id: I348d56bbb37c23f6ab02cfeef6011fb5b5b8ed5d
This commit is contained in:
Arc Wang
2021-06-24 03:35:00 +00:00
committed by Automerger Merge Worker

View File

@@ -368,7 +368,12 @@ public class AppStorageSettings extends AppInfoWithHeader
}
ActivityManager am = (ActivityManager)
getActivity().getSystemService(Context.ACTIVITY_SERVICE);
boolean res = am.clearApplicationUserData(packageName, mClearDataObserver);
boolean res = false;
try {
res = am.clearApplicationUserData(packageName, mClearDataObserver);
} catch (SecurityException e) {
Log.i(TAG, "Failed to clear application user data: " + e);
}
if (!res) {
// Clearing data failed for some obscure reason. Just log error for now
Log.i(TAG, "Couldn't clear application user data for package:" + packageName);