Robert Carr
f3954fba2d
Add comment to keep enum in sync.
...
Now that we expose SCALING_MODE_* constants
out to Java add a comment to keep the bindings
in sync.
Bug: 26010823
Change-Id: I35473c673b79223ea3bebc118d3a31fc82f37381
2015-12-17 11:38:39 -08:00
Felipe Leme
1e971f29fb
Merge "Moved 'bugreportplus' from init.rc to dumpstate.rc"
2015-12-14 22:00:01 +00:00
Felipe Leme
1a9c4531c7
Moved 'bugreportplus' from init.rc to dumpstate.rc
...
BUG: 26034608
Change-Id: Id6923cff0b2b3bd9d2ec9320ebcdb3fbead8df83
2015-12-14 13:43:00 -08:00
Greg Hackmann
346db8a2c2
Merge "cutils: trace: add DATABASE tag" am: 461a29540c
...
am: d57d863e2e
* commit 'd57d863e2efd2c8a2e8246ed7f928a2c1b834e9e':
cutils: trace: add DATABASE tag
2015-12-14 13:23:32 -08:00
Greg Hackmann
d57d863e2e
Merge "cutils: trace: add DATABASE tag"
...
am: 461a29540c
* commit '461a29540c01b44f07fc26ccb0d5bc7d0d92a974':
cutils: trace: add DATABASE tag
2015-12-14 13:20:35 -08:00
Greg Hackmann
461a29540c
Merge "cutils: trace: add DATABASE tag"
2015-12-14 21:12:52 +00:00
Elliott Hughes
2e83684537
Merge "Share the new adb USB diagnostic code with fastboot." am: efd8c3289e
...
am: 40f80e25d3
* commit '40f80e25d3f399ece26d5f1ac145921ccb7f5f80':
Share the new adb USB diagnostic code with fastboot.
2015-12-14 12:47:44 -08:00
Elliott Hughes
40f80e25d3
Merge "Share the new adb USB diagnostic code with fastboot."
...
am: efd8c3289e
* commit 'efd8c3289ed80dbae0813b06fb283b29273bbc66':
Share the new adb USB diagnostic code with fastboot.
2015-12-14 12:43:52 -08:00
Elliott Hughes
efd8c3289e
Merge "Share the new adb USB diagnostic code with fastboot."
2015-12-14 20:29:46 +00:00
Elliott Hughes
1b708d368f
Share the new adb USB diagnostic code with fastboot.
...
Bug: http://b/26134129
Change-Id: Ieaf0651c7b3f8a028760982091ec63a21a5484ba
2015-12-14 10:50:21 -08:00
Dimitry Ivanov
27c43dc44e
Merge "Temporary disable linker-namespaces" am: 9fb5047549
...
am: 4bbed77aaf
* commit '4bbed77aaf4dfa813112e5539ee6c00e1b7257d9':
Temporary disable linker-namespaces
2015-12-13 13:20:14 -08:00
Elliott Hughes
f65569d497
Merge "Remove fastboot/genkey.sh." am: 796ea6a65d
...
am: 54a584d722
* commit '54a584d72233c107f58863c659a011f65d4074fb':
Remove fastboot/genkey.sh.
2015-12-13 13:19:26 -08:00
Josh Gao
9b42cea202
Merge "adb: handle some edge cases with process environments." am: 80f3b0438d
...
am: 412f6aaead
* commit '412f6aaead3c414fe65e8a9ca129e3218d28f633':
adb: handle some edge cases with process environments.
2015-12-13 13:15:34 -08:00
Dimitry Ivanov
4bbed77aaf
Merge "Temporary disable linker-namespaces"
...
am: 9fb5047549
* commit '9fb50475497ab66ad547ffd17cc5a611b422cd09':
Temporary disable linker-namespaces
2015-12-11 22:22:00 -08:00
Dimitry Ivanov
9fb5047549
Merge "Temporary disable linker-namespaces"
2015-12-12 06:16:23 +00:00
Elliott Hughes
54a584d722
Merge "Remove fastboot/genkey.sh."
...
am: 796ea6a65d
* commit '796ea6a65d790fba1a9d77cfcaf453825936a146':
Remove fastboot/genkey.sh.
2015-12-11 18:32:36 -08:00
Elliott Hughes
796ea6a65d
Merge "Remove fastboot/genkey.sh."
2015-12-12 02:25:13 +00:00
Dimitry Ivanov
c18ac7cd2b
Temporary disable linker-namespaces
...
Bug: http://b/26164393
Change-Id: If6277407a6a5a4da9e3ad01dc45f57a7fc9954e4
2015-12-11 18:15:41 -08:00
Elliott Hughes
44b6aefeeb
Remove fastboot/genkey.sh.
...
Some unknown cruft from the pre-cupcake era.
Change-Id: I8964892419cda9781d1506aa7006c51dc00ca33d
2015-12-11 17:57:53 -08:00
Josh Gao
412f6aaead
Merge "adb: handle some edge cases with process environments."
...
am: 80f3b0438d
* commit '80f3b0438d84fba3c36cc73cfef992032cd33eb0':
adb: handle some edge cases with process environments.
2015-12-11 16:49:30 -08:00
Josh Gao
80f3b0438d
Merge "adb: handle some edge cases with process environments."
2015-12-12 00:43:38 +00:00
Josh Gao
e03c988748
adb: handle some edge cases with process environments.
...
Change-Id: I0c20e58e14ef756a8c45dd5ea85f7301157a3c8e
2015-12-11 15:58:32 -08:00
Josh Gao
25ec5c097a
Merge "adb: don\'t use setenv after forking." am: 5e15568c07
...
am: 7b74dc83e6
* commit '7b74dc83e6e3c81f534f4422c14402ecd04b9015':
adb: don't use setenv after forking.
2015-12-11 15:57:19 -08:00
Josh Gao
7b74dc83e6
Merge "adb: don\'t use setenv after forking."
...
am: 5e15568c07
* commit '5e15568c077e3c4df5218f78363864a6f7280c06':
adb: don't use setenv after forking.
2015-12-11 15:54:37 -08:00
Josh Gao
5e15568c07
Merge "adb: don't use setenv after forking."
2015-12-11 23:32:19 +00:00
Josh Gao
9b3fd67213
adb: don't use setenv after forking.
...
Previously, for `adb shell`, we were using setenv after forking to set
up the child's environment. This would occasionally deadlock in the
child, which would cause the main thread to deadlock waiting for the
child to complete. This patch constructs the environment before forking
and passes it to execle, eliminating the deadlock.
Bug: http://b/25847115
Change-Id: I720d472770564b1449819ddaab945a89844244a8
2015-12-11 15:10:12 -08:00
Mark Salyzyn
fdb0286108
Merge "liblog: logprint security ANDROID_LOG_WARN" am: d2d35df279
...
am: 6a92853230
* commit '6a9285323089fe9b95a5ae53989d3d660dc14291':
liblog: logprint security ANDROID_LOG_WARN
2015-12-11 14:19:16 -08:00
Tom Cherry
bcac4a98d4
Merge "Update init documentation to reflect fs_config changes" am: b11afd7741
...
am: 80625ed1c3
* commit '80625ed1c3674ab8abf56a7bacd5151215215020':
Update init documentation to reflect fs_config changes
2015-12-11 14:19:10 -08:00
Josh Gao
c56e68f0eb
Merge "adb: make pulling symlinks and devices work." am: c8e793685c
...
am: 8b99185552
* commit '8b99185552fd49e7902404352e0b5fda266263fd':
adb: make pulling symlinks and devices work.
2015-12-11 14:18:54 -08:00
Mark Salyzyn
6a92853230
Merge "liblog: logprint security ANDROID_LOG_WARN"
...
am: d2d35df279
* commit 'd2d35df279bcc6535455459ba9bd6aff077b7ea3':
liblog: logprint security ANDROID_LOG_WARN
2015-12-11 14:11:14 -08:00
Tom Cherry
80625ed1c3
Merge "Update init documentation to reflect fs_config changes"
...
am: b11afd7741
* commit 'b11afd7741c5e939bf5c6fb47dcadc49e3664f32':
Update init documentation to reflect fs_config changes
2015-12-11 14:11:07 -08:00
Mark Salyzyn
d2d35df279
Merge "liblog: logprint security ANDROID_LOG_WARN"
2015-12-11 21:43:17 +00:00
Tom Cherry
b11afd7741
Merge "Update init documentation to reflect fs_config changes"
2015-12-11 21:23:12 +00:00
Tom Cherry
dbddb40c95
Update init documentation to reflect fs_config changes
...
Change-Id: I00296d90c44af369a51ecb5cbb667567328f0053
2015-12-11 13:20:38 -08:00
Josh Gao
8b99185552
Merge "adb: make pulling symlinks and devices work."
...
am: c8e793685c
* commit 'c8e793685c816531cd2f2af7229b3f6b41d14a7c':
adb: make pulling symlinks and devices work.
2015-12-11 13:17:53 -08:00
Josh Gao
c8e793685c
Merge "adb: make pulling symlinks and devices work."
2015-12-11 21:04:25 +00:00
Josh Gao
f264224191
adb: make pulling symlinks and devices work.
...
Bug: http://b/25972989
Bug: http://b/26085751
Change-Id: I43842871522ea5f67a8c258dcb6ddafa8dd744c8
2015-12-11 12:51:38 -08:00
Mark Salyzyn
7bc8023857
liblog: logprint security ANDROID_LOG_WARN
...
Bug: 26029733
Change-Id: I4f0cffc0a45819fb48807bf06ce336316276369d
2015-12-11 12:37:22 -08:00
Andy Hung
c7ae5210a7
Merge "Add audioserver uid and restart service when needed"
2015-12-11 20:08:51 +00:00
Mark Salyzyn
829be0202a
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY" am: 86052a5d4f
...
am: 72398c0515
* commit '72398c051567d735df677a7527533f2f1dc5a882':
logd: liblog: logcat: Add LOG_ID_SECURITY
2015-12-11 10:58:32 -08:00
Mike Frysinger
7e4d906f2f
Merge "adbd: refactor priv dropping logic" am: 6945e36060
...
am: e2d0403e1c
* commit 'e2d0403e1c6fc610e1536090e903ddced58a2015':
adbd: refactor priv dropping logic
2015-12-11 10:58:00 -08:00
Mark Salyzyn
d4ac73bd6a
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ... am: 30edbdce9b
...
am: 5afb3f5f67
* commit '5afb3f5f678627d42ceae617069ff38d9773a005':
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 10:57:51 -08:00
Mark Salyzyn
72398c0515
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
...
am: 86052a5d4f
* commit '86052a5d4f217a73c769c77f7ac0904b65e67942':
logd: liblog: logcat: Add LOG_ID_SECURITY
2015-12-11 09:41:29 -08:00
Mark Salyzyn
86052a5d4f
Merge "logd: liblog: logcat: Add LOG_ID_SECURITY"
2015-12-11 17:33:33 +00:00
Mike Frysinger
e2d0403e1c
Merge "adbd: refactor priv dropping logic"
...
am: 6945e36060
* commit '6945e360601a37301a6a678389d7bc9e974b1e23':
adbd: refactor priv dropping logic
2015-12-11 09:11:56 -08:00
Mike Frysinger
6945e36060
Merge "adbd: refactor priv dropping logic"
2015-12-11 17:03:19 +00:00
Mark Salyzyn
5afb3f5f67
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
am: 30edbdce9b
* commit '30edbdce9bb5e76e02f5bdb1ee33cea2b62c7ceb':
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 08:59:38 -08:00
Mark Salyzyn
30edbdce9b
Merge changes I598c8c5c,I672b0f4d,Id882978b,Idff5e080,Ib124eca1, ...
...
* changes:
logger.h: reduce maximum payload so sum is page size
liblog: test for maximum payload can not survive change
liblog: logprint use uid name if length less then 5
liblog: logprint add uid format modifier
liblog: readlog apps get logger_entry_v4 for pstore
logd: readlog apps get logger_entry_v4
logger.h: Add definition for logger_entry_v4
2015-12-11 16:42:28 +00:00
Daichi Hirono
db85484423
Merge "Add /mnt/appfuse mount point to init.rc."
2015-12-11 06:16:29 +00:00
Daichi Hirono
7abc71ecd3
Add /mnt/appfuse mount point to init.rc.
...
BUG=25755834
Change-Id: I00b1185aec7a95baa6ef2f345a49761f3d006c4d
2015-12-11 13:29:04 +09:00