Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbf03e1e authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Fix FindBugs issues" into cm-10.1

parents 9d75c3ae 0fc6191c

core/java/android/accounts/ChooseAccountTypeActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ public class ChooseAccountTypeActivity extends Activity { 
                if (sequence != null) {

                    name = sequence.toString();

                }

                name = sequence.toString();

            } catch (PackageManager.NameNotFoundException e) {

                // Nothing we can do much here, just log

                if (Log.isLoggable(TAG, Log.WARN)) {

core/java/android/database/sqlite/SQLiteSession.java

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ public final class SQLiteSession { 
    }



    private void throwIfNestedTransaction() {

        if (mTransactionStack == null && mTransactionStack.mParent != null) {

        if (hasNestedTransaction()) {

            throw new IllegalStateException("Cannot perform this operation because "

                    + "a nested transaction is in progress.");

        }

core/java/android/util/IntProperty.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public abstract class IntProperty<T> extends Property<T, Integer> { 


    @Override

    final public void set(T object, Integer value) {

        set(object, value.intValue());

        setValue(object, value.intValue());

    }



}
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/usb/UsbStorageActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class UsbStorageActivity extends Activity 
        super.onPause();

        

        unregisterReceiver(mUsbStateReceiver);

        if (mStorageManager == null && mStorageListener != null) {

        if (mStorageManager != null && mStorageListener != null) {

            mStorageManager.unregisterListener(mStorageListener);

        }

    }

services/java/com/android/server/LocationManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -1884,13 +1884,12 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 
    public void removeTestProvider(String provider) {

        checkMockPermissionsSafe();

        synchronized (mLock) {

            MockProvider mockProvider = mMockProviders.get(provider);

            MockProvider mockProvider = mMockProviders.remove(provider);

            if (mockProvider == null) {

                throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");

            }

            long identity = Binder.clearCallingIdentity();

            removeProviderLocked(mProvidersByName.get(provider));

            mMockProviders.remove(mockProvider);



            // reinstate real provider if available

            LocationProviderInterface realProvider = mRealProviders.get(provider);