ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5197 commits 1 branch 0 tags 217 MiB
Commit graph

5197 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Kralevich
5cd723fa93 am eb6dd010: am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."" 
* commit 'eb6dd010b56bbca76f345967d55d0faab6c5fbf3':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
 2013-03-14 23:19:35 +00:00
Nick Kralevich
eb6dd010b5 am 9573a175: am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."" 
* commit '9573a1755c4ef0f6f86277fcf2ff95645bb1dfb4':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
 2013-03-14 16:16:40 -07:00
Nick Kralevich
9573a1755c am dbf4937b: Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."" 
* commit 'dbf4937b5a1ef4ceed49e13527f50514c510ebd4':
  Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."
 2013-03-14 16:14:06 -07:00
Jeff Sharkey
64b31d3698 am fb4f7ace: Add symlink to bugreport storage location. 
* commit 'fb4f7acefb31a51679cec194562c7aeb3922f728':
  Add symlink to bugreport storage location.
 2013-03-14 23:09:34 +00:00
Nick Kralevich
dbf4937b5a Merge "Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes."" 2013-03-14 22:28:24 +00:00
Nick Kralevich
76ba83cce2 Revert "init: Set ADDR_COMPAT_LAYOUT before spawning processes." 
This logic has been moved to platform/frameworks/base commit
8a0a929422682ba3eb6a205dc6c0638e68b909de and is no longer needed
here.

This reverts commit 01b1dee0ab.
 2013-03-14 15:23:30 -07:00
Jeff Sharkey
fb4f7acefb Add symlink to bugreport storage location. 
Change-Id: I16f024c24767cfa1f5800d568d39fb098a408127
 2013-03-14 14:27:38 -07:00
Sam Lin
461ead42fe am 91535cff: Merge "Add vendor IDs to adb" into jb-mr2-dev 
* commit '91535cff09af5b0181bffe64e97dcae9d24ba219':
  Add vendor IDs to adb
 2013-03-13 03:03:09 +00:00
Sam Lin
91535cff09 Merge "Add vendor IDs to adb" into jb-mr2-dev 2013-03-13 03:01:45 +00:00
Colin Cross
8f17ea6b78 am d4b360a2: am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes" 
* commit 'd4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf':
  mkbootimg: support 8192/16384 pagesizes
 2013-03-12 23:55:51 +00:00
Colin Cross
d4b360a2e8 am 1d77e6e4: am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes" 
* commit '1d77e6e4e3d304f86d0cfa2cfcf5266192420cae':
  mkbootimg: support 8192/16384 pagesizes
 2013-03-12 16:53:24 -07:00
Colin Cross
1d77e6e4e3 am 3960ec22: Merge "mkbootimg: support 8192/16384 pagesizes" 
* commit '3960ec226d07c7327ac6967a2977c521fd4884b6':
  mkbootimg: support 8192/16384 pagesizes
 2013-03-12 16:50:40 -07:00
Rom Lemarchand
914b65fcb9 am 451dd85f: liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY 
* commit '451dd85fb204b5015c461eabc78722abd1c4252a':
  liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY
 2013-03-12 23:12:16 +00:00
Colin Cross
3960ec226d Merge "mkbootimg: support 8192/16384 pagesizes" 2013-03-12 21:47:47 +00:00
Rom Lemarchand
451dd85fb2 liblogwrap: replace loops with calls to TEMP_FAILURE_RETRY 
Makes the code slightly more readable and avoids boilerplate.

Change-Id: I023d9a1e1de729deaec97c62a5ca7983b6918f94
 2013-03-12 08:55:38 -07:00
The Android Open Source Project
81ab2eb2c8 Reconcile with jb-mr2-release - do not merge 
Change-Id: If556a8aade619e94ef8cf3bfa2f65d4efa2c4550
 2013-03-12 07:15:17 -07:00
The Android Automerger
eba780c923 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-12 05:56:38 -07:00
Sam Lin
644b6afdac Add vendor IDs to adb 
Adding vendor IDs to adb for device partners:
  AnyDATA, Harris & Oppo

Change-Id: Ib8c5196c53599bd6eb077871cd95ccac935c42e7
 2013-03-12 20:19:53 +08:00
Jean-Baptiste Queru
758045fad5 am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '7398664de30cf953b791ab5aeeb37dfd57410698':
 2013-03-11 20:49:27 +00:00
Jean-Baptiste Queru
7398664de3 am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'c8b3fee48ca53150b38d84c70e2679f91d293efb':
 2013-03-11 13:44:39 -07:00
Jean-Baptiste Queru
c8b3fee48c am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'f9094401491ecee8e574b294a22e850bfc2b5043':
 2013-03-11 13:13:49 -07:00
Jean-Baptiste Queru
f909440149 am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '75f29709af6d053168402dd12cdf8b0a58b0c35e':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
 2013-03-11 13:00:54 -07:00
Jean-Baptiste Queru
75f29709af am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '09b43645514669b3ff8181b0a111bc14576e3699':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
 2013-03-11 12:47:27 -07:00
Jean-Baptiste Queru
09b4364551 am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '92b2cd23f708c9aeed146e995807dce080b57d1a':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
 2013-03-11 12:28:11 -07:00
Jean-Baptiste Queru
92b2cd23f7 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:23:26 -07:00
Dima Zavin
ac19623f88 am 53a02884: ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE 
* commit '53a0288463c3fd88fb7f2cfa37c0e985eb1870f4':
  ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE
 2013-03-11 18:15:56 +00:00
Dima Zavin
53a0288463 ueventd: allow platform devices to have just a /devices/ prefix - DO NOT MERGE 
When using device tree, platform devices may not have a
/devices/platform/ path prefix, but can be rooted in
/devices/.

Modify the platform device tracking code to store the device
path as well as the name. This way, when we create symlinks, we
can correctly skip the base platform device prefix and get to the
proper device node path.

Change-Id: I939ef8fbcb45c5c803cd9a054e40136a912efc72
Signed-off-by: Dima Zavin <dima@android.com>
 2013-03-11 11:13:17 -07:00
The Android Automerger
c1c4ad5609 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-11 05:57:41 -07:00
Ithamar R. Adema
81ce3a79ff mkbootimg: support 8192/16384 pagesizes 
By now these sizes are very common, so make sure we support them.

Change-Id: Ib1963fbabc4ec0b4623f2045a3cbeedffbad7ee8
Signed-off-by: Ithamar R. Adema <ithamar@upgrade-android.com>
 2013-03-10 14:11:10 +01:00
Elliott Hughes
f8c710670f am dd0d0e78: am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it" 
* commit 'dd0d0e78afb5b809983fe9cebac8cc5d54a284b6':
  Close adb_usb.ini after reading it
 2013-03-09 02:33:33 +00:00
Elliott Hughes
dd0d0e78af am 822ea9b3: am fd5c6b9f: Merge "Close adb_usb.ini after reading it" 
* commit '822ea9b3d1cf240b16135e1b5c3bd926c02d17d6':
  Close adb_usb.ini after reading it
 2013-03-08 18:32:02 -08:00
Elliott Hughes
822ea9b3d1 am fd5c6b9f: Merge "Close adb_usb.ini after reading it" 
* commit 'fd5c6b9f137940ce2d762c85dfdb4d2f1104f2bd':
  Close adb_usb.ini after reading it
 2013-03-08 18:30:44 -08:00
Elliott Hughes
fd5c6b9f13 Merge "Close adb_usb.ini after reading it" 2013-03-09 01:20:08 +00:00
Christopher Tate
8a1eb12a71 am 0c06eb50: DO NOT MERGE - Document new -obb flag for adb backup 
* commit '0c06eb5017e5888f0452da348d12fc92a767e45d':
  DO NOT MERGE - Document new -obb flag for adb backup
 2013-03-08 23:32:13 +00:00
Christopher Tate
0c06eb5017 DO NOT MERGE - Document new -obb flag for adb backup 
Now that adb backup handles OBB file backup/restore.

(Cherrypicked)

Change-Id: Ie92b546e3898b62d74f552ab577b7756ad176ee6
 2013-03-08 15:09:51 -08:00
JP Abgrall
9efab70fc5 am 7b8970c5: fastboot: add support for some obscure args. 
* commit '7b8970c577c788c9af582dac797c63b3134b201e':
  fastboot: add support for some obscure args.
 2013-03-08 02:06:57 +00:00
JP Abgrall
7b8970c577 fastboot: add support for some obscure args. 
Some devices use mkbootimg with weird args for which fastboot
only a hardcoded value.

Now fastboot recognizes those args.

Made handling of global vars more consistent.

Bug: 8341331
Change-Id: Ic09f148ccd0249f49935fdc63e517cf8ab2229bc
 2013-03-07 17:06:41 -08:00
Colin Cross
03544b3f18 am 2fa2dfd1: Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev 
* commit '2fa2dfd105204b84a7a32e8fe790793ba23c7f87':
  init: prevent action being added to the action_queue twice
 2013-03-07 22:41:26 +00:00
Colin Cross
2fa2dfd105 Merge "init: prevent action being added to the action_queue twice" into jb-mr2-dev 2013-03-07 22:38:34 +00:00
Doug Zongker
6dd79c1e5a am 598169e7: Merge "charger: accomodate minui change" into jb-mr2-dev 
* commit '598169e7687ea831a495f9fa7dd7677c740d64d3':
  charger: accomodate minui change
 2013-03-07 22:37:58 +00:00
Doug Zongker
598169e768 Merge "charger: accomodate minui change" into jb-mr2-dev 2013-03-07 22:33:51 +00:00
Colin Cross
a5064626de init: prevent action being added to the action_queue twice 
Property triggers may cause an action to be queued twice, resulting
in a loop in the action queue.  Keep actions that are not on the queue
in the list_empty state (act->qlist->next == act->qlist), and only
add them to the list if they are in that state.

Bug: 8335133
Change-Id: I3a3ec18176cf19cbaa3a45220a03c7560eacfe79
 2013-03-07 13:44:59 -08:00
Doug Zongker
12c45fb9be charger: accomodate minui change 
gr_text() now takes an argument requesting bold text instead of
regular.

Change-Id: I18b54f05ae4a89cb753fa5977a870f1bc827b963
 2013-03-07 13:35:23 -08:00
The Android Automerger
ee3308dab9 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-06 05:57:00 -08:00
Keun young Park
6a955d72ff am 4c8c35d0: Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev 
* commit '4c8c35d06ce6a673c6e015b809f94da0083cd4cc':
  move goldfish stuffs to device/generic/goldfish
 2013-03-06 00:40:53 +00:00
Keun young Park
4c8c35d06c Merge "move goldfish stuffs to device/generic/goldfish" into jb-mr2-dev 2013-03-06 00:36:31 +00:00
Alex Ray
00977e5833 am 81b5b5fb: sync: factor sw_sync functionality out of header 
* commit '81b5b5fb02a59a443877363b1451328c7ad11fb2':
  sync: factor sw_sync functionality out of header
 2013-03-05 23:58:55 +00:00
Alex Ray
81b5b5fb02 sync: factor sw_sync functionality out of header 
Change-Id: I13127abe1cd07cd52b35ff43902579478505ccf4
 2013-03-05 15:53:24 -08:00
Colin Cross
ed64c3ff53 am 95b087fa: am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'" 
* commit '95b087fa90c89b21d18268c84167d1407f9e7905':
  Fix issues where the filename is referred to as 'sideload'
 2013-03-05 21:05:05 +00:00
Colin Cross
bf6982cec4 am 7c646cd3: am af4ececc: am 515bed0e: Merge "run-as: set the SELinux security context." 
* commit '7c646cd3594283bc4aaf53a0b10143a76281270f':
  run-as:  set the SELinux security context.
 2013-03-05 21:05:05 +00:00