openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,365 Commits 2 Branches 1 Tag 197 MiB
Commit Graph

547 Commits

Author SHA1 Message Date
Elliott Hughes b70375abc2 resolved conflicts for merge of ec9e5891 to master 
Change-Id: I704e3159d529e436e060cb66c1739ef8e7b612d4
 2014-01-16 14:42:35 -08:00
Elliott Hughes ec9e5891ac am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup." 
* commit '8940c0a07f8d6682712e2d2ee387e78096602f99':
  system/core 64-bit cleanup.
 2014-01-16 22:11:49 +00:00
Elliott Hughes 97373bbc71 am 7cd15614: Merge "system/core 64-bit cleanup." 
* commit '7cd1561410473c71d40cec822fb53a282b5b3279':
  system/core 64-bit cleanup.
 2014-01-16 14:05:24 -08:00
Elliott Hughes ccecf14254 system/core 64-bit cleanup. 
This cleans up most of the size-related problems in system/core.
There are still a few changes needed for a clean 64-bit build,
but they look like they might require changes to things like the
fastboot protocol.

Change-Id: I1560425a289fa158e13e2e3173cc3e71976f92c0
 2014-01-16 12:54:18 -08:00
Nick Kralevich 39e63b53bc am 42acb531: Merge "Remove obsolete vdc call." into klp-modular-dev 
* commit '42acb5314c8fb01f426e946392c248fde3371aff':
  Remove obsolete vdc call.
 2014-01-15 03:22:22 +00:00
Nick Kralevich 225459a5da Remove obsolete vdc call. 
Since ca8e66a8b0, init has
been handling reboots and filesystem unmounts. Remove obsolete
call to vdc.

Bug: 12504045
Change-Id: If8704ca042cb3a68857743b9973e48c52e7eb881
 2014-01-14 16:38:45 -08:00
Colin Cross ccfa8988bb am 6f8ddbbb: am 3e8bb3ff: am e0e7595f: am e76343ef: Merge "Emerson USB ID" 
* commit '6f8ddbbbe8ed2ff56a015f503f8d74431eb882dc':
  Emerson USB ID
 2014-01-12 07:20:13 +00:00
Colin Cross e0e7595f3c am e76343ef: Merge "Emerson USB ID" 
* commit 'e76343ef72458aff8fdc25c57f4e84407c05a2f2':
  Emerson USB ID
 2014-01-11 23:09:48 -08:00
Colin Cross e76343ef72 Merge "Emerson USB ID" 2014-01-12 07:05:04 +00:00
Jon Sawyer 6e39bace17 Emerson USB ID 
Adds Emerson's USB id to the known USB Devices.

Change-Id: If6115c2551c1f30a5c190690f2aeaaf2adff7ee1
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
 2014-01-11 22:59:18 -08:00
Colin Cross 4f3c6aed7b am 3fb5ebc5: am 3794c96f: am c121c69b: am b0751101: Merge "HP USB ID" 
* commit '3fb5ebc565f1550d61c4afb4ae6f9afa73cf12b3':
  HP USB ID
 2014-01-09 18:06:41 +00:00
Colin Cross c121c69b85 am b0751101: Merge "HP USB ID" 
* commit 'b0751101b090a8732c62ad261fa44e5d6a69a2cc':
  HP USB ID
 2014-01-09 09:59:30 -08:00
Jon Sawyer 5ff167ca11 HP USB ID 
Adds HP's USB id to the know USB Devices

Change-Id: I975126f3ae5e53f25e18dea7cc43c29076bfc965
Signed-off-by: Jon Sawyer <jon@cunninglogic.com>
 2014-01-08 08:14:26 -08:00
Colin Cross 1241d5b9d2 am b1b187f7: am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ... 
* commit 'b1b187f7c870a5267ef9d7a4476e281cd6ccffc7':
  adb: Add USB vendor ID for YotaDevices
  adb: Add USB vendor ID for TechFaith
  adb: Add USB vendor ID for Rockchip
  adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
  adb: Add USB vendor ID for Allwinner
  adb: Add USB vendor ID for Amlogic
  added Gigaset's USB vendor ID
  adb: alphabetically sort usb vendors lists
 2014-01-06 20:56:50 +00:00
Colin Cross d8f74f1b3e am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ... 
* commit '491ecd0b7275a98b7fda9b1e807724f7f06b1469':
  adb: Add USB vendor ID for YotaDevices
  adb: Add USB vendor ID for TechFaith
  adb: Add USB vendor ID for Rockchip
  adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
  adb: Add USB vendor ID for Allwinner
  adb: Add USB vendor ID for Amlogic
  added Gigaset's USB vendor ID
  adb: alphabetically sort usb vendors lists
 2014-01-06 12:23:30 -08:00
DanielMo c1b6b153dc adb: Add USB vendor ID for YotaDevices 
Change-Id: Id8bec8a35edd0d21ae52e8469f7a65b5f4433bc2
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
 2014-01-06 12:16:40 -08:00
DanielMo 402c2b9888 adb: Add USB vendor ID for TechFaith 
Change-Id: Ied42e4d011b736ee990ed75e7d81bc6a16db47f9
 2014-01-06 12:16:40 -08:00
DanielMo d0057c006b adb: Add USB vendor ID for Rockchip 
Change-Id: Iea3f7cc6ed463684fe30a73c39445b3ca36854d9
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
 2014-01-06 12:16:39 -08:00
DanielMo fdd189c64e adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd. 
Change-Id: Ic7f7c984db19050d2ce4da8ae87683ce42dc9094
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
 2014-01-06 12:16:39 -08:00
DanielMo 63f0f5117b adb: Add USB vendor ID for Allwinner 
Change-Id: Ic77d5f71c9e329e33cd31fa0854e692ad794a609
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
 2014-01-06 12:16:39 -08:00
DanielMo d5dab6d5f8 adb: Add USB vendor ID for Amlogic 
Change-Id: I35fad82214f2b5a82b0150821326aaea15784de1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
 2014-01-06 12:16:39 -08:00
Volker Moesker 319d8c1d1f added Gigaset's USB vendor ID 
Change-Id: Iebb0f352eec4530ee1e972527fc76bbb9dad5cc3
Signed-off-by: Volker Moesker <volker.moesker@gigaset.com>
 2014-01-06 12:16:29 -08:00
Colin Cross 293717c364 adb: alphabetically sort usb vendors lists 
Sort the lists of usb vendor ids alphabetically to reduce future
conflicts.

Change-Id: I682c18a1d97adf3a4aa9c00de9fed932c83e4646
 2014-01-06 12:12:39 -08:00
Colin Cross 0d123f21e1 am 2bd34772: am 42fb1783: am 4600d80c: am e1095e1d: Merge "Modify BYD\'s USB Vendor ID" 
* commit '2bd34772340174e844bd4ff1f3e2096d5a7e2cf8':
  Modify BYD's USB Vendor ID
 2014-01-03 21:06:41 +00:00
Colin Cross 4600d80cef am e1095e1d: Merge "Modify BYD\'s USB Vendor ID" 
* commit 'e1095e1da12de9d6dc219f497f7c19d1c1f7a41b':
  Modify BYD's USB Vendor ID
 2014-01-03 12:58:31 -08:00
Colin Cross e1095e1da1 Merge "Modify BYD's USB Vendor ID" 2014-01-03 20:53:22 +00:00
Nick Kralevich dd82e96a33 am 4bacd1fb: am 4af0c74e: am 8be1ccff: am fcf3d207: Merge "adb: configure /system file permission with fs_config" 
* commit '4bacd1fb6b278ce5efd1752d2c6fb363eef68add':
  adb: configure /system file permission with fs_config
 2014-01-03 19:11:42 +00:00
Nick Kralevich 8be1ccff87 am fcf3d207: Merge "adb: configure /system file permission with fs_config" 
* commit 'fcf3d207c51f1e734137a08ae2fdb1bb37a50b87':
  adb: configure /system file permission with fs_config
 2014-01-03 11:04:02 -08:00
Liang Cheng 20d33f4d99 adb: configure /system file permission with fs_config 
adbd changes the permissions of files uploaded by copying
owner's permission to group and other. This causes kernel
load failure if any changes are made to kernel modules
followed by ``adb push'' or ``adb sync'' because file mode
644 would become 666.

The change uses fs_config to get the target mode of files.

In addition, the SELinux file label is set incorrectly
on synced files. Set the label properly.

Change-Id: I354db848f39adfbf189d7e8d3b028e8d763c772f
Signed-off-by: Liang Cheng <licheng@nvidia.com>
Bug: 12264775
 2014-01-02 20:26:18 -08:00
Nick Kralevich 39ea00bf9d am 4639ae45: am a0ce4e28: am 98fdcfa9: am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets." 
* commit '4639ae452e7d22343053c5127ecb44ef19b7baf2':
  adb: Check sender's socket id when receiving packets.
 2013-12-19 19:00:14 +00:00
Nick Kralevich 98fdcfa981 am 67cb61ee: Merge "adb: Check sender\'s socket id when receiving packets." 
* commit '67cb61ee5a8b8f5c967361430fff250e76c3a1dc':
  adb: Check sender's socket id when receiving packets.
 2013-12-19 10:38:02 -08:00
David 'Digit' Turner 818d641c42 adb: Check sender's socket id when receiving packets. 
handle_packet() in adb.c didn't check that when an A_WRTE packet is
received, the sender's local-id matches the socket's peer id.

This meant that a compromised adbd server could sent packets to
the host adb server, spoofing the identity of another connected
device if it could "guess" the right host socket id.

This patch gets rid of the issue by enforcing even more checks
to ensure that all packets comply with the description in
protocol.txt.

+ Fix a bug where closing a local socket associated with a
  remote one would always send an A_CLSE(0, remote-id, "")
  message, though protocol.txt says that should only happen
  for failed opens.

  The issue was that local_socket_close() called
  remote_socket_close() after clearing the remote socket's
  'peer' field.

  The fix introduces a new asocket optional callback,
  named 'shutdown' that is called before that, and is
  used to send the A_CLSE() message with the right ID
  in remote_socket_shutdown().

  Also add some code in handle_packet() to detect
  invalid close commands.

Change-Id: I9098bc8c6e81f8809334b060e5dca4fc92e6fbc9
 2013-12-16 17:58:08 +01:00
Mark Salyzyn aa25ede607 Merge "adb: deprecate legacy log service interface" 2013-12-10 21:21:11 +00:00
Nick Kralevich 3909b78f2c am 81b488e6: am a91a47c3: am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client 
* commit '81b488e6876ca5af1258473c244b4b64036fb458':
  Fix overflow in adb_client
 2013-12-10 21:09:07 +00:00
Nick Kralevich a91a47c30c am b2dfa7ec: am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client 
* commit 'b2dfa7ece7fb69d2ce5ae517eb35492beb646385':
  Fix overflow in adb_client
 2013-12-10 12:42:20 -08:00
Mark Salyzyn c66a7537df adb: deprecate legacy log service interface 
Change-Id: If96019cc13b3d7a4dcd7785c7137e0cbcc622981
 2013-12-10 12:39:40 -08:00
Nick Kralevich b2dfa7ece7 am 02d90b92: am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client 
* commit '02d90b92ce65ad4e7f49565f0e97373e1d8b0fbf':
  Fix overflow in adb_client
 2013-12-10 12:39:32 -08:00
Nick Kralevich 02d90b92ce am 33e7f915: am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client 
* commit '33e7f915d6a27880dd4c4c0709dcc921f549eea2':
  Fix overflow in adb_client
 2013-12-10 12:37:32 -08:00
Nick Kralevich 33e7f915d6 am 54a80bcf: am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client 
* commit '54a80bcf88060b21f527c631c7ec911171bdb13f':
  Fix overflow in adb_client
 2013-12-10 12:31:17 -08:00
Nick Kralevich 54a80bcf88 am cd072e94: am ba104fb7: am e975716e: am 03d4eb29: am d63fb078: am e89e09dd: Fix overflow in adb_client 
* commit 'cd072e94cf7e546cd6d333cd65641edcd69402b7':
  Fix overflow in adb_client
 2013-12-10 12:29:05 -08:00
Nick Kralevich 03d4eb2900 am d63fb078: am e89e09dd: Fix overflow in adb_client 
* commit 'd63fb078aea697c536b19c03d29d4dde4ac087fc':
  Fix overflow in adb_client
 2013-12-10 12:17:45 -08:00
Nick Kralevich d63fb078ae am e89e09dd: Fix overflow in adb_client 
* commit 'e89e09dd2b9b42184973e3ade291186a2737bced':
  Fix overflow in adb_client
 2013-12-10 12:14:44 -08:00
Nick Kralevich e89e09dd2b Fix overflow in adb_client 
Change-Id: I7f8582bd8a69d61ce47d11a9ffd0e901fc371037
Credit: Joshua Drake
Bug: 12060953
 2013-12-10 10:18:10 -08:00
Mark Salyzyn 5f64d528be adb: regression from Move list.c to inlines 
Change-Id: I057dbe3db80b1460f774e9f9ade11e0929529ec6
 2013-12-06 15:50:48 -08:00
JP Abgrall 58c5303649 adb: Don't clobber block devices during push 
In the past, an adb push would ALWAYS unlink the target path.
Now, we only links and regular files (and links).
This allows the following to work:

   adb shell ls -l /dev/block/mmcblk0p8
     # brw------- root     root     179,   8 2013-11-28 07:43 mmcblk0p8
   adb push n7.jpa.mda.post_jb_encryption.raw  /dev/block/mmcblk0p8

Bug: 11984121
Change-Id: I982c7a1cd87986621f2bebdcb41c4e281f67f772
 2013-12-03 14:52:39 -08:00
Elliott Hughes 9259663cdb am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs." 
* commit 'f17f55914e18eb176ccc5bb8266b248ece8cb56b':
  Fix a bunch of small system/core bugs.
 2013-10-29 18:31:01 -07:00
Elliott Hughes 14e28d39f7 Fix a bunch of small system/core bugs. 
Missing frees in:
  adb/file_sync_client.c
  fastboot/fastboot.c
  libsparse/output_file.c

Missing closedirs in:
  adb/file_sync_service.c
  cpio/mkbootfs.c
  libcutils/dir_hash.c

Potential buffer overrun in:
  gpttool/gpttool.c

Incorrect NULL check in:
  libsparse/backed_block.c

Bug: https://code.google.com/p/android/issues/detail?id=61564
Change-Id: If97838a9e73a77aef7f416c31c237ce1fca4ce21
 2013-10-29 14:12:46 -07:00
Brian Carlstrom 406abdc8a2 am 5dadac50: am 87af04a4: Merge "Improve some adb error logging" 
* commit '5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7':
  Improve some adb error logging
 2013-10-28 14:30:26 -07:00
Brian Carlstrom 93c91fad77 Improve some adb error logging 
Bug: 11290643
Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848
 2013-10-27 16:56:55 -07:00
Nick Kralevich 0bf7924df1 am 91704522: Don\'t return immediately from reboot commands. 
* commit '917045222a69021eb36aea96708649c709685509':
  Don't return immediately from reboot commands.
 2013-10-24 12:39:29 -07:00