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

Commit 3732d90d authored by William Escande's avatar William Escande
Browse files

SystemServer: stop repeating getPackageName 

Repeating it all across the code is bloating and make my eyes bleed

Bug: 311772251
Test: m service-bluetooth
Flag: Exempt, mechanical inlining
Change-Id: Id36f4d4324d7285320fb5a83d1b72788a1117f27
parent 7145246f

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+29 −38
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ class BluetoothManagerService { 
        // DISALLOW_BLUETOOTH can only be set by DO or PO on the system user.

        // Only trigger once instead of for all users

        if (UserHandle.SYSTEM.equals(userHandle) && newBluetoothDisallowed) {

            sendDisableMsg(ENABLE_DISABLE_REASON_DISALLOWED, mContext.getPackageName());

            sendDisableMsg(ENABLE_DISABLE_REASON_DISALLOWED);

        }

    }
@@ -336,11 +336,11 @@ class BluetoothManagerService { 
                return false;

            }

            if (state == STATE_BLE_ON) {

                addActiveLog(ENABLE_DISABLE_REASON_FACTORY_RESET, mContext.getPackageName(), false);

                addActiveLog(ENABLE_DISABLE_REASON_FACTORY_RESET, false);

                mAdapter.stopBle(mContext.getAttributionSource());

                return true;

            } else if (state == STATE_ON) {

                addActiveLog(ENABLE_DISABLE_REASON_FACTORY_RESET, mContext.getPackageName(), false);

                addActiveLog(ENABLE_DISABLE_REASON_FACTORY_RESET, false);

                mAdapter.disable(mContext.getAttributionSource());

                return true;

            }
@@ -494,10 +494,7 @@ class BluetoothManagerService { 
                    mAdapterLock.readLock().lock();

                    try {

                        if (mAdapter != null) {

                            addActiveLog(

                                    ENABLE_DISABLE_REASON_AIRPLANE_MODE,

                                    mContext.getPackageName(),

                                    false);

                            addActiveLog(ENABLE_DISABLE_REASON_AIRPLANE_MODE, false);

                            mAdapter.stopBle(mContext.getAttributionSource());

                            mEnable = false;

                            mEnableExternal = false;
@@ -508,13 +505,10 @@ class BluetoothManagerService { 
                        mAdapterLock.readLock().unlock();

                    }

                } else if (st == STATE_ON) {

                    sendDisableMsg(ENABLE_DISABLE_REASON_AIRPLANE_MODE, mContext.getPackageName());

                    sendDisableMsg(ENABLE_DISABLE_REASON_AIRPLANE_MODE);

                }

            } else if (mEnableExternal) {

                sendEnableMsg(

                        mQuietEnableExternal,

                        ENABLE_DISABLE_REASON_AIRPLANE_MODE,

                        mContext.getPackageName());

                sendEnableMsg(mQuietEnableExternal, ENABLE_DISABLE_REASON_AIRPLANE_MODE);

            } else if (st != STATE_ON) {

                autoOnSetupTimer();

            }
@@ -523,13 +517,10 @@ class BluetoothManagerService { 


    private void handleSatelliteModeChanged(boolean isSatelliteModeOn) {

        if (shouldBluetoothBeOn(isSatelliteModeOn) && getState() != STATE_ON) {

            sendEnableMsg(

                    mQuietEnableExternal,

                    ENABLE_DISABLE_REASON_SATELLITE_MODE,

                    mContext.getPackageName());

            sendEnableMsg(mQuietEnableExternal, ENABLE_DISABLE_REASON_SATELLITE_MODE);

        } else if (!shouldBluetoothBeOn(isSatelliteModeOn) && getState() != STATE_OFF) {

            AutoOnFeature.pause();

            sendDisableMsg(ENABLE_DISABLE_REASON_SATELLITE_MODE, mContext.getPackageName());

            sendDisableMsg(ENABLE_DISABLE_REASON_SATELLITE_MODE);

        } else if (!isSatelliteModeOn

                && !shouldBluetoothBeOn(isSatelliteModeOn)

                && getState() != STATE_ON) {
@@ -925,10 +916,7 @@ class BluetoothManagerService { 
                        mAdapterLock.readLock().lock();

                        try {

                            if (mAdapter != null) {

                                addActiveLog(

                                        ENABLE_DISABLE_REASON_APPLICATION_REQUEST,

                                        mContext.getPackageName(),

                                        false);

                                addActiveLog(ENABLE_DISABLE_REASON_APPLICATION_REQUEST, false);

                                mAdapter.stopBle(mContext.getAttributionSource());

                            }

                        } catch (RemoteException e) {
@@ -1270,10 +1258,7 @@ class BluetoothManagerService { 
        final boolean isSafeMode = mContext.getPackageManager().isSafeMode();

        if (mEnableExternal && isBluetoothPersistedStateOnBluetooth() && !isSafeMode) {

            Log.i(TAG, "internalHandleOnBootPhase: Auto-enabling Bluetooth.");

            sendEnableMsg(

                    mQuietEnableExternal,

                    ENABLE_DISABLE_REASON_SYSTEM_BOOT,

                    mContext.getPackageName());

            sendEnableMsg(mQuietEnableExternal, ENABLE_DISABLE_REASON_SYSTEM_BOOT);

        } else if (!isNameAndAddressSet()) {

            Log.i(TAG, "internalHandleOnBootPhase: Getting adapter name and address");

            mHandler.sendEmptyMessage(MESSAGE_GET_NAME_AND_ADDRESS);
@@ -1661,17 +1646,12 @@ class BluetoothManagerService { 
                        Log.d(TAG, "MESSAGE_RESTORE_USER_SETTING: set Bluetooth state to disabled");

                        setBluetoothPersistedState(BLUETOOTH_OFF);

                        mEnableExternal = false;

                        sendDisableMsg(

                                ENABLE_DISABLE_REASON_RESTORE_USER_SETTING,

                                mContext.getPackageName());

                        sendDisableMsg(ENABLE_DISABLE_REASON_RESTORE_USER_SETTING);

                    } else if ((msg.arg1 == RESTORE_SETTING_TO_ON) && !mEnable) {

                        Log.d(TAG, "MESSAGE_RESTORE_USER_SETTING: set Bluetooth state to enabled");

                        mQuietEnableExternal = false;

                        mEnableExternal = true;

                        sendEnableMsg(

                                false,

                                ENABLE_DISABLE_REASON_RESTORE_USER_SETTING,

                                mContext.getPackageName());

                        sendEnableMsg(false, ENABLE_DISABLE_REASON_RESTORE_USER_SETTING);

                    } else {

                        Log.w(

                                TAG,
@@ -1808,7 +1788,7 @@ class BluetoothManagerService { 


                    // log the unexpected crash

                    addCrashLog();

                    addActiveLog(ENABLE_DISABLE_REASON_CRASH, mContext.getPackageName(), false);

                    addActiveLog(ENABLE_DISABLE_REASON_CRASH, false);

                    if (mEnable) {

                        mEnable = false;

                        mHandler.sendEmptyMessageDelayed(
@@ -1842,8 +1822,7 @@ class BluetoothManagerService { 
                         * it doesn't change when IBluetooth

                         * service restarts */

                        mEnable = true;

                        addActiveLog(

                                ENABLE_DISABLE_REASON_RESTARTED, mContext.getPackageName(), true);

                        addActiveLog(ENABLE_DISABLE_REASON_RESTARTED, true);

                        handleEnable(mQuietEnable);

                    } else {

                        mAdapterLock.writeLock().lock();
@@ -1928,7 +1907,7 @@ class BluetoothManagerService { 
            assert (mState.oneOf(STATE_ON));



            // disable

            addActiveLog(ENABLE_DISABLE_REASON_USER_SWITCH, mContext.getPackageName(), false);

            addActiveLog(ENABLE_DISABLE_REASON_USER_SWITCH, false);

            handleDisable();

            // Pbap service need receive STATE_TURNING_OFF intent to close

            bluetoothStateChangeHandler(STATE_ON, STATE_TURNING_OFF);
@@ -1951,7 +1930,7 @@ class BluetoothManagerService { 
            mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

            mState.set(STATE_OFF);

            // enable

            addActiveLog(ENABLE_DISABLE_REASON_USER_SWITCH, mContext.getPackageName(), true);

            addActiveLog(ENABLE_DISABLE_REASON_USER_SWITCH, true);

            // mEnable flag could have been reset on stopBle. Reenable it.

            mEnable = true;

            handleEnable(mQuietEnable);
@@ -2097,11 +2076,19 @@ class BluetoothManagerService { 
        return mState.waitForState(getSyncTimeout(), states);

    }



    private void sendDisableMsg(int reason) {

        sendDisableMsg(reason, mContext.getPackageName());

    }



    private void sendDisableMsg(int reason, String packageName) {

        mHandler.sendEmptyMessage(MESSAGE_DISABLE);

        addActiveLog(reason, packageName, false);

    }



    private void sendEnableMsg(boolean quietMode, int reason) {

        sendEnableMsg(quietMode, reason, mContext.getPackageName());

    }



    private void sendEnableMsg(boolean quietMode, int reason, String packageName) {

        sendEnableMsg(quietMode, reason, packageName, false);

    }
@@ -2112,6 +2099,10 @@ class BluetoothManagerService { 
        mLastEnabledTime = SystemClock.elapsedRealtime();

    }



    private void addActiveLog(int reason, boolean enable) {

        addActiveLog(reason, mContext.getPackageName(), enable);

    }



    private void addActiveLog(int reason, String packageName, boolean enable) {

        ActiveLog lastActiveLog = mActiveLogs.peekLast();

        synchronized (mActiveLogs) {
@@ -2190,7 +2181,7 @@ class BluetoothManagerService { 
        SystemClock.sleep(500);



        // disable

        addActiveLog(ENABLE_DISABLE_REASON_START_ERROR, mContext.getPackageName(), false);

        addActiveLog(ENABLE_DISABLE_REASON_START_ERROR, false);

        handleDisable();



        waitForState(STATE_OFF);