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

9694 Commits

Author SHA1 Message Date
Elliott Hughes 545b127a78 am d3ef8f41: am 2520f1eb: am 37d7fdbb: Merge "Maps output now marks the fault address location." 
* commit 'd3ef8f416b9cd9609a0002e186fb2ab45a0a312d':
  Maps output now marks the fault address location.
 2014-06-20 18:19:44 +00:00
Elliott Hughes d3ef8f416b am 2520f1eb: am 37d7fdbb: Merge "Maps output now marks the fault address location." 
* commit '2520f1eb9323ba2129c001cf5658c9e7912ae2a1':
  Maps output now marks the fault address location.
 2014-06-20 16:45:04 +00:00
Elliott Hughes 2520f1eb93 am 37d7fdbb: Merge "Maps output now marks the fault address location." 
* commit '37d7fdbb7491aa91b56035285cb56c0630dd5909':
  Maps output now marks the fault address location.
 2014-06-20 16:42:06 +00:00
JP Abgrall 2181407511 Merge "[HACK]fs_mgr: force recovery+wipe if data looks wiped" 2014-06-20 02:15:46 +00:00
JP Abgrall 4bb7bba118 [HACK]fs_mgr: force recovery+wipe if data looks wiped 
We do the recovery+wipe if
 - the mount fails and
 - the partition is forceencrypt
 - the partition seems wiped (== the 1st 4KB are all 0x00 or 0xFF).

This is a hack until we get the flashstation up and running with f2fs.
Bug: 15731906

The alternative would be for the user to manually enter
recovery and wipe his device.

Bug: 15747366
Change-Id: Ic8f3ef59f3d7d01d5d93d8e4c01502080f422157
Signed-off-by: JP Abgrall <jpa@google.com>
 2014-06-19 22:12:20 -07:00
Elliott Hughes 37d7fdbb74 Merge "Maps output now marks the fault address location." 2014-06-20 02:04:52 +00:00
Brigid Smith 2e8290463e Maps output now marks the fault address location. 
If the fault address is not within a mapped region, it logs an error
message after the output.  Otherwise, it prefixes the location of the
fault address with "--->" to make it easier to locate.

Change-Id: I330adaade4402ffeb09f1a6d34a944c2f054d06d
 2014-06-20 09:30:16 -07:00
Riley Andrews 53f24c2f94 am aab0d57d: am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc" 
* commit 'aab0d57d18b202d059fec57c832d6443faff6ee3':
  Make indentation sane in init.rc
 2014-06-20 01:39:27 +00:00
Riley Andrews aab0d57d18 am 94fa2005: am 4f5392cb: Merge "Make indentation sane in init.rc" 
* commit '94fa20058fbd0e4f7e3c6d1381cdb9718dd90cde':
  Make indentation sane in init.rc
 2014-06-20 01:35:47 +00:00
Riley Andrews 94fa20058f am 4f5392cb: Merge "Make indentation sane in init.rc" 
* commit '4f5392cb6c09618b968a4c86bbde079bef57afd1':
  Make indentation sane in init.rc
 2014-06-20 01:32:24 +00:00
Riley Andrews 4f5392cb6c Merge "Make indentation sane in init.rc" 2014-06-20 00:06:24 +00:00
Riley Andrews 6dfdc7cd0c Make indentation sane in init.rc 
Change-Id: Ic632fbe1423eeef7ec958877d74db7b87fc385c6
 2014-06-19 17:13:30 -07:00
JP Abgrall 188fdd1c0f Merge "fastboot: Allow searching for needed dynamic libs in '.' (F2FS)" 2014-06-19 20:37:59 +00:00
JP Abgrall 436abebf8c fastboot: Allow searching for needed dynamic libs in '.' (F2FS) 
Currently the default rpath includes $ORIGIN/../lib
So we throw in '.' which should help distributions of fastboot.

readelf -d $(which fastboot)|grep RPATH
 0x0000000f (RPATH) Library rpath: [$ORIGIN/../lib:.]

Bug: 15731906
Change-Id: I2f4345d178e5b3c87f6f159faf105ae30f3b52eb
Signed-off-by: JP Abgrall <jpa@google.com>
 2014-06-19 14:47:19 -07:00
Ying Wang a3098b9ada Merge "Store libf2fs_fmt_host_dyn on the build server." 2014-06-19 20:37:59 +00:00
Ying Wang 6b048ce839 Store libf2fs_fmt_host_dyn on the build server. 
It will be dynamically loaded by fastboot.

Bug: 15731906
Change-Id: Iff6f2b745b4ffd2c5fe343160b3efb8dcd5702fa
 2014-06-19 14:44:23 -07:00
Elliott Hughes ec249c84ba am f0a4855c: am c28e3c31: am a4fb975e: Merge "Fix debuggerd "format \'%p\'" build breakage." 
* commit 'f0a4855c2f6331690bee33db9b5a83de816921bb':
  Fix debuggerd "format '%p'" build breakage.
 2014-06-19 20:21:01 +00:00
Elliott Hughes 9363b2668e am e8b65473: am dc0261f9: am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes." 
* commit 'e8b654733931eaf5c63d816ae41f7d38ac146e36':
  Updated non-ARM archs to reflect logging changes.
 2014-06-19 20:21:00 +00:00
Elliott Hughes 787a2a697e Fix debuggerd "format '%p'" build breakage. 
Change-Id: I589d44485e55c23d1f1a6edfa8310a90cac2429e
 2014-06-19 12:42:01 -07:00
Elliott Hughes f0a4855c2f am c28e3c31: am a4fb975e: Merge "Fix debuggerd "format \'%p\'" build breakage." 
* commit 'c28e3c310c3815dbf1ebdcde82b1971984aeeb7f':
  Fix debuggerd "format '%p'" build breakage.
 2014-06-19 18:57:06 +00:00
Elliott Hughes c28e3c310c am a4fb975e: Merge "Fix debuggerd "format \'%p\'" build breakage." 
* commit 'a4fb975e3d85b7668aa6f564c6a0d4d85f550f2e':
  Fix debuggerd "format '%p'" build breakage.
 2014-06-19 18:53:10 +00:00
Elliott Hughes e8b6547339 am dc0261f9: am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes." 
* commit 'dc0261f9d159cb120f450ff5665fee36b65be38b':
  Updated non-ARM archs to reflect logging changes.
 2014-06-19 18:43:16 +00:00
Elliott Hughes dc0261f9d1 am 030ba83c: Merge "Updated non-ARM archs to reflect logging changes." 
* commit '030ba83c28c4d6faa23ccb20d1001b9be6464c3a':
  Updated non-ARM archs to reflect logging changes.
 2014-06-19 18:39:38 +00:00
Elliott Hughes e6880b7453 resolved conflicts for merge of 476b069a to master 
Change-Id: I647232e584ba29c0a7b57e1f6e520f05f7986bb1
 2014-06-19 11:15:45 -07:00
Elliott Hughes 476b069aa0 am a0619be0: am 32cd6ec6: Merge "Removed log.quiet and log = NULL cases from debuggerd." 
* commit 'a0619be0f6180074109c8b7097147a11b9934953':
  Removed log.quiet and log = NULL cases from debuggerd.
 2014-06-19 18:08:48 +00:00
Elliott Hughes a0619be0f6 am 32cd6ec6: Merge "Removed log.quiet and log = NULL cases from debuggerd." 
* commit '32cd6ec6a71a2e022fc39278287f1b8751338b0e':
  Removed log.quiet and log = NULL cases from debuggerd.
 2014-06-19 18:05:02 +00:00
Elliott Hughes 32cd6ec6a7 Merge "Removed log.quiet and log = NULL cases from debuggerd." 2014-06-19 17:43:22 +00:00
Brigid Smith 50eb546ec1 Removed log.quiet and log = NULL cases from debuggerd. 
Now the functionality implemented by these semi-confusing cases has been
replaced with the same logtype enum behavior that is easier to
understand, and cases that used log-looking behavior to print to logcat
(when log = NULL) now use the more transparent ALOGE/ALOGD functions.

Change-Id: I7e38f2d4ca74a828df4d2266b3ea34edd3c6f5bb
 2014-06-19 10:59:01 -07:00
Eric Laurent ce30de3553 audio: added new audio formats. 
Bug: 9428304.

Change-Id: Ife1f6968a8d079b477b5afb5e5cf544e8fe3298f
 2014-06-19 09:55:54 -07:00
Colin Cross b10fb88e1e am d7d9b6fc: am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell" 
* commit 'd7d9b6fcaa415ea6251e45d84b95a95740ea807e':
  adb: Add USB vendor ID for Honeywell
 2014-06-19 15:48:25 +00:00
Colin Cross d7d9b6fcaa am f02fd9f0: am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell" 
* commit 'f02fd9f0b061d29bb872664479ed4a5949d23ac9':
  adb: Add USB vendor ID for Honeywell
 2014-06-19 15:44:14 +00:00
Colin Cross f02fd9f0b0 am 5e504a4e: Merge "adb: Add USB vendor ID for Honeywell" 
* commit '5e504a4e64824e3e7132b2e4b3f68c02f417466e':
  adb: Add USB vendor ID for Honeywell
 2014-06-19 15:40:59 +00:00
Colin Cross bb8aec4175 am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values" 
* commit '08c704a0fe64927fa8618c576c20e39de7f1aa19':
  Use inet_ntoa to display ipaddr and mask values
 2014-06-19 00:57:07 +00:00
Colin Cross 08c704a0fe am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values" 
* commit '1a9e9c203bd2240e7b7768c74c5da1bcf107f159':
  Use inet_ntoa to display ipaddr and mask values
 2014-06-19 00:52:40 +00:00
Colin Cross 1a9e9c203b am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values" 
* commit '974a4f3e00861da9aa1301efd5c349c3e2a5cf07':
  Use inet_ntoa to display ipaddr and mask values
 2014-06-19 00:49:10 +00:00
Elliott Hughes 030ba83c28 Merge "Updated non-ARM archs to reflect logging changes." 2014-06-19 00:18:04 +00:00
Brigid Smith e17f267b2a Updated non-ARM archs to reflect logging changes. 
Change-Id: I0af865881c19ea4a57ec1aa9455bc32c08a60d75
 2014-06-19 11:33:38 -07:00
Colin Cross 974a4f3e00 Merge "Use inet_ntoa to display ipaddr and mask values" 2014-06-19 00:18:04 +00:00
Bhanu Chetlapalli 9875ee97c7 Use inet_ntoa to display ipaddr and mask values 
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Iee72a6b987e4ec1c720e925b59e9e2631ae978e5
 2014-06-18 17:24:04 -07:00
Ying Wang fd9cfb4c22 am 68d97430: am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed." 
* commit '68d97430dd2cc25bb753df748d859415520a7dcb':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
 2014-06-18 23:03:48 +00:00
Ying Wang 68d97430dd am 4924d10a: Merge "Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed." 
* commit '4924d10ae04574a15d94c6812153321af59a3e5b':
  Regenerate init.environ.rc if PRODUCT_BOOTCLASSPATH changed.
 2014-06-18 22:59:02 +00:00
Elliott Hughes a4fb975e3d Merge "Fix debuggerd "format '%p'" build breakage." 2014-06-18 22:47:59 +00:00
Elliott Hughes e901c1bf8a Fix debuggerd "format '%p'" build breakage. 
Change-Id: I589d44485e55c23d1f1a6edfa8310a90cac2429e
 2014-06-19 11:46:27 -07:00
Colin Cross 5e504a4e64 Merge "adb: Add USB vendor ID for Honeywell" 2014-06-18 22:47:59 +00:00
DanielMo 8c4c8e8988 adb: Add USB vendor ID for Honeywell 
Change-Id: Ib92eca23a6c75ec9323bb1b0e7d7f8cd5f9ca207
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
 2014-06-19 16:02:14 +08:00
Mark Salyzyn 4700dfa0fb am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize" 
* commit '8d782f5170960f023a77be656e60398390aa58aa':
  logcat: test: modernize
 2014-06-18 20:45:43 +00:00
Mark Salyzyn 8d782f5170 am 3f55d2f4: Merge "logcat: test: modernize" 
* commit '3f55d2f4e69dd155d558fc2aa38e6f9bb0900152':
  logcat: test: modernize
 2014-06-18 20:42:26 +00:00
Nick Kralevich 4224edf51d am 89e4fad0: am 4e6aa6a2: Merge "adbd: unconditionally call setgroups" 
* commit '89e4fad09e1ae765ab0be1580a468bc0837ef7e4':
  adbd: unconditionally call setgroups
 2014-06-18 20:07:54 +00:00
Nick Kralevich 89e4fad09e am 4e6aa6a2: Merge "adbd: unconditionally call setgroups" 
* commit '4e6aa6a227401d8b56c9b149719b1e0de6afd6e8':
  adbd: unconditionally call setgroups
 2014-06-18 20:05:41 +00:00
JP Abgrall 93a67779dc Merge "fsmgr: support multiple fs-types/mountpoint" 2014-06-18 19:24:54 +00:00