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

5315 Commits

Author SHA1 Message Date
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
Keun young Park f5eb803543 move goldfish stuffs to device/generic/goldfish 
- each files will be pulled in emulator.mk as PRODUCT_COPY_FILES

Change-Id: I4772e2fd863e6d2663f477c3acd8a90cb95b498a
 2013-03-05 11:16:36 -08:00
Colin Cross 95b087fa90 am 79d4381a: am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'" 
* commit '79d4381a8e838d7ddbeda5b7dc90e0c5bca5a8c6':
  Fix issues where the filename is referred to as 'sideload'
 2013-03-05 18:52:29 +00:00
Colin Cross 7c646cd359 am af4ececc: am 515bed0e: Merge "run-as: set the SELinux security context." 
* commit 'af4ececc7bd10aec1240acfbfe7756ab8ee16883':
  run-as:  set the SELinux security context.
 2013-03-05 18:52:28 +00:00
Colin Cross 79d4381a8e am 69f3ec84: Merge "Fix issues where the filename is referred to as \'sideload\'" 
* commit '69f3ec84cf4e9a1bf4c222b88b4413da407331b5':
  Fix issues where the filename is referred to as 'sideload'
 2013-03-05 10:27:41 -08:00
Colin Cross af4ececc7b am 515bed0e: Merge "run-as: set the SELinux security context." 
* commit '515bed0e6aae4a835ab4393499c7dd99941a8423':
  run-as:  set the SELinux security context.
 2013-03-05 10:27:40 -08:00
Colin Cross 69f3ec84cf Merge "Fix issues where the filename is referred to as 'sideload'" 2013-03-05 17:33:54 +00:00
Colin Cross 515bed0e6a Merge "run-as: set the SELinux security context." 2013-03-05 17:31:38 +00:00
Magnus Eriksson 86ae6d587b Fix issues where the filename is referred to as 'sideload' 
The adb sideload utility referes to the filename as 'sideload' in some
places. This patch changes the printouts to display the filename instead.

Change-Id: I38ada01a08bed53a8d9697c03f55ce8cee2abe12
Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
 2013-03-05 07:37:32 +01:00
The Android Open Source Project 68fa5114fe Reconcile with jb-mr2-release - do not merge 
Change-Id: I20987b51211410332c427eb876334b0c6a9bcc32
 2013-03-04 11:07:07 -08:00
The Android Automerger 6d89621266 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-04 05:56:29 -08:00
Nick Kralevich d1439a7f8e am b3be89df: am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as" 
* commit 'b3be89dfe9e0eb1cb0fbf834d6fbcef976c03a1e':
  android_filesystem_config.h: change ping and run-as
 2013-03-01 22:14:52 +00:00
Nick Kralevich b3be89dfe9 am 3fb63338: Merge "android_filesystem_config.h: change ping and run-as" 
* commit '3fb63338e9faddeb50a582cfec114bd48f93f1c2':
  android_filesystem_config.h: change ping and run-as
 2013-03-01 14:11:00 -08:00
Nick Kralevich 3fb63338e9 Merge "android_filesystem_config.h: change ping and run-as" 2013-03-01 21:42:27 +00:00
Nick Kralevich fe8135739c android_filesystem_config.h: change ping and run-as 
/system/bin/ping no longer requires CAP_NET_RAW, as we're now
using IPPROTO_ICMP. Please see the following for more details:

* http://lwn.net/Articles/443051/
* https://android-review.googlesource.com/52090
* https://android-review.googlesource.com/52072

We can now make ping a normal, unprivileged program.

/system/bin/run-as only requires CAP_SETUID and CAP_SETGID.
Explicitly set the capabilities of this file, and remove
the setuid bit.

This is equivalent to running the following commands:

  * chmod 750 /system/bin/run-as
  * chown root:shell /system/bin/run-as
  * setcap cap_setgid,cap_setuid+ep /system/bin/run-as

Change-Id: I65df858b45e6de4e2190ac9d6d592c06ea9d28cf
 2013-03-01 13:18:41 -08:00
Nick Kralevich 277626e59d am 844306bd: am cc4499b6: Merge "adb: use correct header file." 
* commit '844306bd9cb3c8b3e514e5d91e9514556e8f95f4':
  adb: use correct header file.
 2013-02-28 23:22:04 +00:00
Nick Kralevich 844306bd9c am cc4499b6: Merge "adb: use correct header file." 
* commit 'cc4499b6fa9ad4cbe285d78754edcb6dd30ab893':
  adb: use correct header file.
 2013-02-28 15:20:41 -08:00
Nick Kralevich cc4499b6fa Merge "adb: use correct header file." 2013-02-28 22:53:33 +00:00
Nick Kralevich e2864bf727 adb: use correct header file. 
Change-Id: I7a66ced762dc077247fd7c2714ae8850ffdcaeb9
 2013-02-28 14:12:58 -08:00
The Android Automerger 67f2efd21f merge in jb-mr2-release history after reset to jb-mr2-dev 2013-02-28 05:56:14 -08:00
Nick Kralevich 4c609e9683 Remove CAP_NET_RAW from adb 
ping no longer needs CAP_NET_RAW. See:

* http://lwn.net/Articles/443051/
* https://android-review.googlesource.com/52090
* https://android-review.googlesource.com/52072

Eliminate the CAP_NET_RAW special case in adb

Change-Id: If9d32c5254291b123b06bededc94b64113f6b8f2
 2013-02-27 13:15:02 -08:00
The Android Automerger 4eb8edcec7 merge in jb-mr2-release history after reset to master 2013-02-25 05:56:38 -08:00
Nick Kralevich 09094e729b am 96f60a8c: am ff03bc30: Merge "fix mac sdk build." 
* commit '96f60a8cf8a6e8e8c077339a27e417cd15645e1b':
  fix mac sdk build.
 2013-02-22 21:44:07 -08:00
Nick Kralevich 96f60a8cf8 am ff03bc30: Merge "fix mac sdk build." 
* commit 'ff03bc3024cb60d1840552f4e966f5b616fd861f':
  fix mac sdk build.
 2013-02-22 21:41:43 -08:00
Nick Kralevich ff03bc3024 Merge "fix mac sdk build." 2013-02-23 04:36:16 +00:00
Nick Kralevich bb05a92cb1 fix mac sdk build. 
For now, remove linux/capability.h . We're haven't started using
capabilities yet, and this file doesn't exist on mac builds.

Change-Id: Id6ec7fdb408bcdfdd538dac65187194c8ee226ff
 2013-02-22 20:32:35 -08:00
Nick Kralevich 89b530d215 am 0d060d56: am e3f247c0: Merge "Add support for filesystem capabilities." 
* commit '0d060d56d25e41e61dd46e348bff3c875cbc85cd':
  Add support for filesystem capabilities.
 2013-02-22 18:31:42 -08:00
Nick Kralevich 0d060d56d2 am e3f247c0: Merge "Add support for filesystem capabilities." 
* commit 'e3f247c0e55d8bfd7df66532e807e38983c47761':
  Add support for filesystem capabilities.
 2013-02-22 18:28:13 -08:00
Nick Kralevich e3f247c0e5 Merge "Add support for filesystem capabilities." 2013-02-23 02:03:36 +00:00
Glenn Kasten c325e569a4 Add directory for mediaserver 
Bug: 8223560
Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
 2013-02-22 17:51:05 -08:00
Ken Sumrall 6c2c121386 fs_mgr: add support for new recoveryonly flag 
If a device has an ext4 partition that contains the radio
firmware, and that filesystem is not mounted in normal
operation, we need a flag to prevent mount_all from
mounting it, so the new flag recoveryonly was added.

Change-Id: I361800c494e751b04c4faf956870f15fd0d8fe20
 2013-02-22 17:40:58 -08:00
Glenn Kasten 65e203070c Merge "Add directory for mediaserver" 2013-02-23 01:04:33 +00:00
Glenn Kasten b0f908a957 Add directory for mediaserver 
Bug: 8223560
Change-Id: Iccc6d439a848445cac0f5b30d1d663aed3f5344e
 2013-02-22 14:54:45 -08:00
The Android Open Source Project 2448146982 am f6451116: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'f6451116423c6195a464b69b6e07aa8ef743e6b1':
  charger: Do not suspend when disconnecting from charger
  charger: suspend enable in charger mode
  libsuspend: compile as a static library
 2013-02-22 13:45:37 -08:00