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

Commit 7e1c89a6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Fix Settings force close many times during Monkey test"

parents d35f387b cab2f10d

src/com/android/settings/applications/InstalledAppDetails.java

+1 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,7 @@ public class InstalledAppDetails extends Fragment 
                mLastCodeSize = codeSize;

                mAppSize.setText(getSizeStr(codeSize));

            }

            if (mLastDataSize != dataSize) {

            if (mLastDataSize != dataSize && mDataSize != null) {

                mLastDataSize = dataSize;

                mDataSize.setText(getSizeStr(dataSize));

            }

src/com/android/settings/applications/RunningProcessesView.java

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ public class RunningProcessesView extends FrameLayout 
        if (mOwner != null) {

            // start new fragment to display extended information

            Bundle args = new Bundle();

            if (mi.mProcess != null) {

            if (mi != null && mi.mProcess != null) {

                args.putInt(RunningServiceDetails.KEY_UID, mi.mProcess.mUid);

                args.putString(RunningServiceDetails.KEY_PROCESS, mi.mProcess.mProcessName);

            }