Chih-Hung Hsieh
d3653c90cd
am 3570072c
: Merge "Use full qualified name in macros."
...
* commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb':
Use full qualified name in macros.
2014-12-11 19:54:27 +00:00
Chih-Hung Hsieh
3570072c36
Merge "Use full qualified name in macros."
2014-12-11 19:40:54 +00:00
Chih-Hung Hsieh
c777f213b3
Use full qualified name in macros.
...
The ANDROID_SINGLETON_STATIC_INSTANCE is used in some files
out of the android namespace. If it does not use full qualified
names, users of this macro will need to use it inside the 'android'
namespace to avoid warnings from clang compiler.
Change-Id: Ie4d4ba2b57fdc72d0deb3b7c2326304a44a1300f
2014-12-11 11:19:57 -08:00
Chih-Hung Hsieh
6984e6dc97
am de180fc2
: Merge "Remove unused local variable."
...
* commit 'de180fc2834a3e42b6383027cf47b561e861108e':
Remove unused local variable.
2014-12-10 22:35:40 +00:00
Eric Laurent
4108bccbe8
am 4fca5918
: audio: add usage "virtual source" to audio attributes.
...
* commit '4fca59181c838b91572d1b57cb74b26d0a70528f':
audio: add usage "virtual source" to audio attributes.
2014-12-10 22:20:09 +00:00
Chih-Hung Hsieh
de180fc283
Merge "Remove unused local variable."
2014-12-10 22:19:19 +00:00
Chih-Hung Hsieh
058932c4ff
Remove unused local variable.
...
Clang compiler gives it a warning and error.
Change-Id: Id35b740e265b393b5e31e05bd83544f391d8ff08
2014-12-10 14:14:09 -08:00
dcashman
f6a9309b94
am 250d1d1b
: Merge "Move property_context label handling to libselinux."
...
* commit '250d1d1bf3cd462065a456369c11a3ce8fbe531f':
Move property_context label handling to libselinux.
2014-12-10 22:07:12 +00:00
dcashman
250d1d1bf3
Merge "Move property_context label handling to libselinux."
2014-12-10 21:55:37 +00:00
dcashman
05345bfdb0
Move property_context label handling to libselinux.
...
Resubmission of commit: dab91bd37af6be355163ee33ca6f1b00e7dd1b51
Change-Id: Iad9517d3f81f7c091307b3e7497675e2cdc32be5
2014-12-10 13:21:17 -08:00
Dmitriy Ivanov
4110da7522
am 765f371c
: Merge "Print ASCII near register for all archs"
...
* commit '765f371cf40c67ccca3033b05aa052de0145f999':
Print ASCII near register for all archs
2014-12-10 19:11:15 +00:00
Marco Nelissen
e8be3ad9d1
am 5eb43118
: Merge "Allow updates for open file descriptors"
...
* commit '5eb431180bcc0fb153d2c821c6735aadcda02ae5':
Allow updates for open file descriptors
2014-12-10 19:03:42 +00:00
Dmitriy Ivanov
765f371cf4
Merge "Print ASCII near register for all archs"
2014-12-10 18:58:56 +00:00
Marco Nelissen
5eb431180b
Merge "Allow updates for open file descriptors"
2014-12-10 18:50:08 +00:00
Marco Nelissen
a80f0986bb
Allow updates for open file descriptors
...
even if the calling process itself would not be able to open the file.
Bug: 18688419
Change-Id: I640db19f19c1a677735fd0c14b7e2e38977d0f4d
2014-12-10 10:44:20 -08:00
Dmitriy Ivanov
052fc0a225
Print ASCII near register for all archs
...
Bug: 17880617
Change-Id: I6870e8ac670c08e45d8efb64479976a38edfdc93
2014-12-10 10:21:12 -08:00
Elliott Hughes
0d43d918b0
am 65c06de7
: Merge "kill libunz"
...
* commit '65c06de7629103234bd56392db1a99ee0ab6cb79':
kill libunz
2014-12-10 18:19:32 +00:00
Elliott Hughes
65c06de762
Merge "kill libunz"
2014-12-10 18:06:10 +00:00
Yabin Cui
71a968602d
kill libunz
...
Bug: 18571533
Change-Id: I4214f9236f80629152d969a6ee9fce489079cefa
2014-12-09 22:24:07 -08:00
Elliott Hughes
9ccf0cbaf1
am a97c1075
: Merge "Fix Nick\'s nits"
...
* commit 'a97c10755442e3800c0b1011d986d554ce2096db':
Fix Nick's nits
2014-12-10 03:48:42 +00:00
Elliott Hughes
603c7d0d95
am 294e610f
: Merge "Fix verity on system partitions larger than 2G"
...
* commit '294e610f886eeb839d16172bb5b98559a6a7434d':
Fix verity on system partitions larger than 2G
2014-12-10 03:48:41 +00:00
Elliott Hughes
a97c107554
Merge "Fix Nick's nits"
2014-12-10 03:38:57 +00:00
Paul Lawrence
88a12fb381
Fix Nick's nits
...
(cherry-pick of 97e487311b1cb780dfd3b0994917c72047d6188f.)
Change-Id: Ide7925e7ad328f0343d444d63ff72f1a26206d4c
2014-12-09 19:38:23 -08:00
Elliott Hughes
2f38122a0f
Remove dead file.
...
Change-Id: I70a37679a624f2ea2c2d6e1610ad8999c09e5262
2014-12-09 19:35:21 -08:00
Elliott Hughes
294e610f88
Merge "Fix verity on system partitions larger than 2G"
2014-12-10 03:34:43 +00:00
Sami Tolvanen
02c698d93f
Fix verity on system partitions larger than 2G
...
If the system partition is larger than 2G, the device fails to read
verity metadata, because fseek accepts only a 32-bit signed offset.
Switch from fseek to lseek64 to allow seeking using a 64-bit offset,
which solves the problem. At the same time, move away from stdio in
the function.
(cherry-pick of 4cafe2ff89b49329e0e880900195d8e061bd3750.)
Bug: 17705619
Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
2014-12-09 19:34:08 -08:00
Elliott Hughes
32e9163b2a
resolved conflicts for merge of b471f524
to lmp-mr1-dev-plus-aosp
...
Change-Id: I6efd0d4a0ece0b065d02796916355ad5ae8b4eea
2014-12-09 19:12:21 -08:00
Elliott Hughes
b1d67c1db1
am 7a497e3b
: Merge "adb warns on remount when verity is enabled"
...
* commit '7a497e3b5cc8aee61c5fa3e323d322f68a13c5b2':
adb warns on remount when verity is enabled
2014-12-10 02:32:02 +00:00
Elliott Hughes
822eee94c3
am e1fb0899
: Merge "fastbootd: Use FASTBOOT constants instead of ADB constants"
...
* commit 'e1fb0899452283255bb52950aefce24c36c95390':
fastbootd: Use FASTBOOT constants instead of ADB constants
2014-12-10 02:32:01 +00:00
Elliott Hughes
c162dbb2ff
am 83b4047b
: Merge "adbd & fastbootd: Support for new f_fs descriptor format"
...
* commit '83b4047bc66729f8cf854c525e2bc8bac7c9587e':
adbd & fastbootd: Support for new f_fs descriptor format
2014-12-10 02:32:00 +00:00
Elliott Hughes
c71562dd9d
am 1dbf33b0
: Merge "Fix build on mac."
...
* commit '1dbf33b0ca240d55fea477ecfb79052d9b006b89':
Fix build on mac.
2014-12-10 02:31:59 +00:00
Elliott Hughes
d86af4dc5d
am 173310a2
: Merge "Add more debug information."
...
* commit '173310a27c1b58034bf47e08e58942137583fea8':
Add more debug information.
2014-12-10 02:31:57 +00:00
Elliott Hughes
3094c26d1b
am 3e16e2d6
: Merge "Fix adb/fastboot windows compilations."
...
* commit '3e16e2d6195e112a2bfe2f958e1cfec2bd109a1c':
Fix adb/fastboot windows compilations.
2014-12-10 02:31:56 +00:00
Elliott Hughes
2598f0ad55
resolved conflicts for merge of 02ef15f1
to lmp-mr1-dev-plus-aosp
...
Change-Id: If44376782436b92c2d03a56df57572fc964158a9
2014-12-09 18:28:05 -08:00
Riley Andrews
cbdf4a95aa
Merge "Fix some style issues in adb_commandline()."
2014-12-10 02:26:59 +00:00
Riley Andrews
0dc15b3a23
Merge "Refactor the host adb argument parsing loop to remove a goto"
2014-12-10 02:26:51 +00:00
Nick Kralevich
c43ca87406
Merge "Revert "Move property_context label handling to libselinux.""
2014-12-10 02:03:56 +00:00
Nick Kralevich
59f64ec31f
Revert "Move property_context label handling to libselinux."
...
Emulator fails to boot.
This reverts commit 98069027bd
.
Bug: 18692152
Change-Id: If362e1311bc3f07e033ba81190c05608ada7c361
2014-12-10 02:02:32 +00:00
Riley Andrews
98f58e83c0
Fix some style issues in adb_commandline().
...
Change-Id: I8ed7899e7e137405594b3f3cbb0a87eae411dfc9
2014-12-09 17:25:39 -08:00
Riley Andrews
c8514c886e
Refactor the host adb argument parsing loop to remove a goto
...
Change-Id: I3412ac473abc4efa51a6275658e65f7191b5439d
2014-12-09 17:25:39 -08:00
Elliott Hughes
55c38f728a
Merge "Fix build"
2014-12-10 01:06:27 +00:00
Paul Lawrence
1d931bca26
Fix build
...
(cherry-pick of 731136ca36bb7af1490856373d463e3a6c4df1c8.)
Change-Id: I9b493fd5fc5c5f62f02bc5234ccca2a5118380b4
2014-12-09 17:06:00 -08:00
Elliott Hughes
18237c77c8
Merge "Add adb enable-verity"
2014-12-10 01:05:20 +00:00
Paul Lawrence
982089d838
Add adb enable-verity
...
Note that it is *easy* to break your phone with this feature. It is
not a bug that reenabling verity after changing one byte of the system
partition stops the device booting.
(cherry-pick of 7c442e1700e6312727283db402dec6f666f1b55a.)
Bug: 18529433
Change-Id: I632e91281884471a362960f1ba30312d2669b8ff
2014-12-09 17:04:43 -08:00
Elliott Hughes
b471f5249b
Merge "Revert "Revert "Enable verity on userdebug, and add disable-verity to adb"""
2014-12-10 01:03:25 +00:00
Paul Lawrence
ec900bba20
Revert "Revert "Enable verity on userdebug, and add disable-verity to adb""
...
This reverts commit 152d2d4234
.
Fixed build error, and also fixed memory leak spotted from warning.
(cherry-pick of bbb36319119edde9377fb80015235893c30d2bc9.)
Bug: 17691572
Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
2014-12-09 17:02:17 -08:00
Elliott Hughes
7a497e3b5c
Merge "adb warns on remount when verity is enabled"
2014-12-10 00:35:39 +00:00
Paul Lawrence
34637555c2
adb warns on remount when verity is enabled
...
(cherry-pick of f643beced1d154726dca7115014d2d1fdfcca993.)
Bug: 18119147
Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
2014-12-09 16:32:26 -08:00
Elliott Hughes
e1fb089945
Merge "fastbootd: Use FASTBOOT constants instead of ADB constants"
2014-12-10 00:27:09 +00:00
Badhri Jagan Sridharan
e3c72fd51a
fastbootd: Use FASTBOOT constants instead of ADB constants
...
(cherry-pick of ae17fb8f24c2d4dbb000c8943e2caa428fbf4c9b.)
Change-Id: I4a67e7144b5c4a10e809821feb7f8c16540831cb
2014-12-09 16:26:25 -08:00