OSDN Git Service
Jeff Sharkey [Fri, 15 Jul 2011 04:15:49 +0000 (21:15 -0700)]
Merge "Hide NetworkTemplate details, buffered stats I/O."
Adam Powell [Fri, 15 Jul 2011 04:08:10 +0000 (21:08 -0700)]
Fix bug
5030341 - ActionBar.getHeight is inaccurate in 2-row mode
Measure the shared container instead.
Change-Id: Ib851f773a36add19c227b3ad64a8497f1b5ff9dd
Jeff Sharkey [Fri, 15 Jul 2011 03:37:37 +0000 (20:37 -0700)]
Hide NetworkTemplate details, buffered stats I/O.
Move template matching to builder methods instead of exposing the
internal constants. Also rule to match Ethernet usage. Buffer
reading and writing of network stats, making operations 5x faster.
Change-Id: Iedb2d0ab3b26a976811c050f84a164e909eb74b6
Mathias Agopian [Fri, 15 Jul 2011 03:21:59 +0000 (20:21 -0700)]
Merge "fix a typo in ISurfaceTexture IPC code"
Mathias Agopian [Fri, 15 Jul 2011 03:20:58 +0000 (20:20 -0700)]
fix a typo in ISurfaceTexture IPC code
Change-Id: Ied1d9ddb0d849b17219d0ea3d333ce12be849419
Chia-chi Yeh [Fri, 15 Jul 2011 02:05:33 +0000 (19:05 -0700)]
Merge "VPN: tear down VPN when the dependent interface is down."
Chia-chi Yeh [Fri, 15 Jul 2011 01:55:33 +0000 (18:55 -0700)]
VPN: tear down VPN when the dependent interface is down.
Change-Id: I1eaf8e39ee7aed1f4ecbd4c36c2a81a68ad2f9d1
Adam Powell [Fri, 15 Jul 2011 01:58:28 +0000 (18:58 -0700)]
Merge "Smooth the spinners"
Adam Powell [Thu, 14 Jul 2011 19:14:41 +0000 (12:14 -0700)]
Smooth the spinners
Change-Id: I36de60dc05e5c15692d33d030973f27d54a9d465
Adam Powell [Fri, 15 Jul 2011 01:52:26 +0000 (18:52 -0700)]
Merge "Fix regression with legacy expanded menus"
Adam Powell [Fri, 15 Jul 2011 01:50:02 +0000 (18:50 -0700)]
Fix regression with legacy expanded menus
Change-Id: I28a21dc72d11c6729370e0acd90b06ed98baf098
Mathias Agopian [Fri, 15 Jul 2011 01:04:09 +0000 (18:04 -0700)]
Merge "sensorservice: be more robust when there are no sensor h/w"
Jamie Gennis [Fri, 15 Jul 2011 00:54:27 +0000 (17:54 -0700)]
Merge changes Id9aa1003,I8c154189
* changes:
SurfaceTexture: make (dis)connect into an IPC
SurfaceTexture: add support for new connect values
Jamie Gennis [Thu, 14 Jul 2011 02:12:20 +0000 (19:12 -0700)]
SurfaceTexture: make (dis)connect into an IPC
This change makes the ANativeWindow connect and disconnect calls result
in an IPC to the SurfaceTexture object. This will allow us to prevent
multiple simultaneous connections from different processes.
Change-Id: Id9aa1003b1335b96ca6bd4a1f5a67aa433d42efb
Dianne Hackborn [Fri, 15 Jul 2011 00:23:28 +0000 (17:23 -0700)]
Merge "Move LoadAverageService to the SystemUI apk."
Jeff Brown [Fri, 15 Jul 2011 00:08:16 +0000 (17:08 -0700)]
Merge "Minor code cleanups in vector."
Jeff Brown [Thu, 14 Jul 2011 23:52:10 +0000 (16:52 -0700)]
Merge "Replace Vector _grow/_shrink checks with assert."
James Dong [Thu, 14 Jul 2011 23:42:34 +0000 (16:42 -0700)]
Merge "Revert "Add some logging to track down where ANR happens during MediaPlayer._release().""
Mathias Agopian [Thu, 14 Jul 2011 23:39:46 +0000 (16:39 -0700)]
sensorservice: be more robust when there are no sensor h/w
Bug:
5030108
Change-Id: I45b85b3c492b9268cb0ae44d2e5fc8c708b6e66e
James Dong [Thu, 14 Jul 2011 23:22:47 +0000 (16:22 -0700)]
Revert "Add some logging to track down where ANR happens during MediaPlayer._release()."
This reverts commit
a5293d1ca4459293f4993ea39c09ea703a022844.
Conflicts:
media/libstagefright/AwesomePlayer.cpp
Change-Id: I2a5960208a6780b9a44ab5cce0ffc0e2fb28f426
Chia-chi Yeh [Thu, 14 Jul 2011 23:22:21 +0000 (16:22 -0700)]
Merge "VPN: close the socket in protectVpn() to avoid leaking descriptors."
Chia-chi Yeh [Thu, 14 Jul 2011 23:19:19 +0000 (16:19 -0700)]
VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354
Dianne Hackborn [Thu, 14 Jul 2011 23:10:16 +0000 (16:10 -0700)]
Move LoadAverageService to the SystemUI apk.
Change-Id: I442e264802d1e35cd7d27bae121ae75f932595b6
Adam Cohen [Thu, 14 Jul 2011 22:55:55 +0000 (15:55 -0700)]
Merge "Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter"
Adam Cohen [Thu, 14 Jul 2011 21:45:07 +0000 (14:45 -0700)]
Catching RemoteViews#apply() layout inflation exceptions in RemoteViewsAdapter
Change-Id: I8a481e106b27d145fda92aa0d747e4a8615a5fd0
Jim Miller [Thu, 14 Jul 2011 22:43:17 +0000 (15:43 -0700)]
Merge "Fix
5027468: prevent screen from turning back on while lockscreen in password mode."
Fabrice Di Meglio [Thu, 14 Jul 2011 22:31:03 +0000 (15:31 -0700)]
Merge "Fix bug #
5025936 TableLayout layout direction resolution is broken"
Chia-chi Yeh [Thu, 14 Jul 2011 22:22:59 +0000 (15:22 -0700)]
Merge "VPN: Hook up the new control protocol and network state."
Chia-chi Yeh [Thu, 14 Jul 2011 22:05:05 +0000 (15:05 -0700)]
VPN: Hook up the new control protocol and network state.
1. No more End-Of-Arguments.
2. Daemons close the control socket after they are initialized.
3. No more system properties.
4. ip-up-vpn now creates state to pass the configuration.
5. JNI methods are split again for legacy VPN.
Change-Id: I02fafdf01d425c965345ef712b2bd5fdee3a0cab
Jim Miller [Thu, 14 Jul 2011 22:04:42 +0000 (15:04 -0700)]
Fix
5027468: prevent screen from turning back on while lockscreen in password mode.
This fixes a bug where LockScreen would turn back on due to the sequence of events
that ultimately cause PasswordUnlockScreen.onResume() to be called when the device powers off.
This is required because the lockscreen rebuilds itself before the screen turns off
so that it's ready to show immediately when the device comes back on.
Change-Id: I86a61cc3b1d77cf7f2a9a198051ea2bbe90607b2
Jamie Gennis [Wed, 13 Jul 2011 19:57:23 +0000 (12:57 -0700)]
SurfaceTexture: add support for new connect values
This change adds support to SurfaceTextureClient for the new enum values
that can be passed to the ANativeWindow connect call.
Change-Id: I8c15418909e43a15673a9b22a5eb40df6923b273
Justin Ho [Thu, 14 Jul 2011 21:54:01 +0000 (14:54 -0700)]
Merge "Initial pass at some preload drawables Bug:
5020126"
Chia-chi Yeh [Thu, 14 Jul 2011 21:53:58 +0000 (14:53 -0700)]
Merge "ip-up-vpn: Create proper states for pppd and racoon."
Chia-chi Yeh [Thu, 14 Jul 2011 21:47:48 +0000 (14:47 -0700)]
ip-up-vpn: Create proper states for pppd and racoon.
VPN no longer uses system properties to pass parameters.
Change-Id: I13e4339ababb08552c4276c675c21176774da66c
Justin Ho [Thu, 14 Jul 2011 21:12:37 +0000 (14:12 -0700)]
Initial pass at some preload drawables
Bug:
5020126
Change-Id: I3c51e89774197caf50351ee55eb6922c9cdd32d5
John Wang [Thu, 14 Jul 2011 21:03:11 +0000 (14:03 -0700)]
am
74c425d3: am
54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '
74c425d3e95ed0f47b1a5d447007886d01d7ff56':
Show SIM blocked after 10 time puk wrong entries.
John Wang [Thu, 14 Jul 2011 21:00:58 +0000 (14:00 -0700)]
am
54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '
54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
Show SIM blocked after 10 time puk wrong entries.
John Wang [Thu, 14 Jul 2011 20:59:10 +0000 (13:59 -0700)]
Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
Eino-Ville Talvala [Thu, 14 Jul 2011 20:38:55 +0000 (13:38 -0700)]
Merge "NEW_API: Add auto-exposure and auto-white balance locking to the Camera."
Elliott Hughes [Thu, 14 Jul 2011 20:28:00 +0000 (13:28 -0700)]
Merge "Fix aidl to cope with multiple collection types per method."
Andreas Huber [Thu, 14 Jul 2011 20:22:45 +0000 (13:22 -0700)]
Merge "If audio startup fails while executing MediaPlayer::start() do NOT post an error"
Andreas Huber [Thu, 14 Jul 2011 20:02:47 +0000 (13:02 -0700)]
If audio startup fails while executing MediaPlayer::start() do NOT post an error
notification, the error returned by MediaPlayer::start() will suffice.
Change-Id: I49bd8d42078f039e5e6d8d4fed4f7f55dc5ff82a
related-to-bug:
5020200
Romain Guy [Thu, 14 Jul 2011 19:45:23 +0000 (12:45 -0700)]
Merge "Force bitmaps to load in ARGB8888 by default. Bug #
5024993"
Romain Guy [Thu, 14 Jul 2011 19:42:19 +0000 (12:42 -0700)]
Force bitmaps to load in ARGB8888 by default.
Bug #
5024993
Change-Id: Id0c63f675ae188e5a786b7fdd63916e114b9ed4a
Wink Saville [Thu, 14 Jul 2011 19:23:28 +0000 (12:23 -0700)]
Fix build.
Changes in ConnectivityService in hc-LTE when merged with changes
happening in Master caused the build to break.
Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af
John Wang [Fri, 8 Jul 2011 19:31:08 +0000 (12:31 -0700)]
Show SIM blocked after 10 time puk wrong entries.
After user enters 10 time wrong puk in puk unlock screen,
device need show the SIM permanently disabled message
is in lock screen.
bug:
4905509
Change-Id: I06242834972b3f403cfe99a2edd8bae47d7ed474
Philip Milne [Thu, 14 Jul 2011 18:32:09 +0000 (11:32 -0700)]
Merge "Rationalize API after adding maximum size feature."
Narayan Kamath [Thu, 14 Jul 2011 18:13:07 +0000 (11:13 -0700)]
Merge "Minor documentation updates for the AudioTrack class."
Glenn Kasten [Thu, 14 Jul 2011 17:59:40 +0000 (10:59 -0700)]
Merge "Add MEDIA_UID"
Wink Saville [Thu, 14 Jul 2011 17:55:58 +0000 (10:55 -0700)]
am
3810361e: am
6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '
3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d':
Remove STOPSHIP but allow seamless Handoff when possible.
Jaikumar Ganesh [Thu, 14 Jul 2011 17:55:55 +0000 (10:55 -0700)]
am
6dd45316: (-s ours) resolved conflicts for merge of
ab3ec176 to honeycomb-plus-aosp
* commit '
6dd4531639157191e6224d3f8af5c9d099ca945f':
Bluetooth: correcting return value from cancelDiscovery
John Wang [Thu, 14 Jul 2011 17:49:38 +0000 (10:49 -0700)]
am
28d92afc: am
2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE
* commit '
28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
Add getImei() to Phone interface.
Dianne Hackborn [Thu, 14 Jul 2011 17:48:01 +0000 (10:48 -0700)]
Merge "Improve handling of low memory."
Adam Powell [Thu, 14 Jul 2011 03:40:52 +0000 (20:40 -0700)]
Nicer API for disabling/enabling the home/up button in action bars.
Have an explicit call for enabling the home/up button. Auto-enable it
if the app targets < ICS to preserve Honeycomb behavior. Auto-enable
it if the app shows home as up.
This prevents unwanted touch/focus feedback on the home button when
the app hasn't wired it up to do anything useful.
Change-Id: Icfe95ab5a11b3998bca08b0fbbfe1bf6c3c89b5d
Dianne Hackborn [Thu, 14 Jul 2011 02:33:41 +0000 (19:33 -0700)]
Improve handling of low memory.
Now classify background processes into a set of bins of how much
memory they should try to clear. The last bin also involves
destroying all activities in that process.
Removed the old code for the simulator that is no longer needed
(yay). The debugging features it had are now integrated into the
regular oom adj code.
Small fixes to load average service.
Change-Id: Ic8df401714b188c73b50dbc8f8e6345b58f1f3a0
Narayan Kamath [Thu, 14 Jul 2011 15:37:46 +0000 (16:37 +0100)]
Minor documentation updates for the AudioTrack class.
Change-Id: I0c3c220aa433d1917d997a7b1bfa54e61acc26b2
Jaikumar Ganesh [Thu, 14 Jul 2011 17:08:41 +0000 (10:08 -0700)]
Merge "Remove Car audio class from auto pairing."
Eino-Ville Talvala [Fri, 13 May 2011 17:25:00 +0000 (10:25 -0700)]
NEW_API: Add auto-exposure and auto-white balance locking to the Camera.
Unhides the Camera API calls for using the auto-exposure and
auto-white balance locks. Adds documentation about the interaction
between auto-focus and the AE and AWB locks.
Change-Id: I5bf73b9dce1c93e11a17f9d3efb82db1261524c5
James Dong [Thu, 14 Jul 2011 16:59:24 +0000 (09:59 -0700)]
Merge "Support profile and level query for SW video decoders"
Jeff Hamilton [Thu, 14 Jul 2011 16:53:08 +0000 (09:53 -0700)]
Merge "unhide public apis"
Jaikumar Ganesh [Thu, 14 Jul 2011 02:05:23 +0000 (19:05 -0700)]
Remove Car audio class from auto pairing.
Majority of the cars don't auto pair unlike headsets, as they have a display.
Instead of maintaining a blacklist of such cars, disable
auto pairing with 0000. This is legacy anyway as newer cars
come with 2.1 pairing.
Change-Id: I644e2da4d11cf2d250d846853523d7975ca000fc
Andreas Huber [Thu, 14 Jul 2011 16:09:14 +0000 (09:09 -0700)]
Merge "Include all supported mime types when querying decoder profile/level support."
Andreas Huber [Thu, 14 Jul 2011 16:09:07 +0000 (09:09 -0700)]
Merge "Remove legacy http support from stagefright, chromium is the new hotness."
Narayan Kamath [Thu, 14 Jul 2011 15:44:39 +0000 (08:44 -0700)]
Merge "Minor cleanups to TextToSpeech."
Glenn Kasten [Thu, 14 Jul 2011 14:54:34 +0000 (07:54 -0700)]
Merge "OMX CallbackDispatcher uses C++ Thread not pthread"
Narayan Kamath [Thu, 14 Jul 2011 14:30:36 +0000 (15:30 +0100)]
Minor cleanups to TextToSpeech.
(a) Fix an NPE reported when no TTS engine is installed.
(b) Fix a bad link, and some javadoc typos.
bug:
5004015
Change-Id: I38b97dbb5d7d4065a5ee408fae9138638ed48f40
Jeff Brown [Thu, 14 Jul 2011 11:20:56 +0000 (04:20 -0700)]
Merge "Refactor input dispatcher use of window/app handles."
Jeff Brown [Thu, 14 Jul 2011 11:12:51 +0000 (04:12 -0700)]
Merge "Fix invalid JNI call signature. Bug:
5029536"
Jeff Brown [Thu, 14 Jul 2011 07:29:49 +0000 (00:29 -0700)]
Minor code cleanups in vector.
Fixed a potential bug where calling replaceAt with a reference to
an existing element in the vector at the same index would cause
the element to be destroyed while being copied to itself.
Refactored the conditions in _grow and _shrink for clarity.
The computations are exactly the same but I think it reads better
this way. In particular, the ssize_t variable 's' is gone: it didn't
need to be signed anyways because its value could never be negative.
Change-Id: If087841c15e6a87160eee874720c4a77eb0e99a6
Jeff Brown [Thu, 14 Jul 2011 05:22:02 +0000 (22:22 -0700)]
Replace Vector _grow/_shrink checks with assert.
On review of the code, _grow and _shrink are checking for conditions
that cannot happen and that don't even really make sense. For
example, if _shrink is called with where + amount > mCount then
this is really bad, however the check only considered the case
when where >= mCount and then it would arbitrarily choose a new
value for where. Huh?
As it happens, the callers are correctly validating the
arguments before passing them down to these methods so we can
get rid of this code.
Change-Id: I921852dba8997065bb0e9cac733e82028d14afcd
Jeff Brown [Thu, 14 Jul 2011 05:51:29 +0000 (22:51 -0700)]
Refactor input dispatcher use of window/app handles.
This change moves the cached window and application input state
into the handle objects themselves. It simplifies the dispatcher
somewhat because it no longer needs to fix up references to
transient InputWindow objects each time the window list is updated.
This change will also make it easier to optimize setInputWindows
to avoid doing a lot of redundant data copying. In principle, only
the modified fields need to be updated. However, for now we
continue to update all fields in unison as before.
It turns out that the input dispatcher was inappropriately retaining
pointers to InputWindow objects within the mWindows InputWindow
vector. This vector is copy-on-write so it is possible and the
item pointers to change if an editing operation is performed on
the vector when it does not exclusively own the underlying
SharedBuffer. This bug was uncovered by a previous change that
replaced calls to clear() and appendVector() with a simple use
of operator= which caused the buffer to be shared. Consequently
after editItemAt was called (which it shouldn't have, actually)
the buffer was copied and the cached InputWindow pointers became
invalid. Oops. This change fixes the problem.
Change-Id: I0a259339a6015fcf9113dc4081a6875e047fd425
Jeff Brown [Thu, 14 Jul 2011 10:54:36 +0000 (03:54 -0700)]
Fix invalid JNI call signature.
Bug:
5029536
Change-Id: I1f9b3faa77d49e26ef43982ff57cbbf0c3be8b40
Mathew Inwood [Fri, 8 Jul 2011 16:26:46 +0000 (17:26 +0100)]
SearchBox API changes, to know when calls succeeded.
Depends on change: I5af94c8df8f24dfafb02c4052381aa547c72684c
(due to SearchBox API change).
Change-Id: If283ecdfa62aecb1fa697b1a2cd43b771b908d72
Jeff Brown [Thu, 14 Jul 2011 05:18:46 +0000 (22:18 -0700)]
Provide more descriptive name for InputChannel ashmem.
Change-Id: I4307de9f717ac4810b1b91ee0c1a3899325acf71
Philip Milne [Tue, 12 Jul 2011 21:49:45 +0000 (14:49 -0700)]
Rationalize API after adding maximum size feature.
. Change name of Group to Spec
(with the addition of the fglexibility field, this class no longer represents a group)
. Replace overloaded Group/Spec constructors with factory method
. Bugfix for measure() when alignmentMode == ALIGN_BOUNDS
. Bury as much Java API as possible, to minimize restrictions on future API enhancements
- make all field access in Group package private
- use factory methods in place of field assignment
Change-Id: I46a5027a013bf7c3110b77108b8fd0427165cd18
Adam Powell [Thu, 14 Jul 2011 03:42:19 +0000 (20:42 -0700)]
Fix bug in submenus opened from icon menus
Change-Id: I8b60ceefbccb5cad78d1b5c55702a2685a5f5382
Adam Powell [Thu, 14 Jul 2011 03:07:41 +0000 (20:07 -0700)]
Merge "Preserve spacing for icons in menus"
Adam Powell [Wed, 13 Jul 2011 17:24:06 +0000 (10:24 -0700)]
Preserve spacing for icons in menus
Change-Id: I3269fcffb98a84b6a5c5f9198afd2b2eae7d5f02
Glenn Kasten [Wed, 13 Jul 2011 23:23:22 +0000 (16:23 -0700)]
Add MEDIA_UID
Change-Id: Iaf03913dce95420e21c79226031b7caaaedf2ce8
Ben Dodson [Thu, 14 Jul 2011 00:38:33 +0000 (17:38 -0700)]
unhide public apis
Change-Id: I3bbe0e7c1e135a4654f63c34c024d7aa10341279
Svetoslav Ganov [Thu, 14 Jul 2011 00:23:41 +0000 (17:23 -0700)]
Merge "Touch exploration gesture events change the window id."
Svetoslav Ganov [Thu, 14 Jul 2011 00:16:34 +0000 (17:16 -0700)]
Touch exploration gesture events change the window id.
1. Touch exploration start and end events are generated
by the sytstem to provide additional information for
accessibility services. Since such events do not come
from any particular window they whould not change the
id of the window that currently allows exploring its
content.
2. Touch exploration start and end events were lealing the
touch explorer class wich is private.
bug:
5026258
Change-Id: Icaf3e2bd9566716f2afb876cf8e0d50813b0c76e
Mike Lockwood [Wed, 13 Jul 2011 23:46:50 +0000 (16:46 -0700)]
Merge "Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build"
Mike Lockwood [Wed, 13 Jul 2011 15:06:57 +0000 (11:06 -0400)]
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jason Sams [Wed, 13 Jul 2011 23:43:27 +0000 (16:43 -0700)]
Merge "Fix native crash when GL driver fails to initialize."
Dave Santoro [Wed, 13 Jul 2011 23:23:44 +0000 (16:23 -0700)]
Merge "Contacts contract update for display photos."
Jason Sams [Wed, 13 Jul 2011 23:09:42 +0000 (16:09 -0700)]
Fix native crash when GL driver fails to initialize.
Change-Id: I85714de9029285027dc75fb3b62076be41a4c985
Kenny Root [Wed, 13 Jul 2011 22:53:12 +0000 (15:53 -0700)]
Merge "Add StorageVolume list to MountService dump"
Kenny Root [Wed, 13 Jul 2011 22:53:03 +0000 (15:53 -0700)]
Merge "Fix debugging for hwui caches"
Andreas Huber [Wed, 13 Jul 2011 22:45:01 +0000 (15:45 -0700)]
Remove legacy http support from stagefright, chromium is the new hotness.
Change-Id: I6725d42d38b91e6a1cbca43174870f445aeb3d99
Daniel Lehmann [Wed, 13 Jul 2011 22:40:03 +0000 (15:40 -0700)]
Merge "Allow a sync adapter to provide an OPEN action for a group"
Christopher Tate [Wed, 13 Jul 2011 22:37:21 +0000 (15:37 -0700)]
Merge "Compress the backup output stream"
Daniel Lehmann [Wed, 13 Jul 2011 22:35:05 +0000 (15:35 -0700)]
Allow a sync adapter to provide an OPEN action for a group
Bug:
4413120
Change-Id: I17572204dc9fad3406d2505c83586b9dbce177b9
Christopher Tate [Mon, 11 Jul 2011 18:31:57 +0000 (11:31 -0700)]
Compress the backup output stream
Zlib compression, with a full flush between each application's
data. Encryption will be performed on the already-compressed data
once that's implemented.
On restore, the streamed data is similarly uncompressed on the fly.
Change-Id: I19b65c88e759a66527d10913d18fffa9df0bc011
Jeff Sharkey [Wed, 13 Jul 2011 22:28:06 +0000 (15:28 -0700)]
Merge "Control socket tagging through Settings.Secure."
Andreas Huber [Wed, 13 Jul 2011 22:27:04 +0000 (15:27 -0700)]
Include all supported mime types when querying decoder profile/level support.
Change-Id: Ia1c930eee489bfebb482ac5079bd6ac9354532f2
Jeff Sharkey [Wed, 13 Jul 2011 22:24:02 +0000 (15:24 -0700)]
Control socket tagging through Settings.Secure.
When NetworkManagementService starts, it determines if qtaguid
should be enabled. The changes pushes the enabled state to a system
property to control socket tagging.
Change-Id: I5697a990dbaad4b220a2fb055931b18077d07a74
Andreas Huber [Wed, 13 Jul 2011 22:19:44 +0000 (15:19 -0700)]
Merge "Remove old-style software decoders."
David 'Digit' Turner [Wed, 13 Jul 2011 21:55:20 +0000 (14:55 -0700)]
am
0814a9aa: am
db4c5f35: resolved conflicts for merge of
7816eded to gingerbread-plus-aosp
* commit '
0814a9aa0c8f89f084ba37df05b3735274d78420':
NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
Fix missing NL
Scott Main [Wed, 13 Jul 2011 21:55:15 +0000 (14:55 -0700)]
am
9b446cd6: am
bc047bb0: am
e32c49ab: docs: de-new sidenavs
* commit '
9b446cd6b4d3d2c2e2517d95937750da0d3b2df1':
docs: de-new sidenavs