Commit graph

2666 commits

Author SHA1 Message Date
The Android Open Source Project
1384e50b4d Reconcile with gingerbread-release
Change-Id: I1b4ebc93955e3e929c8984e4e6b505d628061b68
2011-07-07 15:22:40 -07:00
android-merger
697fb7622b Revert "Validate sender credentials on netlink msg receive"
This reverts commit b620a0b1c7.
2011-07-07 14:52:12 -07:00
Dmitry Shmidt
0ac3adb038 Merge "libnl: nl_socket_alloc() Bugfix" 2011-07-07 14:10:31 -07:00
Eric Laurent
f48fd5d403 Temporary workaround for issue 4604090
There was a regression caused by a change in Honeycomb that removed
mediaserver process from system group to improve security: This prevents
the audio HAL (which runs in mediaserver process) from taking wake locks
while audio is playing thus causing the pcm stream to get unexpectedly
suspended.

This temporary workaround is just to allow ICS dogfood in better conditions until
a real fix taking into account the security issue is implemented.

Change-Id: Ic19a23da4b4383559188b6f5c3a82604c3d95d74
2011-07-07 11:45:59 -07:00
Frank Maker
c28b79a6c2 libnl: nl_socket_alloc() Bugfix
Clear memory and allow kernel to set local socket pid

Change-Id: I274156fa7bcf8d2fe78f719fb2eb32d963682931
2011-07-06 22:15:34 -07:00
Mike Lockwood
e89675584d Merge "init.rc: Allow system process to configure RNDIS USB ethernet address" 2011-07-06 17:53:56 -07:00
Mathias Agopian
64416c816c Merge "don't restart surfaceflinger when the window manager dies" 2011-07-06 11:10:41 -07:00
Mike Lockwood
9350a00ce6 init.rc: Allow system process to configure RNDIS USB ethernet address
Change-Id: Id339d8359e592dbc1279e423d9a5adc3a775949d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-06 12:45:49 -04:00
Mathias Agopian
b4daef4531 don't restart surfaceflinger when the window manager dies
Change-Id: Ia3c60e6c5471e2b72d53c936de44b730c68095e0
2011-07-01 17:11:51 -07:00
Frank Maker
5744d312c8 Merge "BUGFIX: libnl_2" 2011-07-01 15:30:16 -07:00
Glenn Kasten
1f311f2f16 Merge "Bug 4571308 Timestamps are not always monotonic" 2011-07-01 15:02:06 -07:00
Brian Carlstrom
856f63c0df Merge "Revert "Add keychain user"" 2011-07-01 13:43:33 -07:00
Eino-Ville Talvala
8648c37975 Merge "Add mobile filter framework library into the bootclasspath." 2011-07-01 13:04:34 -07:00
Mike Lockwood
d18678f882 init: Handle EINTR in handle_property_set_fd()
Change-Id: I5a6f1791eaf11e98b1d81697112d78c99822fba5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-01 15:04:38 -04:00
Eino-Ville Talvala
1c9a996c50 Add mobile filter framework library into the bootclasspath.
Change-Id: Ia9ae45de5d58ba5e98821fd04add96c6062c1a18
2011-07-01 10:30:01 -07:00
Brian Carlstrom
0491893023 Revert "Add keychain user"
This reverts commit 6541ef1562.

Bug:4970237
Change-Id: I23a90eb89c1d19893d2ba7065fc624c0521cb06e
2011-07-01 09:50:31 -07:00
Frank Maker
1b53483949 BUGFIX: libnl_2
Fixed return value for nla_put.

Change-Id: If1ae33bb38c0e88ca7a9220e90ae35dfb0b44b86
2011-06-30 17:39:54 -07:00
Jeff Brown
fb9134e3d0 Merge "getevent: Fix a couple of bugs." 2011-06-30 14:35:46 -07:00
Jeff Sharkey
2e81f58baa Merge "Create groups to protect bandwidth statistics." 2011-06-30 00:19:02 -07:00
Jeff Brown
f6d0f8af17 getevent: Fix a couple of bugs.
Fixed a bug printing the event value when using labels.

Stop trying to print the available codes for EV_SYN because
we cannot actually query them.  EVIOCGBIT(0, size) is a special
case that returns the set of events that are supported, and
EV_SYN == 0.

Change-Id: Iea086ba24300ca0815e4814a3bc5ff60756612c2
2011-06-29 20:52:08 -07:00
Jeff Brown
f96993eb4e lsof: Print process user name.
Change-Id: I6e96faba894ad8c2eeb06e514d332c8ab2ec52f0
2011-06-29 15:00:39 -07:00
Frank Maker
ed6b39cc77 Cleanroom libnl_2 library
By overriding the netlink cache pointer, able to pass nl80211 family id.
Scan and connecting open access point work
Added legal stuff to headers

Change-Id: I1c60452f35fdd1f80edebc03fef33067722d0543
2011-06-28 13:28:02 -07:00
vidya rao
9d94942bcd am 6a18a077: am 04cf629b: Move RILD to class main
* commit '6a18a07774123c409cefd9a92f1c4c6504f4edfd':
  Move RILD to class main
2011-06-27 14:15:33 -07:00
Mike J. Chen
f048363184 Merge changes I255cca69,Ice9ec7f0,I4e97ac98
* changes:
  Workaround Motorola ril.so incompatiblity with Netlink changes
  Cleanup NetlinkListener and NetlinkEvent
  Revert "Revert "Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet""
2011-06-27 12:56:04 -07:00
Brett Chabot
7b023b293b Fix SDK build.
Revert "Fix build warnings"

This reverts commit 590e364868.
2011-06-27 11:14:46 -07:00
Glenn Kasten
c322f67140 Bug 4571308 Timestamps are not always monotonic
Change-Id: Ia4e89a286a514d91d76268235c716e328cd3d0c2
2011-06-27 10:42:39 -07:00
vidya rao
6a18a07774 am 04cf629b: Move RILD to class main
* commit '04cf629be5e99a3a920aecc0b059444bd07e9d84':
  Move RILD to class main
2011-06-24 22:54:11 -07:00
vidya rao
04cf629be5 Move RILD to class main
-- This is needed so the modems (LTE & CDMA) are powered on and running
   before unlocking encrypted devices

Change-Id: I842f5286499fd76abc554ded550fb837d12b324e
2011-06-24 16:41:29 -07:00
Glenn Kasten
590e364868 Fix build warnings
Change-Id: Ie24cf8e729813e4527c698fc7c1502a1efbc63e5
2011-06-24 15:40:56 -07:00
Mike J. Chen
2a56688da9 Workaround Motorola ril.so incompatiblity with Netlink changes
To workaround a binary incompatiblity with Motorola's ril.so, I had to
temporarily provide the old constructor for NetlinkListener as well as
a new contructor that takes an additional format argument.
There's still a slight chance of a problem because the size of the
NetlinkListener has changed with the addition of the
mFormat member, but so far I've not seen any obvious problem with that
incompatiblity.

Another way we could have worked around the incompatiblity is to have
netd (the main user of the new format argument to NetlinkListener) keep
track of the format itself in it's NetlinkHandler (derived from NetlinkListener)
and supply it's own version of onDataAvailable() that's almost 100% identical
to NetlinkListener's except for the decode() call.  That would allow us
not to modify NetlinkListener at all.  Worth considering but I think it's
more properly divided right now and we just have to make Motorola fix their
code (and ideally not use our private APIs).

This change should be reverted when Motorola's has fixed their ril to
either not use our private APIs or to use our updated ones.

Change-Id: I255cca6908444e56cbbbed7eef1fa0cf1d8f0918
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-23 18:59:45 -07:00
Mike J. Chen
17260b1468 Cleanup NetlinkListener and NetlinkEvent
To make it easier to be compatible with older existing code, use
default parameters instead of separate functions for setting.

Also, reintroduce the const usage that was not in the original
changes by Stan.

Also fix some indent spacing.

Change-Id: Ice9ec7f0d5c4a0673037e2e04a764d88a98f68eb
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-23 18:59:45 -07:00
Mike J. Chen
ec16b9d47c Revert "Revert "Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet""
This reverts commit 1d504eeb50.

Conflicts:

	libsysutils/src/NetlinkEvent.cpp

Bring back the changes from Stan Chesnutt regarding adding NETLINK_ROUTE
processing.  The original commit message description was:

    Add NETLINK_ROUTE processing to the netlink client code, so that Ethernet
    physical-layer up/down events can be tracked.  Upper layers will use these
    events to enable/disable Ethernet connectivity.

The original change was reverted due to an incompatiblity with Motorola's
ril.so binary.  I'll submit a patch to workaround that incompatiblity
separately.

Change-Id: I4e97ac98833b10543e654c63ecae3b9b8c7db44f
Signed-off-by: Mike J. Chen <mjchen@google.com>
2011-06-23 18:59:45 -07:00
Eric Laurent
9661a3aecd Merge "Fixed some audio helper functions" 2011-06-23 08:08:06 -07:00
Jeff Sharkey
4f1df18766 Create groups to protect bandwidth statistics.
Introduces new "net_bw_stats" group which will protect reading
detailed bandwidth statistics.  Also introduce "net_bw_acct" group
which will enable specific applications to request that their network
traffic be counted against other UIDs.

Change-Id: Ic0ec04e0d2bb9573f3c2a094ebd6d6a8cae0aae6
2011-06-22 10:01:29 -07:00
Mike Lockwood
535164e9d9 Reimplement the "adb root" command to more closely match its previous behavior
The adb gadget driver used to reset the USB bus when the adbd daemon exited,
and the host side adb relied on this behavior to force it to reconnect
with the new adbd instance after init relaunches it.  The new gadget
drivers no longer automatically reset the USB bus when adbd is restarted
which caused adb to hang since it was no longer forced to reconnect with the
device.  We attempted to work around this on the host side adb, but that
work around has not been reliable.

This change adds a property trigger on the service.adb.root system property
which will reset the USB bus and restart the adbd daemon when adbd sets
the property to 1.  This should be much closer to the previous behavior
and will hopefully fix some problems with automated testing.

Change-Id: I177c37400009a3d83f21a5f9431f94fd1cc19b9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-22 08:36:53 -04:00
Mike Lockwood
07edefe4ce Revert "adb: kick the transport after sending the "adb root" command"
This reverts commit d15e6ac95d.

Also increment adb version to 1.0.29

Change-Id: I890643f0c18a2fe90f170134df039c54116cecda
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-22 07:15:44 -04:00
Mike Lockwood
693e78b9b6 Merge "Fix hang after end of backup" 2011-06-21 16:44:32 -07:00
Christopher Tate
10f129ca8e Fix hang after end of backup
The buggy behavior was that the 'adb backup ....' host command line
invocation would hang forever, even after the backup finished and
the forked device-side subprocess had been reaped.  The reason for
this is that the device adbd end of the socketpair used to send
the data back from the forked subprocess was still stuck readable
even after the remote end of it had been closed.

With this patch, the thread whose job it is to waitpid() in order
to harvest the forked child process also closes the local (adbd)
end of the socketpair.  This makes the fdevent logic notice that
the socket is dead, at which point it cleans up everything including
the communication back to the host.

Change-Id: I90e7e4e5db36c5a6f7363708b29a6d2c56d1250e
2011-06-21 16:05:17 -07:00
Jean-Baptiste Queru
4d557db514 am e1259d63: am 202729a0: am 14c2823a: Merge "add strutils"
* commit 'e1259d633c084bb7516b76a859c6acae20b06aee':
  add strutils
2011-06-21 15:26:44 -07:00
Jean-Baptiste Queru
ef8fd9c4a4 am b06dfe14: am 4c78d862: am a08f7ae3: Merge "tweak for forward-compatibility"
* commit 'b06dfe142505df7efc729455f30ae73fa3cf6fae':
  tweak for forward-compatibility
2011-06-21 15:26:33 -07:00
Mike Lockwood
b0bd6024e3 adb: Update version to 1.0.28
Change-Id: Ib8a98d3840abf24cf062112aca7ce462a0f44bc5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-21 17:26:11 -04:00
Christopher Tate
5b811fa5dd Tidy up the end-of-data handling in backup
* Increase transfer buffer size to 32K
* Add logging about error conditions and fd teardown
* Pass the fd number as a command line option to the 'bu' subprocess
* Properly harvest the 'bu' subprocess after it's done

Change-Id: Id44dde25778ecf43c5604fd9d01d726ba58861e5
2011-06-20 16:19:42 -07:00
Jean-Baptiste Queru
e1259d633c am 202729a0: am 14c2823a: Merge "add strutils"
* commit '202729a0c1d966345dcbfa21db7d886b5d1e6200':
  add strutils
2011-06-20 09:10:49 -07:00
Jean-Baptiste Queru
b06dfe1425 am 4c78d862: am a08f7ae3: Merge "tweak for forward-compatibility"
* commit '4c78d8620514fe1a704872cba66bc1b14d4e2a66':
  tweak for forward-compatibility
2011-06-20 09:10:23 -07:00
Jean-Baptiste Queru
202729a0c1 am 14c2823a: Merge "add strutils"
* commit '14c2823a631b444687b9d26b7baf4c864091c07b':
  add strutils
2011-06-20 09:04:35 -07:00
Jean-Baptiste Queru
4c78d86205 am a08f7ae3: Merge "tweak for forward-compatibility"
* commit 'a08f7ae3c10f4874194fb48ff549e846e39217b7':
  tweak for forward-compatibility
2011-06-20 09:04:33 -07:00
Jean-Baptiste Queru
14c2823a63 Merge "add strutils" 2011-06-18 11:56:48 -07:00
Jean-Baptiste Queru
89790b8929 add strutils
Change-Id: If5938ecd1dfd7f35e326573d10788bacaf3e2383
2011-06-18 11:53:34 -07:00
Jean-Baptiste Queru
a08f7ae3c1 Merge "tweak for forward-compatibility" 2011-06-18 11:21:59 -07:00
Jean-Baptiste Queru
b6c15de82a tweak for forward-compatibility
Change-Id: I1896be16622b452a3652412af3c64f8c550f71d0
2011-06-18 10:41:31 -07:00