The call would deadlock because lines 62-67 in ConnectionHandler were in the synchronized block. The is.read() would block and therefore call to shutdown() would block too.
is.read()
would never unblock because the stream was ready to be closed, and it needs to be done so from shutdown(). Removing the synchronized block fixes it and is save, as it was not
needed here.
Change-Id: I3326098c47ee18c4eabaa8510b27ca82debce360
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp
* commit '042e9bd989d9c78e23ed29011b6532743f510625':
Add SIP related settings in the Settings.System.
Merge commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e'
* commit 'ec438e1448ebc578ee5a4c4beb1e26292cdedd6e':
Add PackageManager API to get information about a provider component.
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp
* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
Add PackageManager API to get information about a provider component.
Merge commit '22cd420bfa431b4ad55e699afadf109dcc54f201' into gingerbread-plus-aosp
* commit '22cd420bfa431b4ad55e699afadf109dcc54f201':
Improve debug output when an ANR happens.
- Collect data at better times.
- Collect per-thread CPU usage as soon as possible after the ANR, and print
in log.
- Based on new per-thread CPU usage, limit the number of processes we
collect stacks from to not include inactive not interesting procs.
- Improve the way ProcessStats compute and reports its data.
Change-Id: I12b17fb47d593d175be69bb792c1f57179bf4fdf
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp
* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
Fixed single line state on TextView.
LocalePicker is in Settings, but we want this in framework
so that we are able to use it from other Setting-like
applications.
Also brings two string-arrays for descripting Chinise locales, which
have been in Settings app.
See also I1364c4810a115958662ca5d6e6e7f29c0c9b2569, for example.
Change-Id: I8a398b9b77601cf88ea8a3840b92dcf7441e6103
singleLine flag is set to false by default. However, when no singleLine or input
type is provided, the inputType of the TextView is not set to
EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE for edit texts.
Change-Id: Id747d3319afcddb3ab6ae0463947e8b3e470ef73
Split configuration management into a seperate class,
next to come is per configuration ip management as part
of WifiConfigStore.
Bug: 2876746
Change-Id: I44b85fb0e23a83d97a5052ba6beafe06f2027f5a
Merge commit '1e1a030b502acae11dbd11d826d389351910a60f'
* commit '1e1a030b502acae11dbd11d826d389351910a60f':
Can't have two rules building the stubs and public.xml!
- Fixed click when re-enabling effect during the turn off phase:
make sure the effect states where effect is processed are the same
where volume control is delegated to effect.
- Fixed click when effect is deleted while still active: do not apply
volume ramp if an effect having volume control was just removed from the
effect chain.
Also fixed a crash when PCM dump is enabled in effect bundle wrapper.
Change-Id: Ib562f5cf75c69af75df0e862536262e2514493e4
Merge commit '47471175c9d19a00d06a77aa316dcda08be97deb' into gingerbread-plus-aosp
* commit '47471175c9d19a00d06a77aa316dcda08be97deb':
Can't have two rules building the stubs and public.xml!
