Christopher Ferris
7d4347389c
am 22790dfc: am 246e9d50: am 9dc41d5d: Merge "Refactor the code."
...
* commit '22790dfcfceebc537ffd3eb0a15fc0512f036091':
Refactor the code.
2015-03-31 23:01:28 +00:00
Stephen Hines
6f8edc29c7
am fcabf5d0: am 0ede6ef3: am 9c01c44b: Merge "Add -Wno-inline-asm to Clang flags."
...
* commit 'fcabf5d0b014bd708118ed64ead5ed4d6731ea2b':
Add -Wno-inline-asm to Clang flags.
2015-03-31 23:01:07 +00:00
Christopher Ferris
22790dfcfc
am 246e9d50: am 9dc41d5d: Merge "Refactor the code."
...
* commit '246e9d502c67a501471399dd0c919884462fe011':
Refactor the code.
2015-03-31 21:20:02 +00:00
Christopher Ferris
246e9d502c
am 9dc41d5d: Merge "Refactor the code."
...
* commit '9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd':
Refactor the code.
2015-03-31 21:15:52 +00:00
Christopher Ferris
9dc41d5d34
Merge "Refactor the code."
2015-03-31 21:11:36 +00:00
Stephen Hines
fcabf5d0b0
am 0ede6ef3: am 9c01c44b: Merge "Add -Wno-inline-asm to Clang flags."
...
* commit '0ede6ef3a52da2e9cc6dc25c81b7ca6f39109117':
Add -Wno-inline-asm to Clang flags.
2015-03-31 21:09:40 +00:00
Stephen Hines
0ede6ef3a5
am 9c01c44b: Merge "Add -Wno-inline-asm to Clang flags."
...
* commit '9c01c44bd6641f934afeece3c2ab2ab91e791dfc':
Add -Wno-inline-asm to Clang flags.
2015-03-31 21:02:41 +00:00
Stephen Hines
9c01c44bd6
Merge "Add -Wno-inline-asm to Clang flags."
2015-03-31 20:56:06 +00:00
Tim Kilbourn
eeb212df71
Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."
2015-03-31 20:23:19 +00:00
Paul Lawrence
b8c9d273a0
Revert "Revert "Adding e4crypt support""
...
Fix build break caused by original change
This reverts commit 84b0bab58f
.
Change-Id: I99fbd7c3d1ed92db1f546033c8493bb71a327924
2015-03-31 13:02:13 -07:00
Mohamad Ayyash
80cc1f6864
Add verbose param to sparse_file_import_auto
...
Change-Id: I0c5607f7aa5e964abc2031bbe71ff5c6e6ef56cc
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-03-31 12:09:37 -07:00
Yin-Chia Yeh
3fcb735030
Merge "graphics: add android raw12 format"
2015-03-31 18:27:11 +00:00
Mark Salyzyn
d610e4948a
am 24693597: am 3cc18a2c: am b6f38def: Merge "run-as: bracket capability"
...
* commit '24693597cd110bb11e751fb5acb65330d222edae':
run-as: bracket capability
2015-03-31 18:05:24 +00:00
Mark Salyzyn
24693597cd
am 3cc18a2c: am b6f38def: Merge "run-as: bracket capability"
...
* commit '3cc18a2cf93e00786f7cb7af19cab653937a22a9':
run-as: bracket capability
2015-03-31 17:53:25 +00:00
Christopher Ferris
2c43cff01d
Refactor the code.
...
The object hierarchy was confusing and convoluted. This removes
a lot of unnecessary code, and consolidates the BacktraceCurrent
and BacktraceThread code into BacktraceCurrent.
Change-Id: I01c8407d493712a48169df49dd3ff46db4a7c3ae
2015-03-31 10:51:44 -07:00
Mark Salyzyn
3cc18a2cf9
am b6f38def: Merge "run-as: bracket capability"
...
* commit 'b6f38def22add4b5d6878185d238f91659239161':
run-as: bracket capability
2015-03-31 17:46:42 +00:00
Mark Salyzyn
b6f38def22
Merge "run-as: bracket capability"
2015-03-31 17:41:14 +00:00
Mark Salyzyn
db5334ad03
run-as: bracket capability
...
- do not assume that caller has granted effective bits in capabilities
- only elevate capabilities when needed
- suppress capabilities before exec when called as shell,shell,shell
- some Android coding standard cleanup
Bug: 19908228
Change-Id: Ibe3d1c1a0fdcb54c41d7a72395e50ad749df98ce
2015-03-31 09:44:48 -07:00
Stephen Hines
035e9ba97e
Add -Wno-inline-asm to Clang flags.
...
The latest clang (r230699) does not allow SP/PC to be declared in inline asm
lists. This is a problem for libraries that are attempting to save all
register state.
Change-Id: I1ce80530f8be85fd74e949d0c65b60080e0aaf2a
2015-03-31 09:41:24 -07:00
Etan Cohen
cb1da25506
Merge commit 'a8cb3cd1601909ae04e14cd5ce42c286a8cf3ba4' into merge
2015-03-31 09:27:59 -07:00
Jeff Sharkey
fc0004894a
Progress towards dynamic storage support.
...
To support external storage devices that are dynamically added and
removed at runtime, we're changing /mnt and /storage to be tmpfs that
are managed by vold.
To support primary storage being inserted/ejected at runtime in a
multi-user environment, we can no longer bind-mount each user into
place. Instead, we have a new /storage/self/primary symlink which
is resolved through /mnt/user/n/primary, and which vold updates at
runtime.
Fix small mode bugs in FUSE daemon so it can be safely mounted
visible to all users on device.
Bug: 19993667
Change-Id: I0ebf4d10aba03d73d9a6fa37d4d43766be8a173b
2015-03-30 19:48:38 -07:00
Tao Bao
c9eccaa58b
am b17b9921: am e9c2a4a0: am cd153076: Merge "adb: Add option to reboot into sideload mode in recovery"
...
* commit 'b17b9921c7d71b05ec29505d7a4671a8c771723f':
adb: Add option to reboot into sideload mode in recovery
2015-03-31 01:43:30 +00:00
Tao Bao
b17b9921c7
am e9c2a4a0: am cd153076: Merge "adb: Add option to reboot into sideload mode in recovery"
...
* commit 'e9c2a4a0a4ba2059f313da5c686217cbbd62278f':
adb: Add option to reboot into sideload mode in recovery
2015-03-31 01:10:42 +00:00
Tao Bao
e9c2a4a0a4
am cd153076: Merge "adb: Add option to reboot into sideload mode in recovery"
...
* commit 'cd153076dc27b9a53fddec35eb050f44239d5af3':
adb: Add option to reboot into sideload mode in recovery
2015-03-31 01:03:31 +00:00
Elliott Hughes
e19143a7cb
am 4bd43889: am 656957e8: am a58c0b5f: Merge "Build init with clang."
...
* commit '4bd43889c9aedfaff093ca81bca7c7b81b3061f0':
Build init with clang.
2015-03-31 01:00:53 +00:00
Tao Bao
cd153076dc
Merge "adb: Add option to reboot into sideload mode in recovery"
2015-03-31 00:57:33 +00:00
Elliott Hughes
4bd43889c9
am 656957e8: am a58c0b5f: Merge "Build init with clang."
...
* commit '656957e814a157538d748972573a9100b4261b81':
Build init with clang.
2015-03-31 00:48:34 +00:00
Elliott Hughes
656957e814
am a58c0b5f: Merge "Build init with clang."
...
* commit 'a58c0b5f12d60a3ae62cca57192cd0c3d9416f49':
Build init with clang.
2015-03-31 00:41:54 +00:00
Elliott Hughes
a58c0b5f12
Merge "Build init with clang."
2015-03-31 00:35:20 +00:00
Tao Bao
175b7bbfb4
adb: Add option to reboot into sideload mode in recovery
...
Currently it requires manual key press to enter the sideload mode. This
CL adds 'adb reboot sideload' to reboot the device into sideload mode
directly with text display on. With 'adb reboot sideload-auto-reboot',
it will reboot after the sideload regardless of the installation result,
unless interrupted by user.
Since it needs to write to /cache/recovery/command file, 'adb root' is
required before calling 'adb reboot sideload' and the one with
'-auto-reboot'.
Also it requires the matching CL in bootable/recovery.
Change-Id: Ib7bd4e216a1efc01e64460659c97c6005bbaec1b
2015-03-31 00:19:52 +00:00
Yin-Chia Yeh
9a5eeba588
graphics: add android raw12 format
...
Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
2015-03-30 16:35:56 -07:00
Elliott Hughes
9efd95b029
Build init with clang.
...
Change-Id: I14d95b3fe0505dd7d7632e2eedc537f97553c715
2015-03-30 14:37:11 -07:00
Elliott Hughes
18eba75e6f
am 7f9bc931: am 1f9a2288: am ffa85da6: Merge "Lose route to toybox."
...
* commit '7f9bc9310f522858ff89e221a4f8d00845c66024':
Lose route to toybox.
2015-03-30 21:24:01 +00:00
Elliott Hughes
7f9bc9310f
am 1f9a2288: am ffa85da6: Merge "Lose route to toybox."
...
* commit '1f9a22882f4fa0a0714b51904c264279bf1a5dbd':
Lose route to toybox.
2015-03-30 21:10:47 +00:00
Elliott Hughes
1f9a22882f
am ffa85da6: Merge "Lose route to toybox."
...
* commit 'ffa85da6125c4b820fdecfd2b49acfb2631fb07a':
Lose route to toybox.
2015-03-30 21:04:02 +00:00
Elliott Hughes
ffa85da612
Merge "Lose route to toybox."
2015-03-30 20:57:56 +00:00
Elliott Hughes
af8e63fa17
am 958af99e: am 42997bfe: am eb809351: Merge "Always unlink /dev/__kmsg__."
...
* commit '958af99e0e26af7267828020b73903a054855525':
Always unlink /dev/__kmsg__.
2015-03-30 19:39:02 +00:00
Elliott Hughes
958af99e0e
am 42997bfe: am eb809351: Merge "Always unlink /dev/__kmsg__."
...
* commit '42997bfebcd3e93265feae74e2194793549fedc5':
Always unlink /dev/__kmsg__.
2015-03-30 19:25:05 +00:00
Elliott Hughes
42997bfebc
am eb809351: Merge "Always unlink /dev/__kmsg__."
...
* commit 'eb809351db938f4e99aad36a9e791c4b87b0c951':
Always unlink /dev/__kmsg__.
2015-03-30 19:18:50 +00:00
Elliott Hughes
eb809351db
Merge "Always unlink /dev/__kmsg__."
2015-03-30 19:12:47 +00:00
Dan Albert
9e03795486
am 7ad86670: am 20329fa4: am 6d457fe1: Merge "Enable building libbase on Windows."
...
* commit '7ad8667042751451a8a986df86f1470ac29dccc9':
Enable building libbase on Windows.
2015-03-30 18:46:43 +00:00
Elliott Hughes
55ca889052
am 3e46f4af: am 9c39510e: am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
...
* commit '3e46f4af4f52aee324601b449abf9219bfd6b362':
toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
2015-03-30 18:46:42 +00:00
Dan Albert
7ad8667042
am 20329fa4: am 6d457fe1: Merge "Enable building libbase on Windows."
...
* commit '20329fa4274128beadd1dde04edd26478673f116':
Enable building libbase on Windows.
2015-03-30 18:36:36 +00:00
Elliott Hughes
3e46f4af4f
am 9c39510e: am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
...
* commit '9c39510e06f36b9c03b61f4eefae521991daead6':
toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
2015-03-30 18:32:30 +00:00
Elliott Hughes
798ec0c39d
Lose route to toybox.
...
Change-Id: If68fa6a691478921452ebd785bd35e3ba5a8470a
2015-03-30 11:23:44 -07:00
Dan Albert
20329fa427
am 6d457fe1: Merge "Enable building libbase on Windows."
...
* commit '6d457fe1a8f35c50c84f523846f0f1aa04491423':
Enable building libbase on Windows.
2015-03-30 17:51:34 +00:00
Dan Albert
6d457fe1a8
Merge "Enable building libbase on Windows."
2015-03-30 17:47:03 +00:00
Dan Albert
b2326bd56c
Enable building libbase on Windows.
...
We have to exclude the logging facilities for now (since we don't have
a std::mutex on Windows), but there's plenty else in here that is
worth having.
Change-Id: I6d1369e34e08ea2e88a0b1130c4462e5d35d99e2
2015-03-30 10:30:42 -07:00
Elliott Hughes
9c39510e06
am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
...
* commit 'c2d9cc85766bbec22980021af4eb4b01200c9a9f':
toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)
2015-03-30 17:28:33 +00:00
Elliott Hughes
c2d9cc8576
Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"
2015-03-30 17:18:51 +00:00