Merge "NPE check in the SyncStateContract BUG:5196483" (37f8b51b) · Commits · e / os / android_frameworks_base

core/java/android/provider/SyncStateContract.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,12 @@ public class SyncStateContract {
		Account account) throws RemoteException {
		Cursor c = provider.query(uri, DATA_PROJECTION, SELECT_BY_ACCOUNT,
		new String[]{account.name, account.type}, null);

		// Unable to query the provider
		if (c == null) {
		throw new RemoteException();
		}

		try {
		if (c.moveToNext()) {
		return c.getBlob(c.getColumnIndexOrThrow(Columns.DATA));
		@@ -123,6 +129,11 @@ public class SyncStateContract {
		Account account) throws RemoteException {
		Cursor c = provider.query(uri, DATA_PROJECTION, SELECT_BY_ACCOUNT,
		new String[]{account.name, account.type}, null);

		if (c == null) {
		throw new RemoteException();
		}

		try {
		if (c.moveToNext()) {
		long rowId = c.getLong(1);