Merge "Fix negative size when size is greater than 2,147,483,647" into sc-dev am: 7725637ad8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021912 Change-Id: Ic670866dad4fd6916199c1a7ca147794708bdfa6
This commit is contained in:
@@ -122,7 +122,7 @@ public class StorageAsyncLoader
|
|||||||
UserHandle.of(userId));
|
UserHandle.of(userId));
|
||||||
} catch (NameNotFoundException e) {
|
} catch (NameNotFoundException e) {
|
||||||
Log.e(TAG, "Not able to get Context for user ID " + userId);
|
Log.e(TAG, "Not able to get Context for user ID " + userId);
|
||||||
return 0;
|
return 0L;
|
||||||
}
|
}
|
||||||
|
|
||||||
try (Cursor cursor = perUserContext.getContentResolver().query(
|
try (Cursor cursor = perUserContext.getContentResolver().query(
|
||||||
@@ -131,9 +131,9 @@ public class StorageAsyncLoader
|
|||||||
queryArgs,
|
queryArgs,
|
||||||
null /* cancellationSignal */)) {
|
null /* cancellationSignal */)) {
|
||||||
if (cursor == null) {
|
if (cursor == null) {
|
||||||
return 0;
|
return 0L;
|
||||||
}
|
}
|
||||||
return cursor.moveToFirst() ? cursor.getInt(0) : 0;
|
return cursor.moveToFirst() ? cursor.getLong(0) : 0L;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user