Stephen Hines
f442cf27c5
am b3a5343e: Merge "Fixed a discarded const qualifier warning"
...
* commit 'b3a5343e3ef705e2493a2a8546f6e416d41b1c77':
Fixed a discarded const qualifier warning
2012-08-08 16:02:45 -07:00
Stephen Hines
7accfc2ffd
am f889f0db: Merge "Trivial signed/unsigned warning fix for adbd"
...
* commit 'f889f0dba404d0dfb75fb33ad1df152129b0a7d2':
Trivial signed/unsigned warning fix for adbd
2012-08-08 16:02:44 -07:00
Stephen Hines
e7b2a43638
am e551055e: Merge "Fix signed/unsigned comparison warning"
...
* commit 'e551055e17dae5d37f5cb428d63ddcae2e9341a2':
Fix signed/unsigned comparison warning
2012-08-08 16:02:42 -07:00
Stephen Hines
02adb534da
am 80bcb489: Merge "Fixed un-initialized variable warnings"
...
* commit '80bcb4893058be698bae1bef59c4b28edda6c744':
Fixed un-initialized variable warnings
2012-08-08 16:02:41 -07:00
Chris Dearman
6ee3ecc03a
Decode DHCP netmask option correctly
...
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ibc288458baf2f75c5b19a46e4c97ee59521cc9a5
2012-08-08 15:50:03 -07:00
Stephen Hines
d25b8502ea
Merge "Fix unused param warning"
2012-08-08 15:27:45 -07:00
Stephen Hines
65c37c81ba
Merge "Fixed an unused param warning"
2012-08-08 15:27:34 -07:00
Stephen Hines
b3a5343e3e
Merge "Fixed a discarded const qualifier warning"
2012-08-08 15:27:25 -07:00
Stephen Hines
f889f0dba4
Merge "Trivial signed/unsigned warning fix for adbd"
2012-08-08 15:27:17 -07:00
Stephen Hines
e551055e17
Merge "Fix signed/unsigned comparison warning"
2012-08-08 15:27:09 -07:00
Stephen Hines
80bcb48930
Merge "Fixed un-initialized variable warnings"
2012-08-08 15:26:49 -07:00
Jean-Baptiste Queru
ff5c802e6c
am faad67fa: am ef3f7fa3: Merge "Set the SELinux security label on new directories."
...
* commit 'faad67fac68642ca039fe5c29099acebf546f5ee':
Set the SELinux security label on new directories.
2012-08-08 14:06:27 -07:00
Jean-Baptiste Queru
21c2c8493a
am b9994d22: am 8261d271: Merge "restorecon tombstone directory."
...
* commit 'b9994d22274d95a2234cbd8be8338d5e0c16a290':
restorecon tombstone directory.
2012-08-08 14:06:26 -07:00
Elliott Hughes
8268a75e86
am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT"
...
* commit 'c5db017cc3d30b1b15544ca9889e66890710f93c':
Conditionally use SIGSTKFLT
2012-08-08 14:06:25 -07:00
Jean-Baptiste Queru
e0346fa7fa
am b2a32cb9: am 8fb0caa7: Merge "config_mbr: Fix integer overflow"
...
* commit 'b2a32cb99099b705578f40d1ba509bd48db140af':
config_mbr: Fix integer overflow
2012-08-08 14:06:24 -07:00
Jean-Baptiste Queru
faad67fac6
am ef3f7fa3: Merge "Set the SELinux security label on new directories."
...
* commit 'ef3f7fa32b451bd6f180c4c1586a98cee41aa296':
Set the SELinux security label on new directories.
2012-08-08 14:04:22 -07:00
Jean-Baptiste Queru
b9994d2227
am 8261d271: Merge "restorecon tombstone directory."
...
* commit '8261d27115746f58a6bbf37e6dcf18a093ee8c85':
restorecon tombstone directory.
2012-08-08 14:04:21 -07:00
Elliott Hughes
c5db017cc3
am 63b2c577: Merge "Conditionally use SIGSTKFLT"
...
* commit '63b2c577526d0c7ae4e90e54bf0f0befb0294456':
Conditionally use SIGSTKFLT
2012-08-08 14:04:20 -07:00
Jean-Baptiste Queru
b2a32cb990
am 8fb0caa7: Merge "config_mbr: Fix integer overflow"
...
* commit '8fb0caa73b947ec801a5ae975f46560fb813baed':
config_mbr: Fix integer overflow
2012-08-08 14:04:09 -07:00
Jeff Sharkey
1d4214900c
Merge "Include to define uid_t." into jb-mr1-dev
2012-08-08 14:00:15 -07:00
Jeff Sharkey
46ac0ef00b
Include to define uid_t.
...
Change-Id: I02d36346fc3c6236bd64309798b434405f8dfef7
2012-08-08 13:59:34 -07:00
Jean-Baptiste Queru
ef3f7fa32b
Merge "Set the SELinux security label on new directories."
2012-08-08 13:42:20 -07:00
Jean-Baptiste Queru
8261d27115
Merge "restorecon tombstone directory."
2012-08-08 13:41:41 -07:00
Elliott Hughes
63b2c57752
Merge "Conditionally use SIGSTKFLT"
2012-08-08 13:40:17 -07:00
Jean-Baptiste Queru
8fb0caa73b
Merge "config_mbr: Fix integer overflow"
2012-08-08 13:18:29 -07:00
Jeff Sharkey
f2e4d7ff03
Merge "Native utils for working with user and app IDs." into jb-mr1-dev
2012-08-08 10:45:05 -07:00
Jeff Sharkey
9509d27252
Native utils for working with user and app IDs.
...
Bug: 6925012
Change-Id: I56f18826fd324f60b6e446cebd30719258e40990
2012-08-07 17:56:48 -07:00
Ravi Nagarajan
a8afd723a4
Allow AID_BLUETOOTH to update persist.service.bdroid
...
When devices are provisioned, bd address path is set in ro.bt.bdaddr_path.
On devices where this property is not present, a random bd address is
generated and saved to the property: persist.service.bdroid.bdaddr
This change allows bluetooth process to update this property
bug 6885309
Change-Id: I2e8a2471a0e890da82e6bbec6a2ef67ec8e1f8f4
2012-08-06 23:56:45 -07:00
Colin Cross
60479afa18
Merge changes I943b04dd,I645b6a2d into jb-mr1-dev
...
* changes:
init: fix return value for android uid/gid check
init.rc: make last_kmsg readable only by user system and group log
2012-08-03 13:57:20 -07:00
Veeren Mandalia
4f97fd91e3
init: fix return value for android uid/gid check
...
Now get_android_id function returns -EINVAL if the uid/gid is not in the list
of android ids. This will allow ueventd to catch invalid ids and report the
error.
Change-Id: I943b04dd64d518891623e1ee2d561b8061af4863
Signed-off-by: Veeren Mandalia <v.mandalia@sta.samsung.com>
2012-08-03 13:16:05 -07:00
Colin Cross
b35e36e5a9
init.rc: make last_kmsg readable only by user system and group log
...
chown /proc/last_kmsg to user system group log during init, and
chmod it to readable only by user and group.
Bug: 6925227
Change-Id: I645b6a2d4fecc01a2bd4b7fa7ed6aae3ef638cb9
2012-08-03 12:25:25 -07:00
James Dong
b2b46dc48c
Merge "Added a cmd for configuring number of video buffers for camera, if supported" into jb-mr1-dev
2012-08-02 17:01:34 -07:00
Doug Zongker
cba158a6f6
Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc." into jb-mr1-dev
2012-08-02 15:15:42 -07:00
Doug Zongker
dd7fafb34b
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
...
Bug: 6918260
Change-Id: I5d4af6314fded027952941110a520dc9aa234a14
2012-08-02 14:52:39 -07:00
Benoit Goby
f4de078388
libusbhost: Fix USB device discovery on boot
...
On some devices, /dev/bus/usb does not exist on boot, it is only created
when the otg port is in host mode. Use inotify to detect when /dev/bus/usb
is created and then start watching subdirectories.
Change-Id: Ic1472a5ea7a7118cdbb560cc7071ade9bcee753a
2012-08-02 12:20:25 -07:00
Benoit Goby
6cc883ca09
libusbhost: Fix possible missed "device added" notification
...
When a new bus is added, check for existing devices in the bus
directory, since devices may have been added before calling
inotify_add_watch.
Also add missing inotify_rm_watch calls.
Change-Id: Ie69fc995a3e8b18431099b252be86f0054fe5531
2012-08-02 12:19:30 -07:00
Edwin Vane
62f9ffac1a
Fix unused param warning
...
libsuspend had only a single warning in the clang build. Fixing it to
make the build clean.
Change-Id: Iaac5f9144b6e6cb122141c6416056c1b2c9aa98e
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-02 10:40:12 -04:00
Edwin Vane
a5db95da38
Fixed an unused param warning
...
libnetutils had a single warning. Fixed it to make it clean.
Change-Id: I9297e556657a38dbdd7d1d0ac4bc3574801d5ac9
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-02 10:40:12 -04:00
Edwin Vane
de7f1ad86f
Fixed a discarded const qualifier warning
...
Change-Id: I9007924d0bf49705363aa130e6e588a9e0ccdc31
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
2012-08-02 09:20:51 -04:00
Edwin Vane
ae06933cde
Trivial signed/unsigned warning fix for adbd
...
Change-Id: Icd674006bb2b526166960b4f90eb274030d80439
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
2012-08-02 09:17:53 -04:00
James Dong
6c4c66a767
Added a cmd for configuring number of video buffers for camera, if supported
...
o currently, only available in Camera2
Change-Id: Id9bf157496209af9be65d147e70aa4830158c88d
2012-08-01 17:00:12 -07:00
Chris Dearman
7ac420972a
Conditionally use SIGSTKFLT
...
Change-Id: I555b33b5a93df332c556944a1c00fff417825247
2012-08-01 15:51:09 -07:00
Edwin Vane
97d2aef6d2
Fix signed/unsigned comparison warning
...
Trivial warning fix.
Change-Id: I93b905b34155214fc2d211a0d9319f06b67fa193
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Ariel J Bernal <ariel.j.bernal@intel.com>
2012-08-01 16:36:06 -04:00
Tareq A. Siraj
8bcfb8bcff
Fixed un-initialized variable warnings
...
These un-initialized variables were being used before initialized.
Change-Id: I80c94c5e0c2e959834b99618549377bfb3607272
Author: Tareq A. Siraj <tareq.a.siraj@intel.com>
2012-08-01 15:15:11 -04:00
Dima Zavin
35fc46d8e3
am 018227f5: am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."
...
* commit '018227f5394c3126f4a858596cb85dee1893b895':
Modify init.rc and init.goldfish.rc for SE Android.
2012-08-01 09:52:28 -07:00
Dima Zavin
018227f539
am ce76e2d0: Merge "Modify init.rc and init.goldfish.rc for SE Android."
...
* commit 'ce76e2d00e63339083ea693db33de05cbba5600e':
Modify init.rc and init.goldfish.rc for SE Android.
2012-08-01 09:49:59 -07:00
Dima Zavin
ce76e2d00e
Merge "Modify init.rc and init.goldfish.rc for SE Android."
2012-08-01 09:14:42 -07:00
Ed Heyl
3cac204d35
Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
2012-07-28 11:48:12 -07:00
The Android Open Source Project
ce8ffda063
am aeec25da: Reconcile with jb-mr0-release
...
* commit 'aeec25dabd57ec39208b7e3adefab649e51b86e0':
2012-07-27 15:43:29 -07:00
The Android Open Source Project
aeec25dabd
Reconcile with jb-mr0-release
...
Change-Id: I0fa1791c1e0a7c501af9e0d87f1263207e134310
2012-07-27 14:53:36 -07:00