Merge commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a'
* commit 'e7884d68a613e579a12a52455f6b5b13a90a0f8a':
Don't crash when extra logging is enabled.
Merge commit 'd85621c938286a568b1173e7ab29f80ab93d27e1' into gingerbread-plus-aosp
* commit 'd85621c938286a568b1173e7ab29f80ab93d27e1':
Don't crash when extra logging is enabled.
Merge commit '305bcbf0c961840c4505770d084a1caacc074dbb' into gingerbread-plus-aosp
* commit '305bcbf0c961840c4505770d084a1caacc074dbb':
Decrease PackageManagerService wait time for vold
Up the blocking queue maximum to twice the number of containers we
allow which should let "asec list" complete without blocking the thread
several times.
Change the threads for the NativeDaemonConnector to vold and netd to be
more descriptive instead of the same name.
Bug: 2501075
Change-Id: I7e7949845a6c70a3d619aec0fa79ceef3c17a4be
The buffer was being compacted in the read loop, but the start offset on
the compacted buffer wasn't being considered after the next read.
Bug: 2501075
Change-Id: I163297d751cf800d0bbc66df66b1a0fa0785de49
Merge commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56' into gingerbread-plus-aosp
* commit '32ec1ad17ff3c5034f84a5be77ee2e2434b50c56':
Fix problem in AudioEffect::command() status.
The *pReplyData argument of the command() function was left unitialized by EffectHandle::command()
when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT.
Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
Merge commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp
* commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
SipService: reduce the usage of javax.sdp.*.
Merge commit '75823339cd03e5b25b576cd7a2b5941254017c4a'
* commit '75823339cd03e5b25b576cd7a2b5941254017c4a':
Fix a small bug when granting permissions through activity results.
Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp
* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
Fix a small bug when granting permissions through activity results.
This reverts commit 28961cc02f350ccd1770fb5af2f0d4c9793e4aec which causes this exception:
E/SystemServer( 2653): Failure starting Connectivity Service
E/SystemServer( 2653): java.lang.IllegalMonitorStateException: object not locked by thread before wait()
E/SystemServer( 2653): at java.lang.Object.wait(Native Method)
E/SystemServer( 2653): at java.lang.Object.wait(Object.java:358)
E/SystemServer( 2653): at com.android.server.ConnectivityService$ConnectivityThread.getServiceInstance(ConnectivityService.java:186)
E/SystemServer( 2653): at com.android.server.ConnectivityService.getInstance(ConnectivityService.java:200)
E/SystemServer( 2653): at com.android.server.ServerThread.run(SystemServer.java:262)
Change-Id: Idd139e426e61a1913b0bf343e2f0a0b1990ba8bb
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.
Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp
* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
Add software features for SIP and VOIP
Merge commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6'
* commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6':
Fix logic error in downgrade of system apps
Fixes part of emulator which isn't telling us about dns servers.
Gets some stuff running, but browser is still broken.
bug:2961703
Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
Merge commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7' into gingerbread-plus-aosp
* commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7':
Fix logic error in downgrade of system apps
A logic error would allow not deleting data when uninstalling a system
app upgrade that's of a newer release than the on on the system
partition. If the system app had a database upgrade and this happened,
you might be in trouble.
Luckily it appears no one ever does this in code. You'd have to manually
get there doing:
adb uninstall -k updated.system.package
Change-Id: I3110fedf2d147975a0635c71898d985dd642a2c1
A few lines down "ps" is run through a null check, so apparently there
could be some screwy system conditions where this is encountered. And,
in fact, this was encountered through an updated system pacakge that
managed to delete the package from /system/app during testing. It left
the PackageSetting in mDisabledSysPackages which would cause a deference
of a null variable.
Change-Id: Ic7faca569abd16a87a8a69c20df08c11a274a001
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
mSurface is released in destructor and setPreviewWindow(0) is
called in Client::disconnect(). setPreviewDisplay is not needed
in destructor.
bug:2964479
Change-Id: I329901659a2af407816c34e02f37143b28183a89
- 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 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90'
* commit 'd6a5f2dff9c9db3e154a461127a7cfcea05c1f90':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
Merge commit 'd3e803ae28c369996f9acf6036ea99af5561949c' into gingerbread-plus-aosp
* commit 'd3e803ae28c369996f9acf6036ea99af5561949c':
Revert "Shutdown when capacity is 0% and no charging or when battery is dead"
This reverts commit fd04143a47770256dabcfa4d8447127b3ec8b2bf.
This break most automated tests because with this change, if the
device is fully charged, it will simply turn off the screen, regardless
if USB is connected to hsot PC or not; so for our tests, most of them
are always connected to host PC, and fully charged 99% of the time,
as soon as the screen turns off, the front-end test Activity will be
suspended.
Change-Id: I1e6590611af43812f1bac223dd31570d1d90cfc5
