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

Commit 8c2e9f99 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge remote-tracking branch 'github/cm-11.0' into HEAD 

Conflicts:
	services/java/com/android/server/pm/PackageManagerService.java

Change-Id: Icee026d19b4abb55861c4c0bef4297119c38cd43
parents 83b3417b 91d9efd0

core/java/android/bluetooth/BluetoothAdapter.java

+1 −0
Original line number Diff line number Diff line
@@ -1510,6 +1510,7 @@ public final class BluetoothAdapter { 
     * @return true, if the scan was started successfully

     */

    public boolean startLeScan(LeScanCallback callback) {

        if (getState() != STATE_ON) return false;

        return startLeScan(null, callback);

    }

core/java/android/bluetooth/BluetoothHeadset.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import java.util.List; 
public final class BluetoothHeadset implements BluetoothProfile {

    private static final String TAG = "BluetoothHeadset";

    private static final boolean DBG = true;

    private static final boolean VDBG = false;

    private static final boolean VDBG = Log.isLoggable("Handsfree", Log.VERBOSE);



    /**

     * Intent used to broadcast the change in connection state of the Headset

core/java/android/net/LocalSocketImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ class LocalSocketImpl 
        }



        s.fd = accept(fd, s);

        s.mFdCreatedInternally = true;

    }



    /**
@@ -536,4 +537,3 @@ class LocalSocketImpl 
        close();

    }

}

core/java/android/preference/VolumePreference.java

+3 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ public class VolumePreference extends SeekBarDialogPreference implements 
        }



        public void onStartTrackingTouch(SeekBar seekBar) {

            if (isSamplePlaying()) {

                stopSample();

            }

        }



        public void onStopTrackingTouch(SeekBar seekBar) {

core/java/com/android/internal/os/ZygoteInit.java

+6 −0
Original line number Diff line number Diff line
@@ -192,10 +192,16 @@ public class ZygoteInit { 
    static void closeServerSocket() {

        try {

            if (sServerSocket != null) {

                FileDescriptor fd = sServerSocket.getFileDescriptor();

                sServerSocket.close();

                if (fd != null) {

                    Libcore.os.close(fd);

                }

            }

        } catch (IOException ex) {

            Log.e(TAG, "Zygote:  error closing sockets", ex);

        } catch (libcore.io.ErrnoException ex) {

            Log.e(TAG, "Zygote:  error closing descriptor", ex);

        }



        sServerSocket = null;