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

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

Merge changes I292a2905,I99851de0 into jellybean 

* changes:
  NullPointerException in UsbStorageActivity and SQLiteSession
  Call to equals() comparing different types
parents ca219740 456e1a68

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 (mTransactionStack != null && mTransactionStack.mParent != null) {

            throw new IllegalStateException("Cannot perform this operation because "

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

        }

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/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -8871,7 +8871,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
                TaskRecord tr = mRecentTasks.get(i);

                if (dumpPackage != null) {

                    if (tr.realActivity == null ||

                            !dumpPackage.equals(tr.realActivity)) {

                            !dumpPackage.equals(tr.realActivity.getPackageName())) {

                        continue;

                    }

                }