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

Commit 646befdd authored by Jason Monk's avatar Jason Monk
Browse files

Don't have app info pages load so much info 

They don't need to resume the ApplicationsState session because they
only need info for one app, instead just make sure ApplicationsState
can load the info as requested.

Bug: 20696893
Change-Id: I146387438348fad1396ac4528819b2f1a93a97bf
parent 85a72a90

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

+0 −18
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
    protected boolean mAppControlRestricted = false;



    protected ApplicationsState mState;

    private ApplicationsState.Session mSession;

    protected ApplicationsState.AppEntry mAppEntry;

    protected PackageInfo mPackageInfo;

    protected int mUserId;
@@ -77,7 +76,6 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
        mFinishing = false;



        mState = ApplicationsState.getInstance(getActivity().getApplication());

        mSession = mState.newSession(this);

        Context context = getActivity();

        mDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);

        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
@@ -85,9 +83,6 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
        IBinder b = ServiceManager.getService(Context.USB_SERVICE);

        mUsbManager = IUsbManager.Stub.asInterface(b);



        // Need to make sure we have loaded applications at this point.

        mSession.resume();



        retrieveAppEntry();

    }
@@ -95,25 +90,12 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment 
    public void onResume() {

        super.onResume();

        mAppControlRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL);

        mSession.resume();



        if (!refreshUi()) {

            setIntentAndFinish(true, true);

        }

    }



    @Override

    public void onPause() {

        super.onPause();

        mSession.pause();

    }



    @Override

    public void onDestroyView() {

        super.onDestroyView();

        mSession.release();

    }



    protected String retrieveAppEntry() {

        final Bundle args = getArguments();

        mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;

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

+21 −8
Original line number Diff line number Diff line
@@ -878,20 +878,33 @@ public class ApplicationsState { 
        synchronized (mEntriesMap) {

            AppEntry entry = mEntriesMap.get(userId).get(packageName);

            if (entry == null) {

                for (int i=0; i<mApplications.size(); i++) {

                    ApplicationInfo info = mApplications.get(i);

                    if (packageName.equals(info.packageName)

                            && userId == UserHandle.getUserId(info.uid)) {

                        entry = getEntryLocked(info);

                        break;

                ApplicationInfo info = getAppInfoLocked(packageName, userId);

                if (info == null) {

                    try {

                        info = mIpm.getApplicationInfo(packageName, 0, userId);

                    } catch (RemoteException e) {

                        Log.w(TAG, "getEntry couldn't reach PackageManager", e);

                        return null;

                    }

                }

                entry = getEntryLocked(info);

            }

            if (DEBUG_LOCKING) Log.v(TAG, "...getEntry releasing lock");

            return entry;

        }

    }



    private ApplicationInfo getAppInfoLocked(String pkg, int userId) {

        for (int i = 0; i < mApplications.size(); i++) {

            ApplicationInfo info = mApplications.get(i);

            if (pkg.equals(info.packageName)

                    && userId == UserHandle.getUserId(info.uid)) {

                return info;

            }

        }

        return null;

    }



    void ensureIcon(AppEntry entry) {

        if (entry.icon != null) {

            return;
@@ -1153,8 +1166,8 @@ public class ApplicationsState { 
                            mMainHandler.sendMessage(msg);

                        }

                    }

                    if (mCurComputingSizePkg == null

                            || (mCurComputingSizePkg.equals(stats.packageName)

                    if (mCurComputingSizePkg != null

                            && (mCurComputingSizePkg.equals(stats.packageName)

                                    && mCurComputingSizeUserId == stats.userHandle)) {

                        mCurComputingSizePkg = null;

                        sendEmptyMessage(MSG_LOAD_SIZES);

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

+1 −0
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ public class InstalledAppDetails extends AppInfoBase 
        if (mFinishing) {

            return;

        }

        mState.requestSize(mPackageName, mUserId);

        AppItem app = new AppItem(mAppEntry.info.uid);

        app.addUid(mAppEntry.info.uid);

        if (mStatsSession != null) {