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

Commit abeb1fea authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android-framework.lnx.2.0.c1-00014. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1072094   I9d375f5878d10c28280c1339d8a21f85f3e2e159   SystemUI: Add Missing 4G+ Icons
1087003   If8c72763451d42ade6618bff823f1a832325913e   BT: Rectifying recovery functionality in case of timeout
1091724   I2c3f74bd76c7cf2e3a417c8f8e3da931d5cbce87   UI: Fix checkbox item display error status when scrolled

Change-Id: I95ee4173d26ab935b4375bee2b8e09dea127d221
CRs-Fixed: 1072094, 1087003, 1091724
parents 3adab808 cb366e6b

core/java/com/android/internal/app/AlertController.java

100644 → 100755
+18 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,24 @@ public class AlertController { 


                if (mCursor != null) {

                    adapter = new SimpleCursorAdapter(mContext, layout, mCursor,

                            new String[] { mLabelColumn }, new int[] { R.id.text1 });

                            new String[] { mLabelColumn }, new int[] { R.id.text1 }) {

                        @Override

                        public View getView(int position, View convertView, ViewGroup parent) {

                            View view = super.getView(position, convertView, parent);

                            if (view instanceof CheckedTextView) {

                                final CheckedTextView checkedTextView = (CheckedTextView) view;

                                if (mCheckedItem != -1) {

                                    if (mCheckedItem != position) {

                                        checkedTextView.setChecked(false);

                                    }

                                }



                                return checkedTextView;

                            } else {

                                return view;

                            }

                        }

                    };

                } else if (mAdapter != null) {

                    adapter = mAdapter;

                } else {

services/core/java/com/android/server/BluetoothManagerService.java

+2 −38
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    private int mErrorRecoveryRetryCounter;

    private final int mSystemUiUid;

    private boolean mIntentPending = false;

    private int mIBluetoothConnectedMsgQueued = 0;



    private void registerForAirplaneMode(IntentFilter filter) {

        final ContentResolver resolver = mContext.getContentResolver();
@@ -915,9 +914,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                return;

            }

            msg.obj = service;

            boolean sent = mHandler.sendMessage(msg);

            if (sent && (msg.arg1 == SERVICE_IBLUETOOTH))

                mIBluetoothConnectedMsgQueued++;

            mHandler.sendMessage(msg);

        }



        public void onServiceDisconnected(ComponentName className) {
@@ -1091,8 +1088,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                            break;

                        } // else must be SERVICE_IBLUETOOTH



                        mIBluetoothConnectedMsgQueued--;



                        //Remove timeout

                        mHandler.removeMessages(MESSAGE_TIMEOUT_BIND);
@@ -1227,7 +1222,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                        mBluetoothLock.writeLock().unlock();

                    }



                    if (mEnable && (mIBluetoothConnectedMsgQueued == 0)) {

                    if (mEnable) {

                        mEnable = false;

                        // Send a Bluetooth Restart message

                        Message restartMsg = mHandler.obtainMessage(
@@ -1671,41 +1666,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
            mBluetoothLock.readLock().unlock();

        }



        SystemClock.sleep(500);



        // disable

        handleDisable();



        waitForOnOff(false, true);



        // If there is a MESSAGE_BLUETOOTH_SERVICE_CONNECTED in mHandler queue, we should not

        // unbindService as below. Otherwise, after unbind, com.android.bluetooth will die, but

        // later mBluetooth will be assigned to adapterService in handleMessage of

        // MESSAGE_BLUETOOTH_SERVICE_CONNECTED. From then on, mBluetooth is not null,

        // and com.android.bluetooth is dead, but doBind will not be triggered again.

        if (mIBluetoothConnectedMsgQueued > 0) {

            Slog.e(TAG, "recoverBluetoothServiceFromError: "

                    + "MESSAGE_BLUETOOTH_SERVICE_CONNECTED exists in mHandler queue, "

                    + "should not unbindService, return directly.");

            mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

            mState = BluetoothAdapter.STATE_OFF;

            return;

        }



        sendBluetoothServiceDownCallback();



        try {

            mBluetoothLock.writeLock().lock();

            if (mBluetooth != null) {

                mBluetooth = null;

                // Unbind

                mContext.unbindService(mConnection);

            }

            mBluetoothGatt = null;

        } finally {

            mBluetoothLock.writeLock().unlock();

        }



        mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

        mState = BluetoothAdapter.STATE_OFF;