Commit Graph

2366 Commits

Author SHA1 Message Date
Mark Salyzyn ee6b51f210 Merge "liblog: Add __android_log_security()" am: 1631d36d95
am: e52a6d60cd

* commit 'e52a6d60cdb2233bd3d03723c73ce8f9bf33c929':
  liblog: Add __android_log_security()
2015-12-08 14:04:42 -08:00
Mark Salyzyn ffbd86ff25 liblog: Add __android_log_security()
Return non-zero if ro.device_owner is set and not false
and persist.logd.security is true.

Bug: 26029733
Change-Id: Ie82ae11ae35e9c79017b6e873fefb39d79a1d4fe
2015-12-08 11:28:27 -08:00
Dimitry Ivanov d686fb3474 Merge "Native loader as a separate library" am: beceb6ef53 am: 17f119eade
am: d6c9995d99

* commit 'd6c9995d992b4fdffe176acff207f1f066e2a920':
  Native loader as a separate library
2015-12-08 04:53:45 +00:00
Mark Salyzyn 9d216130ad Merge changes Ib441cecf,Ieb1bbe3d,I3e63e430,I531b4317,I8dd60545, ... am: d1379a8aed am: 154e1c15ae
am: 850045ca27

* commit '850045ca27b2a71d6b1fee873dc7246edfd0b8f2':
  logcat: Add --wrap timeout
  logcat: Add low hanging fruit long arguments
  logcat: Add long arguments to logcat, support for pid filter
  liblog: Support for ANDROID_LOG_WRAP mode flag on reader
  logd: test wakeup on wrap timeout
  logd: wakeup on wrap or timeout
2015-12-08 00:04:01 +00:00
Mark Salyzyn e7b77665e3 Merge "logd: liblog: logcat: switch to android_log_clockid() (2)" am: 69504d646d am: d2fb3e10ee
am: 42901fb07d

* commit '42901fb07d69b699fa07bdd25aca4957c3dd0c10':
  logd: liblog: logcat: switch to android_log_clockid() (2)
2015-12-08 00:01:50 +00:00
Mark Salyzyn e18f028637 Merge "Revert "logd: liblog: logcat: switch to android_log_clockid()"" am: b566435b02 am: a64dd2d0b4
am: b97aaca6b2

* commit 'b97aaca6b283573e5dd035d4cfd92fd5450ac96f':
  Revert "logd: liblog: logcat: switch to android_log_clockid()"
2015-12-08 00:00:04 +00:00
Mark Salyzyn 48946e48e5 Merge "logd: liblog: logcat: switch to android_log_clockid()" am: 9eca0e775b am: 8acc9bc1cb
am: 945bde67f3

* commit '945bde67f39f119d5c3b3136de4b7757f1adc7b6':
  logd: liblog: logcat: switch to android_log_clockid()
2015-12-07 23:59:51 +00:00
Elliott Hughes ef119a14b8 Merge "Track rename of base/ to android-base/." am: 912ed3d8ca am: e2a9563be1
am: 3608ee5e90

* commit '3608ee5e903689ea7c433587be664649689816e1':
  Track rename of base/ to android-base/.
2015-12-07 23:59:44 +00:00
Dimitry Ivanov beceb6ef53 Merge "Native loader as a separate library" 2015-12-07 23:45:50 +00:00
Mark Salyzyn f8e546e609 liblog: Support for ANDROID_LOG_WRAP mode flag on reader
If ANDROID_LOG_WRAP is specified, add timeout=3600 to the reader
request. logd will comply by going to sleep with the socket open.
If the start time is about to wrap or get pruned in the specified log
buffers, then wakeup and dump the logs; or wakeup on timeout,
whichever comes first.

Bug: 25929746
Change-Id: I531b4317a20abcf3ba87d78c68fa2f268a4488ab
2015-12-07 14:24:02 -08:00
Dimitry Ivanov ac1b1919f8 Native loader as a separate library
Extracted native loader to separate library in order to
be able to reuse it for NativeActivities related native code
in libandroid_runtime.so

Bug: http://b/22548808
Change-Id: Ibcf5ddcdc5aba22e32e4b72887840e9c171c1986
2015-12-07 12:59:02 -08:00
Mark Salyzyn ba7a9a016b logd: liblog: logcat: switch to android_log_clockid() (2)
android_log_timestamp returns the property leading letter,
it is better to return a clockid_t with android_log_clockid()

Bug: 23668800
Change-Id: I38dee773bf3844177826b03a26b03215c79a5359
2015-12-07 18:45:31 +00:00
Mark Salyzyn b566435b02 Merge "Revert "logd: liblog: logcat: switch to android_log_clockid()"" 2015-12-07 18:31:44 +00:00
Mark Salyzyn 9e18cdcebd Revert "logd: liblog: logcat: switch to android_log_clockid()"
This reverts commit 77b5696b1d.

Change-Id: I7711bf1a7e3f72ed29a2498d7287b725a0e624bd
2015-12-07 18:30:58 +00:00
Mark Salyzyn 9eca0e775b Merge "logd: liblog: logcat: switch to android_log_clockid()" 2015-12-07 18:16:29 +00:00
Elliott Hughes 4f71319df0 Track rename of base/ to android-base/.
Change-Id: Idf9444fece4aa89c93e15640de59a91f6e758ccf
2015-12-04 22:00:26 -08:00
Mark Salyzyn 77b5696b1d logd: liblog: logcat: switch to android_log_clockid()
android_log_timestamp returns the property leading letter,
it is better to return a clockid_t with android_log_clockid()

Bug: 23668800
Change-Id: I3c4e3e6b87f6676950797f1f0e203b44c542ed43
2015-12-04 14:49:19 -08:00
Greg Hackmann c314b2b911 cutils: trace: add DATABASE tag
Change-Id: I00113b845cd8bef2e5c8efc0f0c3f4d61c3e7696
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-11-23 12:39:24 -08:00
Sergio Giro 43f13d0d68 Merge "libutils: fix cache removal when callback invalidates the key" am: b0df9dca7c am: e483305e47
am: a96cd36afb

* commit 'a96cd36afbff682e24365092dd85bbe9c9165afc':
  libutils: fix cache removal when callback invalidates the key
2015-11-20 17:17:38 +00:00
Sergio Giro b0df9dca7c Merge "libutils: fix cache removal when callback invalidates the key" 2015-11-20 17:09:10 +00:00
Sergio Giro b7170fe3fe libutils: fix cache removal when callback invalidates the key
Bug: 24785286
Change-Id: I9d17d2247258a56ef7776b3a701389e825a9c533
2015-11-20 14:54:51 +00:00
Mark Salyzyn 3e83beff9d Merge "liblog: resolve deadlocks" am: 8f8a88cad3 am: 247e22090a
am: f8dc0c9907

* commit 'f8dc0c990708039271c69ec1a75e7f3275bca3f0':
  liblog: resolve deadlocks
2015-11-19 22:58:14 +00:00
Mark Salyzyn 2d2e0a5c5e liblog: resolve deadlocks
Although ever present, an increased regression introduced with
commit b6bee33182 (liblog: logd:
support logd.timestamp = monotonic).

A signal handler can interrupt in locked context, if log is written
in the signal handler, we are in deadlock. To reduce the contention
and chances for this problem separate out timestamp lock from is
loggable lock to reduce contention situations. Provide a best-guess
response if lock would fail in timestamp path.

Use a common lock() inline within each module, with a comment speaking
to the issues surrounding calling a function that has a mutex within
a signal handler.

ToDo: Hold off signals temporarily in mainline, restart when unblock.
      Can not use pthread_sigmask(SIG_BLOCK,,) as it breaks AtCmd.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 25563384
Change-Id: I47e2c87c988c3e359eb9eef129c6a3a08e9eedef
2015-11-19 13:14:16 -08:00
Mark Salyzyn 2a3024f9ad Revert "liblog: resolve deadlocks"
(cherry pick from c2e7d4965f)

This reverts commit 7a2a307192.

Bug: 25693940
Change-Id: I9a7c926289e972f80c03c92e33535e1dedaa7381
2015-11-16 11:03:09 -08:00
Mark Salyzyn c2e7d4965f Revert "liblog: resolve deadlocks"
This reverts commit 7a2a307192.

Bug: 25693940
Change-Id: I9a7c926289e972f80c03c92e33535e1dedaa7381
2015-11-16 19:00:41 +00:00
Mark Salyzyn 9c68c0b831 Merge "liblog: resolve deadlocks" am: 5559f1d6e8 am: 650a06e01b
am: 9ed07e3eee

* commit '9ed07e3eee75a850f16e2cff7352c062f72f06b8':
  liblog: resolve deadlocks
2015-11-13 15:37:00 +00:00
Mark Salyzyn 7a2a307192 liblog: resolve deadlocks
Although ever present, an increased regression introduced with
commit b6bee33182 (liblog: logd:
support logd.timestamp = monotonic).

A signal handler can interrupt in locked context, if log is written
in the signal handler, we are in deadlock. Block signals while we
are locked. Separate out timestamp lock from is loggable lock to
reduce contention situations. Provide a best-guess response if
lock would fail in timestamp path.

Bug: 25563384
Change-Id: I6dccd6b99ebace1c473c03a785a35c63ed5c6a8a
2015-11-12 15:39:04 -08:00
Jon Larimer fd56dc41c7 Merge "Add macro to call event logger for errors. DO NOT MERGE" into klp-dev
am: 809d5a0158

* commit '809d5a01586d00ee91d13fb8d034d12584ba3314':
  Add macro to call event logger for errors. DO NOT MERGE
2015-11-11 13:50:40 +00:00
William Luh f6891c025a Add macro to call event logger for errors.
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:34:08 +00:00
William Luh 9a86c283cd Add macro to call event logger for errors. DO NOT MERGE
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:46 +00:00
William Luh f34258fa9b Add macro to call event logger for errors. DO NOT MERGE
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:32 +00:00
Christopher Wiley 7f84d9aa9f Merge "libutils: Add UNEXPECTED_NULL status_t" am: 2f33e0cb17 am: 3a380b4843
am: 8831e30b5c

* commit '8831e30b5cdbdf20ccf95897e0e4dade37aa3134':
  libutils: Add UNEXPECTED_NULL status_t
2015-11-10 22:33:25 +00:00
William Luh 4fd82100cc Add macro to call event logger for errors. DO NOT MERGE
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-11-10 22:33:10 +00:00
Christopher Wiley 2f33e0cb17 Merge "libutils: Add UNEXPECTED_NULL status_t" 2015-11-10 22:20:54 +00:00
Christopher Wiley c3441e69c0 libutils: Add UNEXPECTED_NULL status_t
We use this specifically in situations where we expect to read
an object from a Parcel, but fail because the object is null.

Bug: 25617251

Change-Id: Id0b6118b19a932998b5028e30dc15d70e4d7f9c3
2015-11-10 11:12:43 -08:00
Nick Kralevich bdf20142b9 Merge "Enable hidepid=2 on /proc" am: 2d8f1d4c47 am: ea8452cc72
am: 7dafe5b818

* commit '7dafe5b818f7771cb00c4a0ea3ab1dbf74593185':
  Enable hidepid=2 on /proc
2015-11-09 20:41:19 +00:00
Nick Kralevich c39ba5ae32 Enable hidepid=2 on /proc
Add the following mount options to the /proc filesystem:

  hidepid=2,gid=3009

This change blocks /proc access unless you're in group 3009
(aka AID_READPROC).

Please see
  https://github.com/torvalds/linux/blob/master/Documentation/filesystems/proc.txt
for documentation on the hidepid option.

hidepid=2 is preferred over hidepid=1 since it leaks less information
and doesn't generate SELinux ptrace denials when trying to access
/proc without being in the proper group.

Add AID_READPROC to processes which need to access /proc entries for
other UIDs.

Bug: 23310674
Change-Id: I22bb55ff7b80ff722945e224845215196f09dafa
2015-11-09 09:08:46 -08:00
Sanket Agarwal ce86a59aa0 Merge "Add emergency announcement to definitions." 2015-11-05 21:14:45 +00:00
Dan Albert 8f3ef3fd09 Merge "Use std::unique_ptr instead of UniquePtr." am: 0f61f86870 am: 0c69e9f271
am: 40f76c2fed

* commit '40f76c2fedb18664adab73e40b8b64227601d4e6':
  Use std::unique_ptr instead of UniquePtr.
2015-11-05 21:11:03 +00:00
Sanket Agarwal 2ccc52c3bb Add emergency announcement to definitions.
Change-Id: I57b1d6d5a0f8142efba27a17e6015429eba04f5c
(cherry picked from commit 2d0a4c10b6601e5f16a336d44f8536a7277d52d3)
2015-11-05 19:23:01 +00:00
Pablo Ceballos 15a54a97fe Merge "Expose setSingleBufferMode in ANativeWindow" 2015-11-05 18:14:08 +00:00
Dan Albert f2d2509690 Use std::unique_ptr instead of UniquePtr.
Bug: http://b/22403888
Change-Id: I398fa43b8f33c9281d7ff238521d75f1dcb8a5e7
2015-11-05 01:09:22 -08:00
Pablo Ceballos 923d27f20d Expose setSingleBufferMode in ANativeWindow
Bug 24940410

Change-Id: Ied57f1bef1988bdd0bf4dd95572f0985c9d43c2d
2015-11-03 10:56:25 -08:00
John Reck dc7694eac5 Merge "Teach sp<> how to std::move" am: 518d043c86 am: bb12b91ae1
am: a573d6b186

* commit 'a573d6b18686266667c8efd9d7291ecd28efa67c':
  Teach sp<> how to std::move
2015-11-03 00:14:15 +00:00
John Reck 518d043c86 Merge "Teach sp<> how to std::move" 2015-11-02 21:34:50 +00:00
Andy Hung fec47527b4 Add audioserver uid and restart service when needed
Bug: 24511453
Change-Id: I6987a82149d23ad671478cf21488c62cb1ecfc93
2015-10-30 16:58:59 -07:00
Adam Lesinski eb6eb3756c Merge "Add deflate compression to ZipWriter" am: ac60abdd70 am: 42f8538df5
am: 6c873088e7

* commit '6c873088e7171edd89977a530ed8025855049732':
  Add deflate compression to ZipWriter
2015-10-30 17:07:18 +00:00
Adam Lesinski ac60abdd70 Merge "Add deflate compression to ZipWriter" 2015-10-30 16:55:55 +00:00
Mark Salyzyn ce5335702b Merge changes Iefbea3b1,Ieb924b6d am: bb51fbc4d4 am: 9d4203aae1
am: 91a7685e65

* commit '91a7685e653234ae99547ca9cfeac3ea7de17307':
  liblog: add android_log_timestamp() private function
  liblog: logcat: add epoch and monotonic format modifiers
2015-10-29 23:16:42 +00:00
Mark Salyzyn 500afc7532 liblog: add android_log_timestamp() private function
Change-Id: Iefbea3b1be2f97cfdeb35e5330e5495e0337215b
2015-10-29 14:23:42 -07:00
Mark Salyzyn 4cbed02e44 liblog: logcat: add epoch and monotonic format modifiers
- '-v epoch' prints seconds since Jan 1 1970
- '-v monotonic' print cpu seconds since start of device
- '-T sssss.mmm...' as alternate tail time format

NB: monotonic is a best estimate and may be out by a few ms
    given the synchronization source clue accuracy.

Bug: 23668800
Change-Id: Ieb924b6d3817669c7e53beb9c970fb626eaad460
2015-10-29 14:23:42 -07:00
John Reck d69089a742 Teach sp<> how to std::move
Arguably we should migrate to std::shared_ptr
but for now make std::vector<sp<>> a bit less
horrible

Change-Id: Ia458a2daff0b656b2f3310b3ea100565ec844c69
2015-10-29 07:17:40 -07:00
Marco Nelissen 05ac6c2dd5 New uid for extractor process
Change-Id: I462d4736e772da0a08b4793fc1b971ff261667ea
2015-10-28 10:14:05 -07:00
Adam Lesinski 591fd3953d Add deflate compression to ZipWriter
Use zlib to deflate compress data into the zip file.

Change-Id: If094b926a67e199be976c3190781cd0101dd66e1
2015-10-20 12:40:33 -07:00
Daniel Erat fb371d6a6b Merge "libbinderwrapper: Add GetCallingUid() and GetCallingPid()." 2015-10-16 21:43:36 +00:00
Daniel Erat 7cba9db9cd libbinderwrapper: Add GetCallingUid() and GetCallingPid().
Add methods to BinderWrapper for getting the caller's UID
and PID while in a transaction.

Bug: 24988639
Change-Id: Ibd711fc6b3d83623d4bb1060838c65aaef30d76e
2015-10-16 09:04:33 -06:00
Adam Lesinski ad4ad8cfc8 Implement ZipWriter for quickly writing ZipFiles.
The ZipWriter implementation exposes a stateful interface that allows
bytes of data to be streamed in as they arrive. ZipEntries can be
compressed and/or aligned on a 32-bit boundary for mmapping at runtime.

Change-Id: I43ac9e661aa5022f00d9e12b247c4314d61c441c
2015-10-15 16:27:44 -07:00
Sergio Giro 0cb59c0dce system/core: fix iterator for LruCache
Was failing to return the first element

Change-Id: Ic803f5d463a56519212014d0d190407cf4b859cf
2015-10-12 16:13:44 +01:00
Gilad Arnold 65475f8cc8 am b955f476: Merge "Add a "tlsdate" AID for unprivileged tlsdate execution."
* commit 'b955f476d3b11da9378d5eedfc569711f625e1ba':
  Add a "tlsdate" AID for unprivileged tlsdate execution.
2015-10-02 18:41:05 +00:00
Gilad Arnold b5fa88955c Add a "tlsdate" AID for unprivileged tlsdate execution.
Bug: 23651876
Change-Id: I7ab1bccdcd2434c4af663a1afb9fe9ad124c4428
2015-10-02 08:42:43 -07:00
Adam Lesinski bda375fa41 am c6c6ab50: Merge "Implement C++11 move semantics for android::FileMap"
* commit 'c6c6ab50bc11d55f3135312ceccbcf0c400b437e':
  Implement C++11 move semantics for android::FileMap
2015-10-02 01:19:25 +00:00
Adam Lesinski 6f8885bc14 Implement C++11 move semantics for android::FileMap
FileMaps should be movable, thereby not requiring them to be only used
with a unique_ptr as they currently are.

Change-Id: I0fb8013bf398a2ced5420d85ba888c2a7fc5a496
2015-10-01 12:47:49 -07:00
Sergio Giro bdae9bf2ec resolved conflicts for 70808827 to stage-aosp-master
Change-Id: I2de8a63fa5be5423846df4c2e8ccc5f12e843f09
2015-10-01 19:49:22 +01:00
Sergio Giro f84a4906fa system/core: remove BasicHashtable
Towards deprecation of SharedBuffer

Change-Id: Id6d1c8637583df38b6f28398b6804d9c1e96472a
2015-10-01 11:44:47 +01:00
Mark Salyzyn 351c211cc1 am 447356dd: Merge "liblog: logcat: Add year and zone to date on each line"
* commit '447356ddb4a18cc5899009fcdc450675ab9974bf':
  liblog: logcat: Add year and zone to date on each line
2015-09-30 20:04:54 +00:00
Sergio Giro b5a00d6b2e am e0453334: Merge "system/core: remove methods returning SharedBuffer in String8, String16"
* commit 'e045333445ab3ebb8d602d25ed750169f135baa6':
  system/core: remove methods returning SharedBuffer in String8, String16
2015-09-30 20:04:50 +00:00
Mark Salyzyn 447356ddb4 Merge "liblog: logcat: Add year and zone to date on each line" 2015-09-30 18:56:48 +00:00
Sergio Giro e045333445 Merge "system/core: remove methods returning SharedBuffer in String8, String16" 2015-09-30 15:21:48 +00:00
Sergio Giro 282efae9c3 system/core: remove methods returning SharedBuffer in String8, String16
Towards deprecation of SharedBuffer

Change-Id: I3069837db32837bcc0f5d8f1118ccd502c9070dc
2015-09-30 15:42:02 +01:00
Sergio Giro 8e2c820819 am 730fdbb1: Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable"
* commit '730fdbb1ca4c39a4d69868f7a261b023f2bea296':
  system/core: change LruCache to use unordered_set instead of BasicHashTable
2015-09-30 13:20:02 +00:00
Sergio Giro 730fdbb1ca Merge "system/core: change LruCache to use unordered_set instead of BasicHashTable" 2015-09-30 13:15:21 +00:00
Sergio Giro bb58cde899 system/core: change LruCache to use unordered_set instead of BasicHashTable
Towards deprecation of BasicHashTable

Change-Id: I3f3d904636a85a794cccf972f6e4a94e7f3808f5
2015-09-30 13:48:30 +01:00
Sami Tolvanen c6ca7a5a31 am eccf0a45: Merge "utils: add pwrite64 to Compat.h for Mac"
* commit 'eccf0a4502293d628152888be85d1cd6fa0b4751':
  utils: add pwrite64 to Compat.h for Mac
2015-09-28 16:02:35 +00:00
Sami Tolvanen 8731d30085 utils: add pwrite64 to Compat.h for Mac
Compat.h has lseek64 and pread64, but it's missing pwrite64.

Change-Id: I02b4adf5a5e15e55e008ff1ba8113a75faf1c4e9
2015-09-28 16:52:38 +01:00
Mark Salyzyn f28f6a9ba2 liblog: logcat: Add year and zone to date on each line
- '-v year' modifier adds the four digit year prefix
- '-v <timezone>' modifier sets and prints the timezone suffix
- Only promise in logcat to support UTC as a timezone since
  all others are based on the configured environment
- '-v zone' modifier toggles the timezone suffix on or off
- '-T YYYY-MM-DD HH:MM:SS.mmm...' format is added

Bug: 23668700
Change-Id: I7521c1efb7455dc9a25434fce72a69a65dcf72ea
2015-09-24 14:49:55 -07:00
Sergio Giro f777655d85 resolved conflicts for 6ee734cf to stage-aosp-master
Change-Id: Ia06c4d941d9b8828707299bb363f51fab5549897
2015-09-23 17:58:25 +01:00
Sergio Giro 6ee734cfa0 Merge "libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory" 2015-09-23 15:43:44 +00:00
Sergio Giro d2529f2830 libutils: hide SharedBuffer by moving SharedBuffer.h to the implementation directory
Some methods in header files of classes using SharedBuffer need
to be moved to the implementation files accordingly

Change-Id: I891f3ace2b940ab219e4e449040bfed71c0547db
2015-09-23 16:22:59 +01:00
Yabin Cui 33f027247d am 65744003: Merge "Revert "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing."""""
* commit '65744003a9139f87d302266c1f03fb98f9b496dc':
  Revert "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing.""""
2015-09-22 22:10:39 +00:00
Yabin Cui 9e402bb20c Revert "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing.""""
This reverts commit 94ece83270.

Change-Id: Ie06465c89a5fc115517130f9f2904cc855973155
2015-09-22 04:46:57 +00:00
Yabin Cui 27b455bb0c am 00ea49fc: Merge "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing.""""
* commit '00ea49fc98870470b33041e0b3c3f83c91ff1007':
  Revert "Revert "Revert "Add BacktraceOffline for offline backtracing."""
2015-09-22 01:44:51 +00:00
Yabin Cui 94ece83270 Revert "Revert "Revert "Add BacktraceOffline for offline backtracing."""
This reverts commit 0a411c934a.

Change-Id: Ic1824afac6c32f1087b66de9d6368a561f235d13
2015-09-22 01:38:17 +00:00
Yabin Cui 92db97dea0 am ebc49654: Merge "Revert "Revert "Add BacktraceOffline for offline backtracing."""
* commit 'ebc49654671f62eca118f7504239f8627c317535':
  Revert "Revert "Add BacktraceOffline for offline backtracing.""
2015-09-21 21:29:25 +00:00
Yabin Cui 0a411c934a Revert "Revert "Add BacktraceOffline for offline backtracing.""
This reverts commit ab5e583327.

And statically link llvm libraries on host to remove dependency
on 32-bit llvm shared library which is not included in the prebuilt.

Bug: 22229391

Change-Id: I8210687655ee1809fd820ab2a6ca5dfaf3f9096d
2015-09-21 12:54:45 -07:00
Yabin Cui 84c5dd0f17 am 94c617cc: Merge "Revert "Add BacktraceOffline for offline backtracing.""
* commit '94c617ccbba4db673a6c4cc682927e630a8feaf0':
  Revert "Add BacktraceOffline for offline backtracing."
2015-09-17 23:06:42 +00:00
Yabin Cui 94c617ccbb Merge "Revert "Add BacktraceOffline for offline backtracing."" 2015-09-17 22:58:36 +00:00
Yabin Cui ab5e583327 Revert "Add BacktraceOffline for offline backtracing."
Using llvm makes libbacktrace stops building for 32 bit on linux host x86_64.

This reverts commit c9c6b6ee77.

Change-Id: Ieb807db881d7bb3132cd09e25fd08c28766ca0a8
2015-09-17 22:54:22 +00:00
Yabin Cui fe9652946e am ee645af4: Merge "Add BacktraceOffline for offline backtracing."
* commit 'ee645af487e8611bcc80a4fad841bdd05e36e9f3':
  Add BacktraceOffline for offline backtracing.
2015-09-17 22:22:31 +00:00
Yabin Cui ee645af487 Merge "Add BacktraceOffline for offline backtracing." 2015-09-17 22:07:04 +00:00
Yabin Cui c9c6b6ee77 Add BacktraceOffline for offline backtracing.
It is used by simpeleprf for stack unwinding.

Bug: 22229391
Change-Id: I26d698610ccdc9545da837bc5a8a9ec787f27a6b
2015-09-16 17:38:23 -07:00
Daniel Erat 1b2bbba306 am 3fa97b3c: Merge "Add libbinderwrapper."
* commit '3fa97b3cc3787ad7a58a5348e147cef67d9439e6':
  Add libbinderwrapper.
2015-09-12 20:43:01 +00:00
Daniel Erat be43a39ff5 Add libbinderwrapper.
Add a library that wraps libbinder to make it possible to
write tests for native code that communicates via binder.

Bug: 23791723
Change-Id: I3c842413e0f07dc252040c042d664031b0354353
2015-09-09 14:21:28 -06:00
Jorge Lucangeli Obes fd7a9f79f2 am 66d32c74: Merge "Use CAP_MASK_LONG for file capabilities."
* commit '66d32c7488e12545218e83195738c95c183760ef':
  Use CAP_MASK_LONG for file capabilities.
2015-09-03 15:55:32 +00:00
Jorge Lucangeli Obes e920c46e7d Use CAP_MASK_LONG for file capabilities.
Extract the |1ULL << $CAP_NAME| construct to a macro, to avoid
repeating it.

Change-Id: I9312c27130d7e6c5b6ab3b4cc5c70a6b98378b98
2015-09-02 17:18:44 -07:00
Yasuhiro Matsuda fcdd7ea34f am 7b0bdec4: Merge "Add a tag for tracing system server."
* commit '7b0bdec4b294dff29af1cf75118be5f3d2b346b9':
  Add a tag for tracing system server.
2015-09-02 14:25:48 +00:00
Yasuhiro Matsuda 7b0bdec4b2 Merge "Add a tag for tracing system server." 2015-09-02 12:54:23 +00:00
William Luh a03c55c7e4 am 001c87c3: Merge "Add macro to call event logger for errors."
* commit '001c87c3cd4676ef14f7c08ade380fbb7870eda6':
  Add macro to call event logger for errors.
2015-08-27 16:26:24 +00:00
William Luh 964428c0a6 Add macro to call event logger for errors.
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2015-08-26 15:59:06 -07:00
Nick Kralevich 78d632a01d am 38f4a139: am 532e6cde: Merge "libcutils: cleanups for -fsanitize=integer"
* commit '38f4a1391e499c2392cd8136061153cc35438eb3':
  libcutils: cleanups for -fsanitize=integer
2015-08-26 18:51:00 +00:00
Nick Kralevich 7390478f19 libcutils: cleanups for -fsanitize=integer
Hash functions rely on overflow behavior, so whitelist them.

ATRACE_TAG_NOT_READY: use an unsigned constant when shifting bits.
Otherwise, the value overflows on shift. The users of this constant
assign it to a uint64_t variable.

Change-Id: I21c437ce2083525e906c3ead3259ec34a1ef4b66
2015-08-26 10:40:00 -07:00
Nick Kralevich 50659902d2 am 4f0a7cb8: am 786e5e26: Merge "libutils: cleanups for -fsanitize=integer"
* commit '4f0a7cb8e15ce50f7da6a71c96335bd0b7394492':
  libutils: cleanups for -fsanitize=integer
2015-08-24 16:02:36 +00:00
Nick Kralevich 1f28698998 libutils: cleanups for -fsanitize=integer
* Hashing functions rely on integer overflow behavior.
Mark those functions as safe.

* abort() if a passed in size_t value is greater than
UINT32_MAX. This can occur on 64 bit builds where size_t
is larger than uint32_t.

* Special case the index lookup for an empty sorted vector.
Without the special case, size() == 0, and size()-1 underflows.

Change-Id: I343a14b589fc8f0d221c1998ae5d6f0b9e2781f8
2015-08-24 15:52:22 +00:00
Elliott Hughes 6cec026e86 am 8c86e4e2: am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."
* commit '8c86e4e2c075c7a879a9f73b56ab075dde61176a':
  Remove a HAVE_MS_C_RUNTIME I missed.
2015-08-19 01:39:16 +00:00
Elliott Hughes 27507d8ba1 Remove a HAVE_MS_C_RUNTIME I missed.
Change-Id: I063c6c802b8967d812d4f4a0972f00b0a88704af
2015-08-18 18:03:04 -07:00
Elliott Hughes 8528d9cfb4 am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."
* commit '8025096e2e523d6d03a35b19471793f85e03ec1a':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.
2015-08-17 21:05:52 +00:00
Elliott Hughes cd4ef7581d Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.
Change-Id: I202c3185d177c85d02ee5d9f7e5bf3422c1422db
2015-08-17 12:38:58 -07:00
Yasuhiro Matsuda 715f463428 Add a tag for tracing system server.
This change is needed for
https://android-review.googlesource.com/#/c/157562/

BUG: 21739901
Change-Id: Ia6b9414de82c210f3d7a275d21b8cd00bd19dcdf
2015-08-07 18:44:07 +09:00
Elliott Hughes f87bc34412 am 802c6fd0: am ff52e23f: Merge "Stop being silly."
* commit '802c6fd0900863b576b9d2c1b0b482988f14dd33':
  Stop being silly.
2015-08-06 17:36:12 +00:00
Elliott Hughes 5be6b37c5d Stop being silly.
Change-Id: I9c18205457396d625502a83e374c1207a3d90b0b
2015-08-06 08:46:32 -07:00
Todd Kennedy 9492722131 am 1f6204a8: am 6782ca0b: Merge "Add a trace constant for PackageManager"
* commit '1f6204a8856dd85dd3f83f692a4edf2c81c37cbd':
  Add a trace constant for PackageManager
2015-08-03 17:57:51 +00:00
Todd Kennedy da106ad28c Add a trace constant for PackageManager
Change-Id: Iff63b3d31ba9b997bd61c58c9df5afe2dfd7be7a
2015-08-03 09:58:01 -07:00
Jorge Lucangeli Obes df01d12e14 am 45ca3d54: am a336cbcd: Merge "Reserve new UID range for OEM."
* commit '45ca3d54e0f6be4237efcef5ff121a263d81971d':
  Reserve new UID range for OEM.
2015-08-01 00:57:07 +00:00
Jorge Lucangeli Obes b93b9d4867 Reserve new UID range for OEM.
Brillo will need to run new native system services, so reserve
a reasonable UID range to accomodate them. Having 1000 UIDs will
allow us to sub-partition this range if needed.

The range can be used by any OEM, not just Brillo, so name it
accordingly.

Bug: 22555869
Change-Id: I752428ee5025bf064a35ecbe6da50c041d87b724
2015-07-31 14:13:49 -07:00
Elliott Hughes 145afc2cc4 am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit 'fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f':
  Use __ANDROID__ instead of HAVE_ANDROID_OS.
2015-07-30 16:50:15 +00:00
Elliott Hughes e6e71608bd Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." 2015-07-30 16:34:47 +00:00
Elliott Hughes 9b828adfad Use __ANDROID__ instead of HAVE_ANDROID_OS.
Change-Id: I9967f3fd758c2a5b40be5b60ae72be7e2fb75136
2015-07-30 09:33:43 -07:00
Elliott Hughes c6dbc85845 am 42dbc4b1: am 44443bea: Merge "Use _WIN32 rather than HAVE_WINSOCK."
* commit '42dbc4b1859fe4de16b19e9b74324b345c5fcb9d':
  Use _WIN32 rather than HAVE_WINSOCK.
2015-07-30 15:17:07 +00:00
Elliott Hughes 44443bead6 Merge "Use _WIN32 rather than HAVE_WINSOCK." 2015-07-30 14:49:56 +00:00
Elliott Hughes 841e96f4d1 am ae7e8d44: am 6fd4de76: Merge "Fix Win32 <ziparchive/zip_archive.h>."
* commit 'ae7e8d44b0d5e00e8487e6a53d7abf87fb2477dd':
  Fix Win32 <ziparchive/zip_archive.h>.
2015-07-30 03:44:35 +00:00
Elliott Hughes bb50a393ff Fix Win32 <ziparchive/zip_archive.h>.
Contrary to the comment in AndroidConfig.h, mingw does have
__BEGIN_DECLS and __END_DECLS; you just have to #include <sys/cdefs.h>
first. Which is strictly true normally too, but you're going to
get it transitively with bionic or glibc.

Change-Id: I2f2de45f56a7217f91df322d8e896280997ae7a0
2015-07-29 19:58:57 -07:00
Elliott Hughes adbf442a51 Use _WIN32 rather than HAVE_WINSOCK.
Change-Id: I9855b6fe72e2f2f3a8360c0993a67cb988024ee4
2015-07-29 17:45:24 -07:00
Elliott Hughes 92a3d2ba32 am 34c92f46: am fc2f1e61: Merge "Move libutils off AndroidConfig.h."
* commit '34c92f4652651697a7de7fa10c214afed9a6658a':
  Move libutils off AndroidConfig.h.
2015-07-30 00:15:35 +00:00
Elliott Hughes 1f8bc86a7d Move libutils off AndroidConfig.h.
Change-Id: Ia0e4a4f968c640eb44317821d2dc6b195f9f490e
2015-07-29 14:31:54 -07:00
Elliott Hughes 5937a860f3 am 1f76c1ab: am 9727a6a0: Merge "Report getaddrinfo failures correctly."
* commit '1f76c1abea3196a61f85164a078d44505d3a6b5e':
  Report getaddrinfo failures correctly.
2015-07-24 21:02:36 +00:00
Elliott Hughes 381cfa9a8b Report getaddrinfo failures correctly.
Also move us off the "convenience" function because you can't get useful
error reporting from it.

Change-Id: I5fcc6a6d762f5f60906980a7835f01a35045be65
2015-07-23 21:14:38 -07:00
Yusuke Sato 7c842b57fe am ab64465d: am 0e3ce82b: Merge "Use fsck.f2fs -a instead of -f for faster boot"
* commit 'ab64465d1f16f414c0bde5e3c4707c32b8220bbc':
  Use fsck.f2fs -a instead of -f for faster boot
2015-07-21 18:25:57 +00:00
Yusuke Sato 0e3ce82b94 Merge "Use fsck.f2fs -a instead of -f for faster boot" 2015-07-21 16:06:40 +00:00
Daniel Erat cca5c3f172 am 3a8a3241: am 4812f8dd: Merge "Add a "dbus" AID for running dbus-daemon."
* commit '3a8a32413615643320bb140a24ab1d77d9aea804':
  Add a "dbus" AID for running dbus-daemon.
2015-07-20 15:26:50 +00:00
Daniel Erat f7b8cae2ef Add a "dbus" AID for running dbus-daemon.
Bug: 22328216
Change-Id: I8478f57d892c6edeb6b101cfa8b38dc5c6262cb2
2015-07-17 16:04:54 -06:00
Yusuke Sato 0df08271fb Use fsck.f2fs -a instead of -f for faster boot
and run fsck with -f on clean shutdown instead.

With -f, fsck.f2fs always performs a full scan of the /data
partition regardless of whether the partition is clean or not.
The full scan takes more than 2 seconds on volantis-userdebug
and delays the OS boot.

With -a, the command does almost nothing when the partition
is clean and finishes within 20-30ms on volantis-userdebug.
When the partition has an error or its check point has
CP_FSCK_FLAG (aka "need_fsck"), the command does exactly the
same full scan as -f to fix it.

Bug: 21853106
Change-Id: I126263caf34c0f5bb8f5e6794454d4e72526ce38
2015-07-15 10:13:51 -07:00
Yin-Chia Yeh 84cf943afb am 0fdee393: Merge "graphics: update flexible YUV format gralloc requirement" into mnc-dev
* commit '0fdee3938ed58dac86755d04bc2a7d280ba158e7':
  graphics: update flexible YUV format gralloc requirement
2015-07-14 19:52:09 +00:00
Yin-Chia Yeh 0fdee3938e Merge "graphics: update flexible YUV format gralloc requirement" into mnc-dev 2015-07-14 19:42:24 +00:00
Yin-Chia Yeh e49b696a35 graphics: update flexible YUV format gralloc requirement
Require gralloc accept flexible YUV when SW READ/WRITE usage is
set. Also decouple flexible YUV from camera usage flag.

Bug: 22379456
Change-Id: I5a82a8360b08036c31dc03cd639d449ba1e3ed01
2015-07-14 12:28:38 -07:00
Thierry Strudel a0fbb90885 am 8703bea1: Merge "fs_config: replace getenv(\'OUT\') by new fs_config parameter" into mnc-dev
* commit '8703bea1807326fef9835bc474e7a7288c725925':
  fs_config: replace getenv('OUT') by new fs_config parameter
  fs_mgr: Use ro.boot.veritymode
2015-07-10 18:44:51 +00:00
Thierry Strudel df33ffadd2 fs_config: replace getenv('OUT') by new fs_config parameter
Using a getenv('OUT') in such a deep down function is a wrong design
choice. Replacing with explicit parameter that may be NULL in case
device specific files can be accessed from /.
Since TARGET_COPY_OUT_SYSTEM may be defined to something different than
system we also ensure that we use a path relative to TARGET_OUT to
compute path to fs_config_* files.

Bug: 21989305
Bug: 22048934
Change-Id: Id91bc183b29beac7379d1117ad83bd3346e6897b
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-09 21:47:07 -07:00
Yusuke Sato 7522b3d58f am 95a37e75: am 692dc75d: Merge "Rename ZipEntryName to ZipString"
* commit '95a37e756e42507d35c8d16f952cd696f7d6109d':
  Rename ZipEntryName to ZipString
2015-06-29 20:22:38 +00:00
Yusuke Sato 07447544ad Rename ZipEntryName to ZipString
since the struct is now used for other purposes. Also add some
comparator functions to the struct to simplify zip_archive.cc.

This is a follow-up CL for f1d3d3b247.

Bug: 21957428
Change-Id: I60d4171eeacc561d59226d946e9eb5f9c96d80cf
2015-06-26 10:34:01 -07:00
Yusuke Sato f1d3d3b247 Add |optional_suffix| to StartIteration()
so that PackageManagerService can iterate over files with a
specific file extension like ".so".

(cherry picked from commit a4a80693d9)

Bug: 21957428
Change-Id: I36ba3c33a8b366a65f67cb6d156067c5caca1151
2015-06-25 14:10:05 -07:00
Yusuke Sato 57a4640f8a am 5c8f6f22: Merge "Add |optional_suffix| to StartIteration()" into mnc-dev
* commit '5c8f6f22c52dca2ff968b2bf654c340006b0b240':
  Add |optional_suffix| to StartIteration()
2015-06-25 16:02:04 +00:00
Yusuke Sato a4a80693d9 Add |optional_suffix| to StartIteration()
so that PackageManagerService can iterate over files with a
specific file extension like ".so".

Bug: 21957428
Change-Id: I76ed9560d4d1e00d297a97d518ec357166be1981
2015-06-23 17:31:16 -07:00
Nick Kralevich ba2c2a8c70 am cb2d0c5a: am 7015b3be: Merge "TypeHelpers.h: Don\'t underflow unsigned int"
* commit 'cb2d0c5aadd2c8e979d696c0bbdc6783067f1c76':
  TypeHelpers.h: Don't underflow unsigned int
2015-06-15 17:51:29 +00:00
Nick Kralevich 58bf572aa2 TypeHelpers.h: Don't underflow unsigned int
When decrementing "n", eventually n will equal zero. When that
happens, n-- underflows. This causes a crash when code which uses
clang's -fsanitize=unsigned-integer-overflow is run.

Avoid trigging an unsigned integer underflow.

Change-Id: I9705be6580d61a164ef5fb1ec77e98a69d888438
2015-06-13 17:49:24 -07:00
Tim Murray b769c8d24f add cpuset support to libcutils
bug 21782794

Change-Id: I249531754fb29442dc3c7434d77dbb103f4220a7
2015-06-11 18:35:46 -07:00
Eino-Ville Talvala 414fb90eae Camera: Add new set video format/dataspace command
This allows the video encoding subsystem inform the camera what format
and dataspace should be used for metadata-mode buffers.

This is necessary to allow software encoders and other generic
consumers that cannot interpret
HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED buffers.

Bug: 13222807
Change-Id: I01090dc4dce11f075f7d3cd86daca5ecf3d9e995
2015-06-08 13:21:27 -07:00
Mark Salyzyn 5d332907f0 liblog: logcat: Add printable format modifier
(cherry pick from commit b932b2f8ba)

- added printable format modifier:
  logcat -v printable
- opencoded borrowed individual utf8 validity checking algorithm
  from utf8_length() in libutils/Unicode.cpp
- if considered basic one-character ASCII, use popular \x escape
  sequences for non-printable
- logprint convert to C comments to drop mixed-mode

Bug: 19000361
Change-Id: I122a5b8fb41216fc0bc816178c0b768f3df56586
2015-06-04 08:37:14 -07:00
Mark Salyzyn b932b2f8ba liblog: logcat: Add printable format modifier
- added printable format modifier:
  logcat -v printable
- opencoded borrowed individual utf8 validity checking algorithm
  from utf8_length() in libutils/Unicode.cpp
- if considered basic one-character ASCII, use popular \x escape
  sequences for non-printable
- logprint convert to C comments to drop mixed-mode

Bug: 19000361
Change-Id: I122a5b8fb41216fc0bc816178c0b768f3df56586
2015-06-04 08:27:29 -07:00
Christopher Ferris 21bd040eff Change the 64 bit map address format.
Previously, the map printing in tombstones for 64 bit devices uses
a variable length value. This means that the maps are not lined up.
The new format is to print the map as 00000000'00000000 in all ways.

Also fix a bug where the backtrace_map_t did not initialize all
parameters.

Add unit tests for all of the dump_all_maps function.

Bug: 20950813
(cherry picked from commit 862fe02919)

Change-Id: Ife5c48bddeb19006a98f9e87520474e97b97f6d9
2015-06-03 12:12:31 -07:00
Christopher Ferris 493cdcbb77 Merge "Change the 64 bit map address format." 2015-06-03 18:53:42 +00:00
Christopher Ferris 862fe02919 Change the 64 bit map address format.
Previously, the map printing in tombstones for 64 bit devices uses
a variable length value. This means that the maps are not lined up.
The new format is to print the map as 00000000'00000000 in all ways.

Also fix a bug where the backtrace_map_t did not initialize all
parameters.

Add unit tests for all of the dump_all_maps function.

Bug: 20950813
Change-Id: I30901c8a0251b00d85c4c01476b033ef8db84e32
2015-06-03 10:24:21 -07:00
Andreas Gampe e2452b4bf3 LibNativeBridge: Version 2
Add a callback function to retrieve "signal handler" from the bridge,
if the bridge wants it to be managed by the runtime. The signal handler
will be invoked after the runtime's own one, and before any other
chained handler.

Add a callback function to check compatibility of the bridge with the
library.

Add a function to expose the native bridge version. Add a test for this
function.

Bug: 20217701

(cherry picked from commit a6ac9ce98b)

Change-Id: Ic23a60b949f119c7d8b0e7cb27a61e6c16532a23
2015-05-31 16:58:24 -07:00
Arman Uguray 0aee2ac3a0 system/audio.h: Make function inline
This patch makes the audio_device_address_to_parameter inline. All of the other
helpers defined in this header are inline functions except for this one and this
causes compile failures when -Werror=unused-function is used.

BUG=21339022

Change-Id: I7db58bf7bed3b89b6752ec2cd2c1f358ba2a4d89
2015-05-29 16:12:31 -07:00
Eino-Ville Talvala 0ca24ff56b Merge "Graphics depth formats: Add confidence values" into mnc-dev 2015-05-27 17:40:25 +00:00
Michael Lentine 338142aa81 Merge "Adding a build id check to blob cache." into mnc-dev 2015-05-27 17:39:23 +00:00
Eino-Ville Talvala 20651b5c7d Graphics depth formats: Add confidence values
Supplement the dense and sparse depth image formats with
confidence values.

For {HAL_PIXEL_FORMAT_Y_16, HAL_DATASPACE_DEPTH}, use the 3 MSBs
for confidence.

For {HAL_PIXEL_FORMAT_BLOB, HAL_DATASPACE_DEPTH}, add a 4th float
value for confidence.

Bug: 20123879
Change-Id: Idc27081efec682a712ce77ccfec59328f298b944
2015-05-26 14:50:48 -07:00
Andreas Gampe 02b29c49d4 Merge "LibNativeBridge: Version 2" 2015-05-21 00:21:02 +00:00
Michael Lentine 6078805023 Adding a build id check to blob cache.
Add a build id field to the header structure in blob cache. Add build
id support with reading and writing the cache. When the cache gets
written it writes the build id at the end of the header. When read it
checks to see if there is a match between the current version and the
version in the cache. If not, it invalidates the cache which would
typically only occur during an ota update.  Also remove blob cache
from the host build.

bug: 18262905

Change-Id: I753b1de1986703a4c1c8691b9d2bb533b2546143
2015-05-18 13:14:32 -07:00
Andreas Gampe a6ac9ce98b LibNativeBridge: Version 2
Add a callback function to retrieve "signal handler" from the bridge,
if the bridge wants it to be managed by the runtime. The signal handler
will be invoked after the runtime's own one, and before any other
chained handler.

Add a callback function to check compatibility of the bridge with the
library.

Add a function to expose the native bridge version. Add a test for this
function.

Bug: 20217701
Change-Id: Ic23a60b949f119c7d8b0e7cb27a61e6c16532a23
2015-05-14 20:20:49 -07:00
Dan Albert cd206b3900 Fix gettid() on Windows.
Accidentally had this all hidden by an #ifndef _WIN32 when I wrote it.

Bug: 19517541

(cherry picked from commit b3a36ca5ee)

Change-Id: Ifbd5d19e506e7313700e2e29a2dae5736e049844
2015-05-13 13:43:32 -07:00
Mark Salyzyn 79c3815ca1 logcat: liblog: Add "usec" format argument
(cherry pick from commit e1f2004ecc)

- Add additional 3 digits of time precision for time output
  adding in the reporting of usec
- Remove trailing space in header file

Change-Id: Ifb560850b8e01080e126fbaeab640db71cce3eea
2015-05-13 09:22:51 -07:00
Mark Salyzyn 9e750a42b0 liblog: Add kernel log id
(cherry pick from commit 440e109d64)

Change-Id: I53002f05a8bdf8d67e1d761c56c8761d3b534a76
2015-05-13 09:22:41 -07:00
Mark Salyzyn e1f2004ecc logcat: liblog: Add "usec" format argument
- Add additional 3 digits of time precision for time output
  adding in the reporting of usec
- Remove trailing space in header file

Change-Id: Ifb560850b8e01080e126fbaeab640db71cce3eea
2015-05-12 15:51:46 -07:00
Eric Laurent 74f0a578a8 Merge "audio: Fix false positives in audio_is_remote_submix_device()" 2015-05-12 22:40:01 +00:00
Misael Lopez Cruz bee4965cb2 audio: Fix false positives in audio_is_remote_submix_device()
The audio_is_remote_submix_device() helper function incorrectly
reported AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES and
AUDIO_DEVICE_IN_LINE as a submix devices.

The cases where the confusion occurs are for devices whose bitwise
value only differs in the direction bit.

Change-Id: I3bb9fd1158a26a8f4b3b59246974e703ca5ba0f0
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
2015-05-12 16:25:38 -05:00
Mark Salyzyn b51546f43f Merge "liblog: Add kernel log id" 2015-05-11 16:09:04 +00:00
Christopher Ferris af67fb2475 Add offset to map data.
Also, print the offset in the maps section.

Bug: 20864928
Change-Id: I71f005726e5ef73cf75bbcb8f829fd5127cb9d61
(cherry picked from commit 5c8856854d)
2015-05-06 16:35:50 -07:00
Christopher Ferris 5c8856854d Add offset to map data.
Also, print the offset in the maps section.

Bug: 20864928
Change-Id: I71f005726e5ef73cf75bbcb8f829fd5127cb9d61
2015-05-06 12:50:09 -07:00
Mark Salyzyn 440e109d64 liblog: Add kernel log id
Change-Id: I53002f05a8bdf8d67e1d761c56c8761d3b534a76
2015-05-06 08:54:59 -07:00
Christopher Ferris 2106f4ba95 Add load base to map for relocation packing.
The new linker relocation packing support uses non-zero load bases,
so we better handle them properly.

Also print out the load base for a map if it's non-zero.

Bug: 20687795
(cherry picked from commit 329ed7dae4)

Change-Id: Ibc37d8c8bb032820dca4e7531184349ba6d402d2
2015-05-01 17:09:49 -07:00
Christopher Ferris 329ed7dae4 Add load base to map for relocation packing.
The new linker relocation packing support uses non-zero load bases,
so we better handle them properly.

Also print out the load base for a map if it's non-zero.

Bug: 20687795
Change-Id: Iec2d1db2051e7b4a278c1dfa57d745128a7f2974
2015-05-01 16:04:24 -07:00
Dan Albert 8076616c66 Merge "Fix gettid() on Windows." 2015-04-30 00:56:09 +00:00
Dan Albert b3a36ca5ee Fix gettid() on Windows.
Accidentally had this all hidden by an #ifndef _WIN32 when I wrote it.

Change-Id: I3a6afefe23b799ea7aa0f9a380f5a743673096d0
2015-04-29 17:13:32 -07:00
Mike Lockwood f68600abfc libusbhost: Add usb_device_get_version()
Change-Id: If2161178e9fe94a94faf01c102ef64f2a72d093b
2015-04-29 13:04:10 -07:00
Dan Stoza 5d67a2c9c2 Merge "ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query" 2015-04-29 17:21:57 +00:00
Jeff Brown 44193d9eae Add float support to binary event log.
Bug: 20664753
Change-Id: Ib4752bd785496dab5bb4d4979d5d80f662adbdfa
2015-04-28 18:20:48 -07:00
Jeff Brown 28e84a147f Merge "Add float support to binary event log." into mnc-dev 2015-04-29 01:18:09 +00:00
Jeff Brown b1993b637f Add float support to binary event log.
Bug: 20664753
Change-Id: Ib4752bd785496dab5bb4d4979d5d80f662adbdfa
2015-04-28 17:52:37 -07:00
Dan Stoza 0a866ea450 ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query
Adds a NATIVE_WINDOW_BUFFER_AGE query, which returns the age of the
contents of the most recently dequeued buffer as the number of frames
that have elapsed since it was last queued.

Change-Id: Ib6fd62945cb62d1e60133a65beee510363218a23
(cherry picked from commit 19df32cd19)
2015-04-28 13:42:30 -07:00
Lajos Molnar 90686d8e97 Merge "media: reserve color formats used by flex-YUV422/444 and RGB/A888" 2015-04-24 23:54:48 +00:00
Lajos Molnar e632c1bf0c media: reserve color formats used by flex-YUV422/444 and RGB/A888
These are used by Image when MediaCodec produces a non-surface
higher-resolution YUV image, or codec-specific ordered RGB/A image

Change-Id: Ie5cd8236586b375cbc707d45584bd35415c274fc
2015-04-24 23:43:57 +00:00
John Reck 52fc3e9aa8 Move LinearAlloc to libhwui
Change-Id: I83a70959ed0dcab2237faaf1dddc02b5eb0363c9
2015-04-23 15:07:54 -07:00
Richard Uhler e7eba774d8 am b1e5d2e3: am 68f3a5a0: am f75f16a1: Merge "Fix typos in comments"
* commit 'b1e5d2e386d2738ce9415d349f2a71945830d0a6':
  Fix typos in comments
2015-04-22 16:54:35 +00:00
Richard Uhler f75f16a1dd Merge "Fix typos in comments" 2015-04-22 16:07:22 +00:00
Michael Wright 835d9ca034 am 97147ef2: am a7d47092: am a75b3de2: Merge "Mark time conversion functions as constexpr"
* commit '97147ef2cd09bef1f348375611905864fa0fd068':
  Mark time conversion functions as constexpr
2015-04-21 23:27:12 +00:00
Elliott Hughes 65aae74b3a am 9ab15f2f: am 39ce837d: am 9f2944aa: Merge "Remove dead code."
* commit '9ab15f2fd98b052be50045d5f88b4ee5dfbda413':
  Remove dead code.
2015-04-21 23:27:06 +00:00
Michael Wright a75b3de2c2 Merge "Mark time conversion functions as constexpr" 2015-04-21 21:50:28 +00:00
Elliott Hughes d5ff3e9449 Remove dead code.
We weren't even building this.

Change-Id: I8b2afbc76d784a7b24bbe0be6502b9fbcf0b5c09
2015-04-21 12:24:50 -07:00
Elliott Hughes 72e9ff084b am de165446: am 09495b7f: am eb7d308a: Merge "Remove a declaration for an unimplemented function."
* commit 'de165446ede9f663b24a2aeec91c34a6758db1ad':
  Remove a declaration for an unimplemented function.
2015-04-21 05:26:49 +00:00
Elliott Hughes e886ba9c4e Remove a declaration for an unimplemented function.
Change-Id: I890cef52e9a8c26d98f227f269a7dcfcb6eaa795
2015-04-20 20:55:43 -07:00
Richard Uhler 587fb6a091 Fix typos in comments
Change-Id: Ia06ae6bec66e140fb302c650f7d62304864ca840
2015-04-20 10:10:33 -07:00
Michael Wright 65e93c3b6f Mark time conversion functions as constexpr
Change-Id: I753c6975a8e1d78978c31175b2e1868eb374c442
2015-04-20 15:06:01 +01:00
Greg Hackmann 7364f24d7e am 4601fbb8: am ec682735: am 0e2d6015: Merge "Revert "cutils: add OS-independent endian.h""
* commit '4601fbb8190723be24aab787ee62c2fc29523e30':
  Revert "cutils: add OS-independent endian.h"
2015-04-16 22:09:01 +00:00
Greg Hackmann 0e2d6015bc Merge "Revert "cutils: add OS-independent endian.h"" 2015-04-16 21:29:44 +00:00
Greg Hackmann bf7f28a415 Revert "cutils: add OS-independent endian.h"
This reverts commit c3bac8b671.
2015-04-16 14:28:58 -07:00
Greg Hackmann dd27606bce am 618c2edb: am 47578c68: am 88e03449: Merge "cutils: add OS-independent endian.h"
* commit '618c2edba1a4723e2673d09615a03368a43c9568':
  cutils: add OS-independent endian.h
2015-04-16 20:43:21 +00:00
Greg Hackmann 88e03449de Merge "cutils: add OS-independent endian.h" 2015-04-16 20:06:40 +00:00
Yabin Cui 0801196c09 am 5808b357: am 972a8de7: am 51e32b52: Merge "Move trace.h to stdatomic."
* commit '5808b3578aa871f7cf4eac3dda93604f9a014e50':
  Move trace.h to stdatomic.
2015-04-16 19:19:02 +00:00
Yabin Cui 51e32b52a3 Merge "Move trace.h to stdatomic." 2015-04-16 18:35:43 +00:00
Greg Hackmann c3bac8b671 cutils: add OS-independent endian.h
cutils/endian.h provides the helpers defined in endian(3), either by
pulling in the OS's built-in endian.h (where available) or recreating
them using GCC builtins.

Change-Id: Ic8965f67e1efdc03f884dbe6b7fe0276f840e4fc
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-04-16 11:12:02 -07:00
Yabin Cui a8ac32c781 Move trace.h to stdatomic.
Bug: 20262261
Change-Id: Idaf984786804eb76c285f38b11abbbc0d3706509
2015-04-16 10:41:16 -07:00
Mark Salyzyn 233b4974df am c130d96e: am e1b87e1a: am 48257704: Merge "libcutils: add fs_config_generate"
* commit 'c130d96e9cf786d17196a400a07fb4e6e221a07c':
  libcutils: add fs_config_generate
2015-04-16 00:32:33 +00:00
Mark Salyzyn 5d9e5efbcd libcutils: add fs_config_generate
Bug: 19908228
Change-Id: Icb0e189a86758bb779b9bdf7c0d92216d297869f
2015-04-15 16:43:07 -07:00
Dan Stoza 19df32cd19 ANativeWindow: Add NATIVE_WINDOW_BUFFER_AGE query
Adds a NATIVE_WINDOW_BUFFER_AGE query, which returns the age of the
contents of the most recently dequeued buffer as the number of frames
that have elapsed since it was last queued.

Change-Id: Ib6fd62945cb62d1e60133a65beee510363218a23
2015-04-15 13:48:53 -07:00
Dan Stoza 3c4074bfb4 am a197c3b7: am 3ec9c17f: am 04274a29: Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
* commit 'a197c3b74b50bbdf88a9214269e29db7286338c1':
  Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
2015-04-15 20:29:57 +00:00
Dan Stoza 238ec985f9 Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
Adds a new perform action: NATIVE_SET_WINDOW_SURFACE_DAMAGE, which
allows the producer to describe the region of the surface that has
changed since the previous frame.

Bug: 11239309

Change-Id: Ie645e6a52b37b5c1b3be19481e8348570d1aa62c
2015-04-15 12:49:41 -07:00
Mark Salyzyn 247d5521a9 am 9301f216: am 8f6dfc7d: am e65c2210: Merge "log: Add check for LINT_RLOG"
* commit '9301f2167897d5954880d038fa6e63e03bf547f4':
  log: Add check for LINT_RLOG
2015-04-10 19:56:34 +00:00
Mark Salyzyn 4ff2545525 log: Add check for LINT_RLOG
In order to make it easier to find radio system logging
mistakes, if LINT_RLOG is defined we will remove all the
definitions for ALOG* and SLOG*, as well as the log ids
to introduce compile and link errors.

Bug: 20143912
Change-Id: I1511bdce75213f3a5bacdbc4f2ab315aa1fa56fc
2015-04-10 11:28:16 -07:00
Nick Kralevich 1268f227ee am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
* commit 'f09bfa3c14c8b5a920a98c1327c0d42f9ef9e2ca':
  logd: Don't embed a flexible array member within another struct
2015-04-07 18:44:07 +00:00
Nick Kralevich 58ba58a97c logd: Don't embed a flexible array member within another struct
C (but not C++) has a concept of a flexible array member, which
is documented at https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html .
Using a flexible array member indicates that the structure is
really a header for a variable length object.

In logd's case, the variable length structure android_event_string_t
was embedded within another structure called
android_log_event_string_t. This makes gcc's __builtin_object_size()
function really confused. When compiling with C++,
__builtin_object_size(android_log_event_string_t.payload.data, 1)
would return 0, whereas if you compiled the code with C, the same
call would (properly) return -1.

Code which does automatic bounds checking, such as the proposed
patch at https://android-review.googlesource.com/145411 , will
cause problems for logd if this syntax is used.

Don't try to embed a variable length structure within another
structure. This doesn't appear to be valid C nor C++, and
while it's worked, it seems problematic.

Instead, inline the structure so it's one big happy structure.

Change-Id: I8ac02b7142a4f6560f5f80df2effcf720f9896fc
2015-04-07 10:12:20 -07:00
Mark Salyzyn b885106dc7 am 2904e949: am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
* commit '2904e949bb872051618c323c74fcb0e93f67ed09':
  android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
2015-04-06 23:28:48 +00:00
Mark Salyzyn 3fe36779ef android_filesystem_config: move fs_config to libcutils
Bug: 19908228
Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
2015-04-06 15:04:05 -07:00
Mark Salyzyn 16045614fd android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
Change-Id: Idb050b9ef4e7947664295b173e1b09d65accd3e9
2015-04-06 14:15:58 -07:00
Tim Kilbourn 628620c7ba Allow inputflinger to have CAP_BLOCK_SUSPEND.
(Cherry picked from commit 83e6f2606b)

Resolved conflict in include/private/android_filesystem_config.h, content
already in libcutils/fs_config.c.

Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606
2015-04-06 10:57:29 -07:00
Mark Salyzyn a21c29ee81 android_filesystem_config: move fs_config to libcutils
Bug: 19908228
Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
2015-04-06 10:04:16 -07:00
Rom Lemarchand f396c9644b Merge "Move audio includes to system/media/audio" 2015-04-04 01:13:57 +00:00
Rom Lemarchand be7aca60f3 Move audio includes to system/media/audio
Change-Id: I21bed541dbd81127e6b8340f7f14b5523f7c5c0d
2015-04-03 15:12:01 -07:00
Elliott Hughes 3bb04bd804 am 6c7c6d04: am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."
* commit '6c7c6d0420ca837b81927b2f7c08cd9d92533043':
  Only Windows doesn't have %zd.
2015-04-03 20:58:29 +00:00
Elliott Hughes 7c1945254e am ea975880: Merge "Only Windows doesn\'t have %zd."
* commit 'ea975880112c27293800ede36e0323ff2a7b9322':
  Only Windows doesn't have %zd.
2015-04-03 20:30:46 +00:00
Elliott Hughes 146c244613 Only Windows doesn't have %zd.
Change-Id: Ie09619df212cf7c8aa18a6d46c3e6b6ca3f478cf
2015-04-03 12:53:36 -07:00
Elliott Hughes 16bcaac5fd am cd868370: am b2c3473d: am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
* commit 'cd8683709c2d1bcac7e3b9de827a2dfc8f24bf09':
  Just use snprintf for android_get_control_socket.
2015-04-03 14:53:01 +00:00
Elliott Hughes bbc6e1bf86 am b4573331: am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit 'b45733319dc269375d599da894eecd2ffa4211ff':
  Be more intention-revealing with libcutils' strlcpy.
2015-04-03 14:52:33 +00:00
Elliott Hughes b2c3473d35 am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
* commit '70df6f85fe8164010be3e4e1cf87e1dd31fb7614':
  Just use snprintf for android_get_control_socket.
2015-04-03 03:45:30 +00:00
Elliott Hughes edc49d7b98 Just use snprintf for android_get_control_socket.
Change-Id: I3d0da03847f79c9f9b2cfd7189a07f63b17fc4a2
2015-04-02 17:42:56 -07:00
Elliott Hughes adc1010249 am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
* commit '4c1d4a0e8ec344799813ce5e6642946839e0036a':
  Be more intention-revealing with libcutils' strlcpy.
2015-04-02 23:54:37 +00:00
Phil Burk 7c6f796df4 Merge "audio.h: add AUDIO_FORMAT_DTS" 2015-04-02 23:10:23 +00:00
Elliott Hughes 2040031f7b Be more intention-revealing with libcutils' strlcpy.
Several people have been independently confused about when this gets
built and why over the past couple of days.

Change-Id: I2d4a02f66e24c0734327585b7d27e50a344b1e94
2015-04-02 15:39:33 -07:00
Elliott Hughes 1c41dadef3 am 797b246f: am a1f69f18: am 21593186: Merge "Move all libcutils tests into the gtests."
* commit '797b246ff374e0fc3066a45545b8156f50f23267':
  Move all libcutils tests into the gtests.
2015-04-02 22:07:15 +00:00
Elliott Hughes a1f69f1808 am 21593186: Merge "Move all libcutils tests into the gtests."
* commit '2159318647b6032a9d752012b923c579dc1f80da':
  Move all libcutils tests into the gtests.
2015-04-02 21:35:18 +00:00
Elliott Hughes af98efbd15 Move all libcutils tests into the gtests.
This also fixes the bug where we were always testing against the fake
strlcpy we provide for glibc/Windows rather than the Android one.

This also removes some unnecessary library dependencies.

This also builds all the cutils tests for the host (static and dynamic).

Change-Id: Icd129d5b025c0ca801be5acf31a54ecd88608df9
2015-04-02 14:25:55 -07:00
Phil Burk 103c2d2203 audio.h: add AUDIO_FORMAT_DTS
Bug: 18292317
Change-Id: Icb3855e958d02e3b03517ac0fcf7de743d896c12
Signed-off-by: Phil Burk <philburk@google.com>
2015-04-01 16:54:41 -07:00
Richard Uhler 3f80c4d974 am 88defca0: am b3b1757f: am 0c266ef2: Merge "Define atrace_* functions for both target and host."
* commit '88defca0f5ee64143a83021e637b53908ed109ed':
  Define atrace_* functions for both target and host.
2015-04-01 18:04:49 +00:00
Richard Uhler b3b1757fd9 am 0c266ef2: Merge "Define atrace_* functions for both target and host."
* commit '0c266ef2d7e137efbd83366a98a861d9770fbf06':
  Define atrace_* functions for both target and host.
2015-04-01 17:37:10 +00:00
Richard Uhler 0c266ef2d7 Merge "Define atrace_* functions for both target and host." 2015-04-01 17:29:34 +00:00
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
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
Tim Kilbourn eeb212df71 Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." 2015-03-31 20:23:19 +00:00
Yin-Chia Yeh 3fcb735030 Merge "graphics: add android raw12 format" 2015-03-31 18:27:11 +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
Yin-Chia Yeh 9a5eeba588 graphics: add android raw12 format
Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
2015-03-30 16:35:56 -07:00
Tim Kilbourn 02fedb153d Merge "Use eventfd instead of pipe in Looper." 2015-03-30 17:04:52 +00:00
Elliott Hughes 1ef8498d02 am 4ce3c828: am 0cd316a4: am 5db3936d: Merge "Log more timing information from init."
* commit '4ce3c8288ba030c2d2a80cf94ceb5d2f84a66d26':
  Log more timing information from init.
2015-03-28 17:10:38 +00:00
Elliott Hughes 0cd316a46b am 5db3936d: Merge "Log more timing information from init."
* commit '5db3936dbe6fa73d45ab0f02b7166f43680084d3':
  Log more timing information from init.
2015-03-28 16:50:35 +00:00
Elliott Hughes da40c00137 Log more timing information from init.
Also make important events in init's life NOTICE rather than INFO,
and ensure that NOTICE events actually make it to the kernel log.

Also fix the logging so that if you have a printf format string
error, the compiler now catches it.

Also give messages from init, ueventd, and watchdogd distinct tags.
(Previously they'd all call themselves "init", and dmesg doesn't
include pids, so you couldn't untangle them.)

Also include the tag in SELinux messages.

Bug: 19544788
Change-Id: Ica6daea065bfdb80155c52c0b06f346a7df208fe
2015-03-28 00:25:22 -07:00
Richard Uhler 7d451ab96d Define atrace_* functions for both target and host.
This change defines atrace_* functions for the host that act as
no-ops, which makes it easier to add tracing in ART.

Change-Id: I89397e83986686a2b6a6f245c25017eb379081b1
2015-03-27 14:58:30 -07:00
Tim Kilbourn 8892ce6383 Use eventfd instead of pipe in Looper.
Bug: 19933224
Change-Id: I6611e918db960bbb0e74f8308e10bdf79510b899
2015-03-27 09:15:43 -07:00
Dan Albert ac197dd2af am 1188a4d8: am a596623f: am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
* commit '1188a4d856f6c840a2d39c44e35ba3f3cd86b3a5':
  O_CLOEXEC is O_NOINHERIT on Windows.
2015-03-27 06:55:14 +00:00
Dan Albert a596623fbf am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
* commit '6ccfabcf5d547a04a1e6c5237f20670230a7f6a4':
  O_CLOEXEC is O_NOINHERIT on Windows.
2015-03-27 06:34:45 +00:00
Dan Albert c6b30f376d O_CLOEXEC is O_NOINHERIT on Windows.
Change-Id: I714aa08344fa10684c99651f953834086cc162c7
2015-03-26 23:24:15 -07:00
Tim Kilbourn 83e6f2606b Allow inputflinger to have CAP_BLOCK_SUSPEND.
Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606
2015-03-25 09:25:33 -07:00
Jean-Michel Trivi 187f67695a Merge "Fix comment in audio definitions header" 2015-03-25 01:14:54 +00:00
Jean-Michel Trivi 1ede5537a3 Fix comment in audio definitions header
Change-Id: I08f23f3feaacf4cb39e93992fe839f1c1f084363
2015-03-24 17:17:45 -07:00
Christopher Ferris ad27dd98ae am bdabcf4c: am 730d7c53: am 8e1697e7: Merge "Fix mac sdk build."
* commit 'bdabcf4c8bd7c9b5b29e2d3af07a5fb0e2733823':
  Fix mac sdk build.
2015-03-24 05:20:50 +00:00
Christopher Ferris 730d7c530a am 8e1697e7: Merge "Fix mac sdk build."
* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
  Fix mac sdk build.
2015-03-24 05:00:51 +00:00
Christopher Ferris fc3576f675 Fix mac sdk build.
Add include files for types and functions that were not included properly.

Change-Id: I4849f5bdf535c6eec9254228cf980c30d11a5a1b
2015-03-23 21:40:30 -07:00
Dan Albert b3edb9d3a1 am 49da340d: am 4a342186: am 9f8093f8: Merge "Move gettid() into libcutils."
* commit '49da340d9ee272ff561b95288e4390d606b22ea9':
  Move gettid() into libcutils.
2015-03-24 02:59:21 +00:00
Narayan Kamath 7d1c434e1f am fb50475b: am a3d3144d: am fd26252d: Merge "Remove libzipfile."
* commit 'fb50475b71c34f6dce011d80d704aac99cf6c8ae':
  Remove libzipfile.
2015-03-24 01:31:47 +00:00
Dan Albert 4a3421862e am 9f8093f8: Merge "Move gettid() into libcutils."
* commit '9f8093f88850304fd225ae612c3df960d1d247fc':
  Move gettid() into libcutils.
2015-03-23 21:19:42 +00:00
Dan Albert 7dfb61dcdc Move gettid() into libcutils.
Change-Id: Ic8a15036833e6d129b7998d954b804be391de399
2015-03-23 13:01:21 -07:00
Vineeta Srivastava 631945200e Merge "Revert "Sigh, more vendors linking against hidden APIs."" 2015-03-23 15:52:24 +00:00
Narayan Kamath a3d3144def am fd26252d: Merge "Remove libzipfile."
* commit 'fd26252da2d736236bb1d80fc2e809421f9ffa4d':
  Remove libzipfile.
2015-03-23 10:55:33 +00:00
Narayan Kamath fd26252da2 Merge "Remove libzipfile." 2015-03-23 10:49:07 +00:00
Vineeta Srivastava 995f45e30e Revert "Sigh, more vendors linking against hidden APIs."
This reverts commit 3183729816.

Change-Id: I5c041d7438b64c4c258c414ca9a133075999e1b6
2015-03-20 23:51:36 +00:00
Dan Stoza ca87790cdc Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" 2015-03-20 18:28:00 +00:00
Narayan Kamath 766adf9f31 Remove libzipfile.
No longer used and superceded by libziparchive.

Change-Id: Iafbaa5affd0ffd4de02681c8bbe32b21c523ff49
2015-03-20 17:59:51 +00:00
Eino-Ville Talvala b93343d199 DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
First stage of adding a new dataSpace field for ANativeWindow,
for communicating format- (and endpoint-) dependent information
about graphics buffers. For most formats, dataSpace describes the
color space of the buffer, while format describes the memory layout.

For some formats, the dataSpace may also specify that the buffer
contains depth measurements, encoded images, or other kinds of
information that is not necessarily a simple 2D image.
Rename the existing colorspace enumeration to dataspace, with an added
dataspace for depth, and sRGB gamma-corrected and linear colorspaces.

Add in a definition for Android depth point clouds as a
variable-length list of float-triplet coordinates, as the underlying
layout of buffers with format HAL_PIXEL_FORMAT_BLOB and dataSpace of
HAL_DATASPACE_DEPTH.

Also remove now-unnecessary sRGB HAL graphics formats, and remove the
alias RAW_SENSOR that was left in to ease transition to RAW16.

Cherry pick of I8797f67fb9c2b18da5975f2145303ca0bf98e62d with the
following diff to maintain source compatibility:

@@ -58,6 +58,11 @@ enum {
     HAL_PIXEL_FORMAT_RGB_565            = 4,
     HAL_PIXEL_FORMAT_BGRA_8888          = 5,

+    // Deprecated sRGB formats for source code compatibility
+    // Not for use in new code
+    HAL_PIXEL_FORMAT_sRGB_A_8888        = 0xC,
+    HAL_PIXEL_FORMAT_sRGB_X_8888        = 0xD,
+
     /*
      * 0x100 - 0x1FF
      *
@@ -189,6 +194,9 @@ enum {
      */
     HAL_PIXEL_FORMAT_RAW16 = 0x20,

+    // Temporary alias for source code compatibility; do not use in new code
+    HAL_PIXEL_FORMAT_RAW_SENSOR = HAL_PIXEL_FORMAT_RAW16,
+
     /*
      * Android RAW10 format:
      *

Change-Id: I5c5ba98b297436f950e06a181eb0ff955747680f
2015-03-19 13:19:48 -07:00
Greg Hackmann 7edc1f0a84 am 012326fb: am b3b088e6: Merge "pixelflinger: make self-contained"
* commit '012326fbe97d8d1570ab4521e697415bb6691c4a':
  pixelflinger: make self-contained
2015-03-19 19:57:44 +00:00
Greg Hackmann 38eb58d2a8 pixelflinger: make self-contained
pixelflinger should not be used for new projects and should be moved out
of system/core at some point.  As the first step, move all its headers
under system/core/libpixelflinger/include and update its Android.mk
files so they're not referring to the absolute system/core path anymore.

Change-Id: Idead273ab2c0450409d770f5402c4dba916192a9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-19 12:34:35 -07:00
Elliott Hughes 2e671e1c00 am c1e0bf0d: am 5aa097c8: Merge "Remove obsolete files from fs_config\'s list."
* commit 'c1e0bf0df36d1cd00104a0761d9fa251ebe4865c':
  Remove obsolete files from fs_config's list.
2015-03-18 18:11:49 +00:00
Elliott Hughes 3c292007c1 Remove obsolete files from fs_config's list.
Change-Id: I83716f48754de889d811d74074f9a32dc666c05e
2015-03-18 10:47:20 -07:00
Christopher Ferris 4f1bb82b8a am 38f125b8: am 837a6739: Merge "Add variable length read to Backtrace."
* commit '38f125b8c4da6ccc95f19edb3867dfa09841207d':
  Add variable length read to Backtrace.
2015-03-18 10:57:38 +00:00
Christopher Ferris 2b4a63fc6a Add variable length read to Backtrace.
Included tests for this new feature.

Changed the NULLs to nullptr in backtrace_test.

Changed UniquePtr to std::unique_ptr in backtrace_test.

Change-Id: I92375465b8f8ba84589834cc162db5915bf1be81
2015-03-17 14:56:02 -07:00
Dan Albert dbac8ffd2d Merge "Revert "Revert "Create libbase.""" 2015-03-16 21:03:19 +00:00
Dan Albert a83ba64a23 Revert "Revert "Create libbase.""
This reverts commit a7870d8816.

(cherry picked from commit c007bc3856)
2015-03-16 13:48:07 -07:00
Chet Haase a5e351cbc2 Merge "Sigh, more vendors linking against hidden APIs." 2015-03-16 20:12:10 +00:00
Paul Eastham fd46fe102a Revert "pixelflinger: make self-contained"
This reverts commit 56350fe387.

Change-Id: I4cda5773f39abd3b24df65d7bd9daaef92314b52
2015-03-16 12:46:39 -07:00
Jeff Sharkey 3183729816 Sigh, more vendors linking against hidden APIs.
Bug: 19762346
Change-Id: I6c0823bf69e3f7e854ffea7b5483d09bb7359ff6
2015-03-16 12:14:40 -07:00
Eric Laurent 4e839b98b7 Merge "Definitions for broadcast radio." 2015-03-16 18:15:50 +00:00
Greg Hackmann 6205750c75 am 3f13e2fa: am 021efd1b: Merge "pixelflinger: make self-contained"
* commit '3f13e2fa3eaecc2571159cb4e3cc7dd28d2d536e':
  pixelflinger: make self-contained
2015-03-16 18:04:05 +00:00
Greg Hackmann 021efd1bd4 Merge "pixelflinger: make self-contained" 2015-03-16 17:46:31 +00:00
Dan Albert c007bc3856 Revert "Revert "Create libbase.""
This reverts commit a7870d8816.
2015-03-16 10:08:46 -07:00
Lorenzo Colitti 3e1c17e81d Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'" 2015-03-16 12:38:33 +00:00
Nicolas Geoffray a6000e81dc am 90a968f0: am dd581695: Merge "Revert "Create libbase.""
* commit '90a968f0e3fb903aad41f6689c337a7e4a8d5c7b':
  Revert "Create libbase."
2015-03-16 11:25:38 +00:00
Nicolas Geoffray a7870d8816 Revert "Create libbase."
Breaks internal master.

This reverts commit 98ff77204c.

Change-Id: I18dc6021cb43efff8aa88486c2d980dc2b8eedba
2015-03-16 11:07:29 +00:00
Vinit Deshpande ac56e6ba1d Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'
Change-Id: I4d3d55dac794db8fa81d3048e41ac589920f43b8
2015-03-16 01:30:49 -07:00
Dan Albert 06d60af714 am 517f65da: am a68c8148: Merge "Create libbase."
* commit '517f65daef177d06d7835300a1c23ce3409c0643':
  Create libbase.
2015-03-15 22:33:53 +00:00
Elliott Hughes 51d98035b1 am c8d5e230: am f1c2ba49: Merge "Remove unused header file."
* commit 'c8d5e2307badc6bfcb76c4dec43a07d6b9d885cb':
  Remove unused header file.
2015-03-15 22:33:51 +00:00
Dan Albert 98ff77204c Create libbase.
Move StringPrintf and the string based file I/O from libutils to
libbase.

Change-Id: I0297a6063874b9d92100e0dd5123fddfbda932fe
2015-03-14 16:36:18 -07:00
Elliott Hughes c2f0ed64ce Remove unused header file.
This library no longer exists.

Change-Id: I5582b41b70691171b1ac5f2bffd623f2b2fc10e5
2015-03-14 09:28:49 -07:00
Eric Laurent 699ce298ca Definitions for broadcast radio.
Added common definitions for broadcast radio
HAL and native service implementation.

Change-Id: Id7061bcca5ac6d83a1b96ca8ccf6894c0364629c
2015-03-13 15:35:35 -07:00
Jeff Sharkey 707d4f2ee8 Merge "Define enum class for NetlinkEvent actions." 2015-03-13 20:47:47 +00:00
Jeff Sharkey e4f394087d Define enum class for NetlinkEvent actions.
This lets us use it for switch statements, and gives us stronger
type safety.

Change-Id: Idb3ad7098657a09f13c95dc7070611d35ede66ae
2015-03-13 13:27:56 -07:00
Jeff Brown e7d54f80cb Fix issues related to removing Looper callbacks after close.
When a file descriptor is closed before removing it from the
epoll set, it will normally be removed automatically from the
epoll set by the kernel.  However if there exists a duplicate
then the original file descriptor may remain in the set and
continue to receive events until all duplicates have been closed.

Unfortunately due to kernel limitations we need to rebuild the epoll
set from scratch because it may contain an old file handle that we are
now unable to remove since its file descriptor is no longer valid.
No such problem would have occurred if we were using the poll system
call instead, but that approach carries others disadvantages.

Bug: 19715279
Change-Id: If1ab8ebda0825755a416d513e888942a02ee3948
2015-03-12 19:44:49 -07:00
Greg Hackmann 56350fe387 pixelflinger: make self-contained
pixelflinger should not be used for new projects and should be moved out
of system/core at some point.  As the first step, move all its headers
under system/core/libpixelflinger/include and update its Android.mk
files so they're not referring to the absolute system/core path anymore.

Change-Id: I7acc3ef5b2e21d8ba6fe939ea8d3ec4c41959591
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-12 13:02:38 -07:00
Jeff Brown 7a0310ef67 Fixed subtle bugs related to file descriptor recycling.
Added code to protect against situations that may occur when a
Looper callback has the side-effect of closing the file descriptor that
it is watching before it returns.  This code pattern is very
convenient for implementation but it does expose issues in how
the list of callbacks is maintained.  In particular, we
need to watch out for file descriptors which have been reused.

This change may resolve previously unexplained ANRs associated with
log messages such as: "Error modifying epoll events for fd 44, errno=2"

Bug: 10349083
Change-Id: I20eedf6ffbdeda382653ca0104962505194741b0
2015-03-11 15:00:36 -07:00
Jeff Brown 27e5721860 Rename Looper::isIdling() to isPolling() to resolve confusion.
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Bug: 19532373
Change-Id: I555c473e70ffd8a56e1b10aa60026eb674a16de9
2015-03-11 15:00:36 -07:00
Andy Hung 17e8158635 Merge "Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT" 2015-03-10 23:25:02 +00:00
Andy Hung 4ff72b52a2 Fix comment on AUDIO_FORMAT_PCM_SUB_8_24_BIT
Should be Q8.23 (24 bits packed in the least significant
3 bytes).

Change-Id: If5ca27c27249487e28c0be42ebdd283308ff8552
2015-03-10 16:01:49 -07:00
Eino-Ville Talvala 5938f30921 Merge "Add ANativeWindow dataSpace; update graphics formats, color spaces" 2015-03-06 22:13:06 +00:00
Mark Salyzyn ad966e88f5 am ddd1ea71: am e79201e4: am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
* commit 'ddd1ea71b4260981fb4814da4b6580c16bd8bb7f':
  liblog: logprint use <endian.h>
  private: Add event payload structures to android_logger.h
2015-03-04 23:24:38 +00:00
Mark Salyzyn e79201e4cb am 4487c605: Merge changes I0ec0fe3e,I9e5fccba
* commit '4487c605eaeea2b85c8511fe915a286c3aaf4da4':
  liblog: logprint use <endian.h>
  private: Add event payload structures to android_logger.h
2015-03-04 22:44:41 +00:00
Mark Salyzyn fa1c063feb private: Add event payload structures to android_logger.h
- common android_event_header_t
- android_event_int_t ANDROID_TYPE_INT payload
- android_log_event_int_t single ANDROID_TYPE_INT event
- android_event_long_t ANDROID_TYPE_LONG payload
- android_log_event_long_t single ANDROID_TYPE_LONG event
- android_event_string_t ANDROID_TYPE_STRING payload
- android_log_event_string_t single ANDROID_TYPE_STRING event

Change-Id: I9e5fccba38e3f230c2c4ec7dec51ed110c460f95
2015-03-04 12:48:04 -08:00
Eino-Ville Talvala 03743414cb Add ANativeWindow dataSpace; update graphics formats, color spaces
First stage of adding a new dataSpace field for ANativeWindow,
for communicating format- (and endpoint-) dependent information
about graphics buffers. For most formats, dataSpace describes the
color space of the buffer, while format describes the memory layout.

For some formats, the dataSpace may also specify that the buffer
contains depth measurements, encoded images, or other kinds of
information that is not necessarily a simple 2D image.
Rename the existing colorspace enumeration to dataspace, with an added
dataspace for depth, and sRGB gamma-corrected and linear colorspaces.

Add in a definition for Android depth point clouds as a
variable-length list of float-triplet coordinates, as the underlying
layout of buffers with format HAL_PIXEL_FORMAT_BLOB and dataSpace of
HAL_DATASPACE_DEPTH.

Also remove now-unnecessary sRGB HAL graphics formats, and remove the
alias RAW_SENSOR that was left in to ease transition to RAW16.

Change-Id: I8797f67fb9c2b18da5975f2145303ca0bf98e62d
2015-03-04 11:59:51 -08:00
Erik Kline c2291a7ed3 Refactor dhcp_utils for more flexible uses.
Separate out fetching DHCP results from starting the daemon
(for either discover or renew).

Renamed dhcp_do_request() to dhcp_start().
Renamed dhcp_do_request_renew() to dhcp_start_renew().
Added new dhcp_get_results().

Callers of the prior versions of dhcp_do_request* now separately
call dhcp_get_results().

Bug: 19422416
Change-Id: I05447853d444015e6014661dda1bb177b58fe463
2015-03-02 12:26:53 +09:00
Mark Salyzyn 75a2283d6b am 8c52e3b7: am d851c80f: am ae19b631: Merge "liblog: add pstore read"
* commit '8c52e3b79f8ca9ccef5d562f16a0c275f58b8538':
  liblog: add pstore read
2015-02-26 17:42:31 +00:00
Mark Salyzyn d851c80f0d am ae19b631: Merge "liblog: add pstore read"
* commit 'ae19b63168d1b958898180979156e2a4169ee4c2':
  liblog: add pstore read
2015-02-26 17:29:05 +00:00
Mark Salyzyn 6eef417119 liblog: add pstore read
Used to pull the Android log messages after a reboot. Adding
an ANDROID_LOG_PSTORE flag to the mode parameter in calls to
android_logger_list_alloc() and android_logger_list_alloc_time().
The side effects are that android_logger_clear() and
android_logger_list_read() will react with the user space
pstore driver. Forms a companion to the pstore console logs.

Change-Id: I7bb07b87b3bf73f059a21af3f810af37c7715b6d
2015-02-26 06:37:35 -08:00
Mark Salyzyn 581a20b8ed am ac947104: am f5579498: am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
* commit 'ac9471041e5c2d2903ce6470a35ba5b3baf80aa0':
  liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:24:17 +00:00
Mark Salyzyn f5579498d9 am 110166c1: Merge "liblog: introduce ANDROID_LOG_* flags"
* commit '110166c1dbcbe26e510ac3fdaf2e1fcc7efbcc4e':
  liblog: introduce ANDROID_LOG_* flags
2015-02-25 18:12:48 +00:00
Mark Salyzyn 2d3f38a6b8 liblog: introduce ANDROID_LOG_* flags
Move away from using POSIX open(2) flags and introduce ANDROID_LOG_* flags to
replace them. Add security by preventing random mode flags from getting into
underlying POSIX calls. ANDROID_LOG_* flags overlap POSIX O_* flag definitions.

Change-Id: Ib32bb64c287e8bf150be62242e1ba46bb37839fc
2015-02-25 17:44:18 +00:00
Narayan Kamath 9d8889c598 am f6fae931: am f9df4b13: am c40cf1ce: Merge "Remove useless refCounting from FileMap."
* commit 'f6fae93164ec8505153241b24ccce85cc4ac0f9e':
  Remove useless refCounting from FileMap.
2015-02-24 13:09:47 +00:00
Narayan Kamath f9df4b13bc am c40cf1ce: Merge "Remove useless refCounting from FileMap."
* commit 'c40cf1ce9d6910685bf2242c1db390af00684d9d':
  Remove useless refCounting from FileMap.
2015-02-24 12:56:45 +00:00
Narayan Kamath 6832a7a4e0 Remove useless refCounting from FileMap.
Nobody ever called acquire() so release() was always
equivalent to delete. Just use delete instead so that
people can use unique_ptr directly (or shared_ptr if
they really want refcounts).

Change-Id: I9e3ad5e0f6a4fcc4e02e5a2ff7ef9514fe234415
2015-02-23 15:49:43 +00:00
Andreas Gampe 9f08ce8886 am f320e8e5: am ed318bff: Merge "log.h: Fix typo"
* commit 'f320e8e53df75ba50db755c89843251e481dc696':
  log.h: Fix typo
2015-02-11 02:48:05 +00:00
Mark Salyzyn ee632f734a am 8a5198a1: am fd867303: Merge changes I420b5b8a,Ica23fe41
* commit '8a5198a1505a4dc7d4722bb58a6eb809b0dd5d2c':
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION
2015-02-11 02:48:04 +00:00
Mark Salyzyn 2044a34ca7 am 2671ffb6: am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"
* commit '2671ffb6191aadf17cd8770ffcc235bc0591e03f':
  liblog: add __android_log_is_loggable()
2015-02-11 02:48:01 +00:00
Andreas Gampe f320e8e53d am ed318bff: Merge "log.h: Fix typo"
* commit 'ed318bff41c4515ca79a11afb97507a452e9fcd3':
  log.h: Fix typo
2015-02-10 16:53:30 +00:00
Mark Salyzyn 8a5198a150 am fd867303: Merge changes I420b5b8a,Ica23fe41
* commit 'fd867303861eb25bf7973739e71dc29b6356a336':
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION
2015-02-10 16:53:24 +00:00
Mark Salyzyn 2671ffb619 am 95f7ecbd: Merge "liblog: add __android_log_is_loggable()"
* commit '95f7ecbd38df680c5295295bd2277f4b26865f1f':
  liblog: add __android_log_is_loggable()
2015-02-10 16:52:48 +00:00
Andreas Gampe f45bbe496f log.h: Fix typo
Change-Id: I6b5e9bc9d40e5e5ecf9f50f7392675391e6f18e6
2015-02-09 16:13:33 -08:00
Mark Salyzyn 1df92e523e log.h: wrap android_testLog around __android_log_is_loggable
- take android_testLog from the bonepile and resurrect
- android_testLog is used, and makes sense in its current context
  as a holder for Android Logging policy.
- Default level when not specified is ANDROID_LOG_VERBOSE for
  eng and userdebug, and ANDROID_LOG_DEBUG for user.

NB: Properties, which are associated with __android_log_is_loggable are
not to be adjusted in user release; it would be useful at that juncture to
return a constant of (0) for VERBOSE, and a (1) for others on user builds.
Or default level to drop to ANDROID_LOG_DEBUG for all in future.

Bug: 17760225
Change-Id: I420b5b8a94d53d664c6a8b13546ebc424a147923
2015-02-09 15:37:32 -08:00
Mark Salyzyn f5af82edf3 log.h: deprecate CONDITION
- replace CONDITION with __predict_false to match with bionic

Change-Id: Ica23fe41cf9a7ea5eaf1b8552780af9ec7827808
2015-02-09 15:25:48 -08:00
Mark Salyzyn 956870518e liblog: add __android_log_is_loggable()
- Add new liblog API __android_log_is_loggable(prio, tag, def)
- future plan to integrate this into the runtime checks and into
  the logd daemon for filtration. Inert for now.

Bug: 17760225
Change-Id: I16395b4d42acc08f0209f55a1cbf87b0b2112898
2015-02-09 22:12:59 +00:00
Christopher Ferris 14b964f52e am e6ed63e6: am c9c401e6: Merge "Move map data into backtrace data proper."
* commit 'e6ed63e610c5e6a56b04a5168e873dfa48c73aec':
  Move map data into backtrace data proper.
2015-02-09 04:13:37 +00:00
Elliott Hughes bc32de07e9 am b164b103: am 5e753100: Merge "Clean up reading and writing in init."
* commit 'b164b103ebdcb2b567079f30e38d878a21a9b632':
  Clean up reading and writing in init.
2015-02-09 04:13:02 +00:00
Christopher Ferris e6ed63e610 am c9c401e6: Merge "Move map data into backtrace data proper."
* commit 'c9c401e64ba00e8fa295cae30b2b0035fae1183a':
  Move map data into backtrace data proper.
2015-02-06 23:43:11 +00:00
Christopher Ferris c9c401e64b Merge "Move map data into backtrace data proper." 2015-02-06 23:29:00 +00:00
Christopher Ferris 12385e3ad0 Move map data into backtrace data proper.
The backtrace structure used to include a pointer to a backtrace_map_t
that represented the map data for a particular pc. This introduced a
race condition where the pointer could be discarded, but the backtrace
structure still contained a pointer to garbage memory. Now all of the map
information is right in the structure.

Bug: 19028453
Change-Id: If7088a73f3c6bf1f3bc8cdd2bb4b62e7cab831c0
2015-02-06 15:00:09 -08:00
Elliott Hughes b164b103eb am 5e753100: Merge "Clean up reading and writing in init."
* commit '5e753100c32c7b42ae4306a8023c419defd34c4e':
  Clean up reading and writing in init.
2015-02-06 22:33:18 +00:00
Elliott Hughes f682b4786a Clean up reading and writing in init.
This isn't particularly useful in and of itself, but it does introduce the
first (trivial) unit test, improves the documentation (including details
about how to debug init crashes), and made me aware of how unpleasant the
existing parser is.

I also fixed a bug in passing --- unless you thought the "peboot" and "pm"
commands were features...

Bug: 19217569
Change-Id: I6ab76129a543ce3ed3dab52ef2c638009874c3de
2015-02-06 14:20:30 -08:00
Elliott Hughes 07e0ee7cf4 am dcbeb41a: am d558530b: Merge "Fix Windows build."
* commit 'dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5':
  Fix Windows build.
2015-02-05 20:15:04 +00:00
Elliott Hughes dcbeb41a67 am d558530b: Merge "Fix Windows build."
* commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58':
  Fix Windows build.
2015-02-05 18:51:07 +00:00
Paul McLean 9d13e782c6 Merge "Adding name field to AudioPort for enum/select API." 2015-02-05 18:13:48 +00:00
Elliott Hughes d79801d60d Fix Windows build.
Take 2. Probably should have done this in the beginning, but thought I was
being clever.

Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
2015-02-05 08:21:37 -08:00
Elliott Hughes 495952fef2 am 44fdd5d1: am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
* commit '44fdd5d15a8851e4053af168e7235b30a5f4d34d':
  Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:36:47 +00:00
Elliott Hughes 44fdd5d15a am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
* commit '27d28d3baff860d1fd936a5fcf2d920577c52575':
  Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:31:31 +00:00
Elliott Hughes 202f024dee Add a WriteStringToFile overload that cares about permissions.
Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
2015-02-04 14:30:23 -08:00
Elliott Hughes 814cb64fb4 am 8a2634c2: am 55732f49: Merge "android_reboot should take a const char*."
* commit '8a2634c2ab3914abeb43e0edf46fa69852b6b15d':
  android_reboot should take a const char*.
2015-02-04 15:03:49 +00:00
Elliott Hughes 8a2634c2ab am 55732f49: Merge "android_reboot should take a const char*."
* commit '55732f49287a75f9baabe9f150443aec9234c90d':
  android_reboot should take a const char*.
2015-02-04 01:20:40 +00:00
Elliott Hughes 0068da6a93 android_reboot should take a const char*.
The kernel argument is actually a void*, but it's only read from.

Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
2015-02-03 15:44:16 -08:00
Elliott Hughes 25c2f84c5e am 14fcc4c6: am e44d25d6: Merge "Add Google-style StringPrintf."
* commit '14fcc4c66cbd7e55a12315d985b0723ef4a527ff':
  Add Google-style StringPrintf.
2015-02-03 23:41:33 +00:00
Elliott Hughes 14fcc4c66c am e44d25d6: Merge "Add Google-style StringPrintf."
* commit 'e44d25d64537f4ea2abcb56aabc7a5bf0731c222':
  Add Google-style StringPrintf.
2015-02-03 23:33:39 +00:00
Elliott Hughes e44d25d645 Merge "Add Google-style StringPrintf." 2015-02-03 23:23:11 +00:00
Elliott Hughes 6b3be2902d Add Google-style StringPrintf.
Change-Id: If333c28b8ed047346a2dd85e591c4bedbab874cc
2015-02-03 15:21:07 -08:00
Elliott Hughes e17fc7cf3c am c3bf8d85: am 9fc43358: Merge "Extra Win32 compatibility."
* commit 'c3bf8d85b58c4a4711983adcd6321a580d6835b1':
  Extra Win32 compatibility.
2015-02-03 22:56:42 +00:00
Elliott Hughes c3bf8d85b5 am 9fc43358: Merge "Extra Win32 compatibility."
* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
  Extra Win32 compatibility.
2015-02-03 22:36:57 +00:00
Elliott Hughes 714196d05c Extra Win32 compatibility.
Change-Id: Ibc583aba580f4fc15c243f495ead44b2ce4c6e5e
2015-02-03 14:26:58 -08:00
Elliott Hughes a803b7697f am 813d0ac1: am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
* commit '813d0ac13614b6199f407762f679afc9f439be7e':
  Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:39:30 +00:00
Elliott Hughes 813d0ac136 am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
* commit '6974ba4ed430ec3247c3a5c04a2263b4b04ff827':
  Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:33:00 +00:00
Elliott Hughes dec12b2b71 Add Google-style ReadFileToString and WriteStringToFile.
Bug: 19217569
Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
2015-02-03 12:18:11 -08:00
Elliott Hughes d3e3bfd6c0 am dbf6f33e: am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
* commit 'dbf6f33e84a4de9944b782ec079ba8b51f3e9c25':
  Revert "Remove netcfg's unused options."
2015-02-03 20:15:17 +00:00
Elliott Hughes dbf6f33e84 am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
* commit '2b2b7632f55ca73562361cf4d06e60e7b62f7ff4':
  Revert "Remove netcfg's unused options."
2015-02-03 20:09:30 +00:00
Elliott Hughes c463025a19 Revert "Remove netcfg's unused options."
This reverts commit f8e83054cb.

Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
2015-02-03 19:56:35 +00:00
Elliott Hughes d58fe3880e am b862d3e8: am 6a728fde: Merge "Remove netcfg\'s unused options."
* commit 'b862d3e8eb92323983020830f3d39240d6cfbee3':
  Remove netcfg's unused options.
2015-02-03 19:18:43 +00:00
Elliott Hughes d4e71f154e am 5b253e55: am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
* commit '5b253e55e0ac4d6b935036c1e8aa5151caf09ccc':
  Revert "Remove netcfg's unused options."
2015-02-03 19:18:42 +00:00
Elliott Hughes 85ed30d881 am 1ddbd76b: am 67900498: Merge "Remove netcfg\'s unused options."
* commit '1ddbd76bd8eededb5d854dc588d3cef68cdc0c69':
  Remove netcfg's unused options.
2015-02-03 19:18:41 +00:00
Elliott Hughes b862d3e8eb am 6a728fde: Merge "Remove netcfg\'s unused options."
* commit '6a728fde77d1367318c79e5b182f0cb316872a37':
  Remove netcfg's unused options.
2015-02-03 19:16:42 +00:00
Elliott Hughes 5b253e55e0 am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
* commit 'ef89e8d14619c68015103fd51ff75f82eeef8d61':
  Revert "Remove netcfg's unused options."
2015-02-03 19:16:42 +00:00
Elliott Hughes 1ddbd76bd8 am 67900498: Merge "Remove netcfg\'s unused options."
* commit '67900498cff54c8116b3f7afc84e046d98bb17e4':
  Remove netcfg's unused options.
2015-02-03 19:12:53 +00:00
Elliott Hughes f8e83054cb Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
2015-02-03 11:08:07 -08:00
Elliott Hughes ca77255c26 Revert "Remove netcfg's unused options."
This reverts commit 24c1885bc1.

Change-Id: Iaae6502e2db90d67b4275faa104cfc6a0abc65c6
2015-02-03 19:07:43 +00:00
Elliott Hughes 24c1885bc1 Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Ie0aecf5b18bd854cfb5878b6cfdd7160c9f42526
2015-02-02 14:39:42 -08:00
Paul McLean 9bc8190442 Adding name field to AudioPort for enum/select API.
Change-Id: I9e7a6476f7f2658c6ea1ac255683fefb9f598a2d
2015-02-02 12:45:38 -08:00
Dmitriy Ivanov 6458c0dc0a am bbbe9885: am 7cb19579: Merge "Add close_file flag to OpenArchiveFd()"
* commit 'bbbe988539a525e56809cc542876f63aef89fbac':
  Add close_file flag to OpenArchiveFd()
2015-02-02 19:32:02 +00:00
Dmitriy Ivanov bbbe988539 am 7cb19579: Merge "Add close_file flag to OpenArchiveFd()"
* commit '7cb19579bc22bf38e15b970f801f8065d629611d':
  Add close_file flag to OpenArchiveFd()
2015-02-02 19:14:17 +00:00
Dmitriy Ivanov 40b52b2c88 Add close_file flag to OpenArchiveFd()
* We should be able to keep fd alive after CloseArchive()

Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
2015-01-30 17:57:13 -08:00
Yabin Cui 3f83554d22 am 631965a3: am e862350b: Merge "Kill HAVE_PTHREADS."
* commit '631965a32eb503dc6782a298eb534881aa3697b8':
  Kill HAVE_PTHREADS.
2015-01-28 00:42:36 +00:00
Yabin Cui 631965a32e am e862350b: Merge "Kill HAVE_PTHREADS."
* commit 'e862350bb2eb3d3eda526da7f3b6d5c2dd40a445':
  Kill HAVE_PTHREADS.
2015-01-27 22:45:14 +00:00
Yabin Cui 4a6e5a3b64 Kill HAVE_PTHREADS.
Bug: 19083585
Change-Id: Ic09eb3dd250bc5c5b63cac7998f99f5fa007f407
2015-01-27 14:23:22 -08:00
Mark Salyzyn 66d51342c8 am 982421df: am 91581f19: Merge "liblog: add pstore write"
* commit '982421df4584f5691b33444ae3e18b81d6544b6a':
  liblog: add pstore write
2015-01-24 16:57:50 +00:00
Mark Salyzyn cd7ef90e62 am f0cc42f5: am 4730328d: Merge "logd: create private/android_logger.h"
* commit 'f0cc42f525c237431aa560ff42a3e8548bfbd3f4':
  logd: create private/android_logger.h
2015-01-24 16:57:48 +00:00
Mark Salyzyn 982421df45 am 91581f19: Merge "liblog: add pstore write"
* commit '91581f19906ade01eabc6e10a7dac209e710117a':
  liblog: add pstore write
2015-01-23 23:59:45 +00:00
Mark Salyzyn f0cc42f525 am 4730328d: Merge "logd: create private/android_logger.h"
* commit '4730328da72ef9b7aeaefc120358155fdfd8dde8':
  logd: create private/android_logger.h
2015-01-23 23:59:43 +00:00
Zhijun He 7be3af0a7a Merge "camera: add external camera facing enum" 2015-01-23 23:57:59 +00:00
Mark Salyzyn d91ab5815d liblog: add pstore write
Used to push the Android log messages into pstore
(when available, and no propagation of error).

Change-Id: I9def8cf796d35d347f502d9745d5f42ec1200253
2015-01-23 23:33:31 +00:00
Mark Salyzyn b5f6e45d6b logd: create private/android_logger.h
- create a structure to depict the private header
  expected at logd end of socket.
- utilize this new structure instead of unscalable
  byte stream technique used to unpack in logd.

Change-Id: I2d0e5c3531c279f2dc1fbd74807210ff8d804de0
2015-01-23 23:32:11 +00:00
Zhijun He 46e0a589d5 camera: add external camera facing enum
This is to enable the external camera support.

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
2015-01-22 13:43:09 -08:00
Christopher Ferris bd3bbff674 am d426a4e7: Merge "Move 32 bit/64 bit check into debuggerd."
* commit 'd426a4e7b62c18124827868ddbf8987aa433451b':
  Move 32 bit/64 bit check into debuggerd.
2015-01-22 00:13:01 +00:00
Christopher Ferris 9774df6134 Move 32 bit/64 bit check into debuggerd.
On 64 bit systems, calls to dump_backtrace_to_file or dump_tombstone
try and directly contact the correct debuggerd (32 bit vs 64 bit)
by reading the elf information for the executable.
Unfortunately, system_server makes a call to dump_backtrace_to_file
and it doesn't have permissions to read the executable data, so it
defaults to always contacting the 64 bit debuggerd.
This CL changes the code so that all dump requests go to the 64 bit
debuggerd, which reads the elf information and redirects requests for
32 bit processes to the 32 bit debuggerd.

Testing:

- Forced the watchdog code in system_server to dump stacks and
  verified that all native stacks are dumped correctly.
- Verified that dumpstate and bugreport still properly dump the native
  processes on a 64 bit and 32 bit system.
- Intentionally forced the 64 bit to 32 bit redirect to write only a
  byte at a time and verified there are no errors, and no dropped data.
- Used debuggerd and debuggerd64 to dump 32 bit and 64 bit processes
  seemlessly.
- Used debuggerd on a 32 bit system to dump native stacks.

Bug: https://code.google.com/p/android/issues/detail?id=97024
Change-Id: Ie01945153bdc1c4ded696c7334b61d58575314d1
2015-01-20 17:22:07 -08:00
Elliott Hughes bb604524fb am 45c4c06f: Merge "Remove unused cruft from libcutils."
* commit '45c4c06ffe6f38e0f77f37f488e07f2537eddd45':
  Remove unused cruft from libcutils.
2015-01-16 16:02:24 +00:00
Jeff Sharkey 7c42c7f84f am 9f72ef89: Merge "Extend to receive NFLOG packets."
* commit '9f72ef8944a93bd333c6c7f87c7f7d79207ae663':
  Extend to receive NFLOG packets.
2015-01-16 06:07:29 +00:00
Elliott Hughes f21717cd87 Remove unused cruft from libcutils.
Change-Id: I316d39e8e0a9aa385d8e1f37678b8bf2c03441eb
2015-01-15 21:16:03 -08:00
Jeff Sharkey 9f72ef8944 Merge "Extend to receive NFLOG packets." 2015-01-16 01:11:02 +00:00
Christopher Ferris fa41e0f5c8 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581

(cherry picked from commit 5f2ff6a910)

Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
2015-01-15 15:34:21 -08:00
Dmitry Shmidt 2901b30a58 am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev
* commit '70f6dea9d06876bc65181c40ee9e623be196fb4c':
  android_filesystem: Remove setuid bits from tcpdump
2015-01-15 20:51:35 +00:00
Jeff Sharkey 9a20e67fa6 Extend to receive NFLOG packets.
Packets captured and logged by the NFLOG target are unicast, so
extend to catch and decode them.  To avoid escaping issues, the raw
contents are passed around as hex strings.

Bug: 18335678
Change-Id: Ib7299500baa00080a1f000f9da843eb527363353
2015-01-15 12:50:59 -08:00
Dmitry Shmidt 70f6dea9d0 Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev 2015-01-15 20:45:06 +00:00
Dmitry Shmidt 33e4f4d81a android_filesystem: Remove setuid bits from tcpdump
Bug: 18669116

Change-Id: I25486f2fe0e994f569b788fc9f03ef6d383f54d4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2015-01-15 10:35:54 -08:00
Christopher Ferris 844c7ccc0a am 5f2ff6a9: Add timed versions of stack dumping functions.
* commit '5f2ff6a9106083e2a79b8600a0bf6a5341c6ca38':
  Add timed versions of stack dumping functions.
2015-01-15 01:48:27 +00:00
Christopher Ferris 5f2ff6a910 Add timed versions of stack dumping functions.
Under some unknown circumstances, debuggerd could become unresponsive.
If you try and take a bugreport during this time, it will hang forever.
Adding functions that have a timeout will allow dumpstate to stop if
dumping is taking too long.

Bug: 18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
2015-01-14 15:24:33 -08:00
Chih-Hung Hsieh 62ea6b268f am ce1928e9: Merge "Add required casts for clang/llvm -Wc++11-narrowing"
* commit 'ce1928e987923a276ff048c69d9a6f43f22610ba':
  Add required casts for clang/llvm -Wc++11-narrowing
2015-01-13 17:51:27 +00:00
Chih-Hung Hsieh ba8cdf99a4 Add required casts for clang/llvm -Wc++11-narrowing
system/core/include/utils/Mutex.h:134:25: error: non-constant-expression
cannot be narrowed from type 'long long' to '__kernel_time_t' (aka
'long') in initializer list [-Wc++11-narrowing]

system/core/include/utils/Mutex.h:135:26: error: non-constant-expression
cannot be narrowed from type 'long long' to 'long' in initializer list
[-Wc++11-narrowing]

Change-Id: Icb9df26aeb01617da5ab1c36987289f7c2b11954
2015-01-12 16:53:52 -08:00
Elliott Hughes 4d9ddb14c0 am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER."
* commit 'ec556521e23f66ea52e41a7d9540b2dec31766c5':
  Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
2015-01-12 22:28:11 +00:00
Elliott Hughes ae52165490 Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
Change-Id: I3d92dbecebd2bb449a8c4332de684919a58847ad
2015-01-12 13:56:34 -08:00
Elliott Hughes 508a1a4df7 am 9da414f9: Merge "Linux always has POSIX clocks available."
* commit '9da414f95e06979e60b48380afbf5372c1ef0ef3':
  Linux always has POSIX clocks available.
2015-01-10 00:42:40 +00:00
Elliott Hughes 76f0a84f6a Linux always has POSIX clocks available.
pixelflinger doesn't have to run on the Mac, but the Condition
code might.

Change-Id: Ib4e9b4daa6e848ffd5742959427b172d45f08e3c
2015-01-09 16:17:46 -08:00
Elliott Hughes 55410c4e62 am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>."
* commit '4c6c6d1c7ed7d8481d717f949c18657efa5533af':
  You either have winsock or <sys/sockets.h>.
2015-01-09 22:02:26 +00:00
Elliott Hughes 3906c8511e You either have winsock or <sys/sockets.h>.
There is no third choice.

Change-Id: I8f1206f22798f747896dd53f3081cdfa4b1707c4
2015-01-09 12:21:51 -08:00
Jesse Hall ec8e7e2ccb am 7208a015: Merge "Mutex: add timedLock() method"
* commit '7208a01514284becbd32cf4dfd256e4b10448f8e':
  Mutex: add timedLock() method
2015-01-07 18:12:00 +00:00
Jesse Hall 7208a01514 Merge "Mutex: add timedLock() method" 2015-01-07 18:01:11 +00:00
Jesse Hall 601424a84f Mutex: add timedLock() method
This is not available for host builds because OSX doesn't have
pthread_mutex_timedlock() or equivalent.

Bug: 18842510
Change-Id: I072e74ab1a6f770fd245828b39c5f954dda1113b
2015-01-07 08:06:51 -08:00
Mark Salyzyn aeeaee58a1 am e892279b: Merge "liblog: Add log_time += operator"
* commit 'e892279b3a29060d873bd65e55b3a613e61fe04d':
  liblog: Add log_time += operator
2015-01-05 20:24:57 +00:00
Mark Salyzyn decd92945f liblog: Add log_time += operator
Change-Id: I1d2987b6cb333fc344d4fee1b7bb25f32a4143c6
2015-01-05 16:27:54 +00:00
Dan Albert 977b84140f am da4f30c5: Merge "Remove incompatible Unicode compatibility types."
* commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df':
  Remove incompatible Unicode compatibility types.
2014-12-12 02:53:25 +00:00
Dan Albert da4f30c5b4 Merge "Remove incompatible Unicode compatibility types." 2014-12-12 02:42:30 +00:00
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 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
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
Eric Laurent 4fca59181c audio: add usage "virtual source" to audio attributes.
Bug: 16006090.
Change-Id: I2d22b52e97095b57a6508b82bd11e27f860bb2e7
2014-12-09 12:13:13 -08:00
Eric Laurent be7bb9004c am 47f52f24: audio: new stream types
* commit '47f52f247d6d895878b831de448f19b98225515d':
  audio: new stream types
2014-11-26 12:01:50 +00:00
Elliott Hughes bbd3b7edd7 am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."
* commit 'c0ac9313e942fb7d3a027cec41904c18d8841521':
  Only Windows doesn't have <sys/uio.h>.
2014-11-25 21:55:37 +00:00
Elliott Hughes 111e3d3d9c Only Windows doesn't have <sys/uio.h>.
This should probably be in libcutils instead, so code that needs to
care about Windows can use readv/writev.

Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
2014-11-25 13:27:43 -08:00
Elliott Hughes a0959e90f5 am 8eb770d3: Merge "Remove long-dead readtty."
* commit '8eb770d37cd9470630fdbe496f22b7a04549fef7':
  Remove long-dead readtty.
2014-11-25 19:03:12 +00:00
Elliott Hughes b120134bd1 Remove long-dead readtty.
Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
2014-11-24 12:01:21 -08:00
Eric Laurent 47f52f247d audio: new stream types
Added stream types for internal use by audio policy
and audio flinger.

Bug: 18067208.
Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
2014-11-24 10:41:21 -08:00
Elliott Hughes b741221117 am 456661e3: Merge "Fix Mac build."
* commit '456661e38cefe1afbf640036f710f0d481b64bf9':
  Fix Mac build.
2014-11-22 15:42:41 +00:00
Elliott Hughes 8c275ffcba Fix Mac build.
Change-Id: Iae697ae257cf4b1d675e2b758dd31d5a6a71ae4d
2014-11-22 07:25:02 -08:00
Elliott Hughes e79cd67cfd am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN."
* commit '0101b06fa6f9863ee87e89757e70900c3a0e7bfc':
  Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
2014-11-22 08:01:20 +00:00
Elliott Hughes 97ac0e1bb4 Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
Change-Id: I9e25ac9d27e95b04fb8bf7a66c619af0139d8b8f
2014-11-21 23:10:45 -08:00
Dan Albert 5ef3bcc768 am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."
* commit '5d8a5ade620be65e0e658dbb99e66398f3ffdc74':
  Add a pre-C++11 constexpr compatibility macro.
2014-11-20 20:21:55 +00:00
Dan Albert c59932f937 Remove incompatible Unicode compatibility types.
As well intentioned as these were, uint16_t and C++11's char16_t are
_not_ actually compatible. They are not implicitly convertible, and
they mangle differently, so they are not even ABI compatible. In our
now wonderous world of C++11, no one should be using these, so just
kill them.

Bug: 18300613
Change-Id: I06d92d7f1d937dd94a620874323d4c50eb6a31bd
2014-11-20 11:54:39 -08:00
Dan Albert e4c649c9fc Add a pre-C++11 constexpr compatibility macro.
Needed for cases where something should be constexpr if possible, but
not being constexpr is fine if in pre-C++11 code (such as a const
static float member variable).

Bug: 18466763
Change-Id: I635d062575ba2fbc4cbe3a89f730128c404d95e1
2014-11-20 10:47:55 -08:00
Elliott Hughes 83ebca0290 am ac252357: Merge "Remove atomic-inline.h."
* commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715':
  Remove atomic-inline.h.
2014-11-17 23:16:44 +00:00
Elliott Hughes c3914d2be2 Remove atomic-inline.h.
Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
2014-11-17 14:38:56 -08:00
Elliott Hughes ba96de5f65 am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."
* commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669':
  Remove the error-prone TARGET_CPU_SMP from system/core.
2014-11-17 19:40:16 +00:00
Elliott Hughes e9ca709a73 Remove the error-prone TARGET_CPU_SMP from system/core.
This means that code that uses libcutils no longer has to ensure that
it's set ANDROID_SMP in the calling code's Android.mk for this to
function correctly.

Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
2014-11-17 11:16:59 -08:00
Hans Boehm 0b7f368442 am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""
* commit '64d7117efc7f7b8b477cd216a119b07041d8f406':
  Second attempt to "Rewrite atomic.h to use stdatomic.h."
2014-11-14 00:26:51 +00:00
Hans Boehm c56648948c Second attempt to "Rewrite atomic.h to use stdatomic.h."
This should not be committed until win_sdk and aarch64 builds are
fixed in the presence of this CL.

This reverts commit 2789faabfa.

We additionally remove uniprocessor support from the earlier CL,
thus avoiding a potential compiler code reordering issue.

Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
2014-11-13 15:59:10 -08:00
Yabin Cui 556f43820f am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"
* commit '2c0839e9dba6d9d282f8391c3edb14236f56618d':
  kill HAVE_POSIX_FILEMAP
2014-11-11 19:53:38 +00:00
Yabin Cui 266092c52d kill HAVE_POSIX_FILEMAP
Bug: 18315579
Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
2014-11-11 10:31:30 -08:00
Nick Kralevich d6520cf958 am 65a83bdf: Merge "Reserve some AIDs for OEMs"
* commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c':
  Reserve some AIDs for OEMs
2014-11-10 17:51:34 +00:00
Nick Kralevich 65a83bdf2e Merge "Reserve some AIDs for OEMs" 2014-11-10 17:42:58 +00:00
Johan Redestig 60ac6364ec Reserve some AIDs for OEMs
OEMs frequently add some AIDs on their own. Reserve some range
for them to use.

Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
2014-11-10 08:14:21 +01:00
Stephen Hines 96031a9985 am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."
* commit 'f02c7972560bc512552830c8110d026136a3a87f':
  Move winsock2.h in front of a potential windows.h include.
2014-11-09 09:03:31 +00:00
Dan Albert 7c7a782cad am aaa920d7: Merge "Make Unicode.h use types that match libc++."
* commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead':
  Make Unicode.h use types that match libc++.
2014-11-09 09:03:30 +00:00
Stephen Hines f02c797256 Merge "Move winsock2.h in front of a potential windows.h include." 2014-11-09 07:24:43 +00:00
Stephen Hines 7e34121e39 Move winsock2.h in front of a potential windows.h include.
Files that included FileMap.h (possibly transitively), before including
ByteOrder.h (which pulls in winsock2.h directly), will experience a
compiler warning/error from the latest mingw headers. This happens because
the headers require that winsock2.h come before windows.h in all cases.
The simplest (and most error-proof) fix for now is to include winsock2.h
before this use of windows.h.

Change-Id: I33069e4c9962d9820d0ea5976554f89d7ff6307c
2014-11-08 19:30:05 -08:00
Dan Albert 2f5ad5ff86 Make Unicode.h use types that match libc++.
libc++ also defines these types for pre-C++11, and the two definitions
need to match to avoid redefinition errors.

Bug: 18300613
Change-Id: I1e9198d39f7c470f37bc6edba2dca2d499f54c9b
2014-11-08 20:22:30 +00:00
Calin Juravle 4de4e6defc resolved conflicts for merge of e3c22c41 to stage-aosp-master
Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
2014-10-28 19:09:50 +00:00
Calin Juravle 0f31008eaf Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-dev
automerge: 9c094da

* commit '9c094da83112bbcad37eaffecfee96ff169d84a8':
  Handle code_cache dir creation in libnativebridge
2014-10-28 18:08:02 +00:00
Calin Juravle 1402fbb135 Handle code_cache dir creation in libnativebridge
Also:

- add kPreInitiliazed state to native bridge with check transition:
kOpened->kPreInitialized->kInitialized
- made sure we free the memory for the code_cache_path
- tidy up some error messages
- tidy up tests
- add a dummy native bridge to test with

Bug: 18027433
Bug: 18097480

(cherry picked from commit f9d9e2a2d9)

Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
2014-10-27 15:37:32 +00:00
Calin Juravle f9d9e2a2d9 Handle code_cache dir creation in libnativebridge
Also:

- add kPreInitiliazed state to native bridge with check transition:
kOpened->kPreInitialized->kInitialized
- made sure we free the memory for the code_cache_path
- tidy up some error messages
- tidy up tests
- add a dummy native bridge to test with

Bug: 18027433
Bug: 18097480

Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
2014-10-27 15:03:13 +00:00
Chih-Hung Hsieh 6ea35520fd am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh c37387a4cd am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function bodies."
* commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd':
  Do not inline rarely used trace function bodies.
2014-10-15 17:57:07 +00:00
Chih-Hung Hsieh 2d3150e736 Do not inline rarely used trace function bodies.
When atrace_* functions are inlined,
the rarely used 1024-byte buffers are allocated on stack.

BUG: 17444504
Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
2014-10-14 15:37:20 -07:00
Carson Liao 519d1cf44a am 4b0374ae: am 4c4cf467: modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
* commit '4b0374ae1a97cff279f287dded14619e9579da62':
  modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
2014-10-07 17:06:04 +00:00
Carson Liao 4c4cf467f5 modified AUDIO_SOURCE_FM_TUNER enum value for FM feature
Review: https://partner-android-review.git.corp.google.com/#/c/183993

    Signed-off-by: Carson Liao <carson.liao@mediatek.com>

Change-Id: I8d70b197bcdc710119031bcf622fee0c1b3b3aa7
2014-10-06 22:02:37 -07:00
Hans Boehm f381920b58 am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:17:43 +00:00
Hans Boehm 054627df6b am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""
* commit '072877af485d49f11e227c0d22a7bb4a341533d6':
  Revert "Rewrite atomic.h to use stdatomic.h."
2014-10-04 02:09:19 +00:00
Hans Boehm 2789faabfa Revert "Rewrite atomic.h to use stdatomic.h."
This reverts commit cb344d4640.

Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm 954fc61b6b am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
  Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:45 +00:00
Hans Boehm 2ac8207e50 am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit 'f5204549faf7310cc808bcb3676fb36268178e26':
  Rewrite atomic.h to use stdatomic.h.
2014-10-04 00:06:30 +00:00
Hans Boehm cb344d4640 Rewrite atomic.h to use stdatomic.h.
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.

Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07:00
jgu21 2d83ca4cc1 am b3facbfd: LibNativeBridge: Add early init & env setup
* commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42':
  LibNativeBridge: Add early init & env setup
2014-09-29 03:37:07 +00:00
jgu21 b3facbfdec LibNativeBridge: Add early init & env setup
Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().

Turn on -Wall for libnativebridge.

(cherry picked from commit 962eb40abb)
(cherry picked from commit ab0da5a9a6)
(cherry picked from commit 2f71cb24fa)
(cherry picked from commit 04054e28e2)
(cherry picked from commit 4390a63236)

Bug: 17671501
Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
2014-09-26 13:04:36 -07:00
Hochi Huang 54d5b2e670 am fcbb23ad: [AU] Update volume setting and Audio Device API 3.0
* commit 'fcbb23adc939dd27122d962e5f7e7f016259f03e':
  [AU] Update volume setting and Audio Device API 3.0
2014-09-26 00:24:11 +00:00
Hochi Huang fcbb23adc9 [AU] Update volume setting and Audio Device API 3.0
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Change-Id: I772584ae05e6a8d2fdc8c4a52e44ad80c3c1a4a7
2014-09-25 21:26:02 +00:00
Andreas Gampe 69974972be resolved conflicts for merge of 64884bb1 to lmp-mr1-dev-plus-aosp 2014-09-24 16:00:12 -07:00
Andreas Gampe 2a0f42b58d resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aosp 2014-09-24 15:56:29 -07:00
Andreas Gampe 9d1b922725 Merge "LibNativeBridge: Add early init & env setup" 2014-09-24 22:00:06 +00:00
Eric Laurent 4c58d89452 am 62e05407: am f6cce347: audio: add HW hotword capture flag
* commit '62e05407da5c36b6c4057e613ae6d4e3068a3721':
  audio: add HW hotword capture flag
2014-09-24 04:19:16 +00:00
jgu21 ab0da5a9a6 LibNativeBridge: Add early init & env setup
Add a method to set up /proc/cpuinfo with enough privileges. Set
up the environment for an app in InitializeNativeBridge().

Turn on -Wall for libnativebridge.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
2014-09-23 20:08:25 -07:00
Eric Laurent e6b10121ad am f6cce347: audio: add HW hotword capture flag
* commit 'f6cce347a73e3b3da9ff6698ead25b5a543ce47b':
  audio: add HW hotword capture flag
2014-09-24 02:26:33 +00:00
Elliott Hughes ed561793f3 am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:52 +00:00
Elliott Hughes 830b77bc5c am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 16:05:18 +00:00
Elliott Hughes cb3d65323d defined(HAVE_OFF_T) is really just !defined(__APPLE__).
Change-Id: I83c271bfe24b777acf293d2b4ac5af2cce8398b9
2014-09-22 20:50:54 -07:00
Eric Laurent f6cce347a7 audio: add HW hotword capture flag
Bug: 17575019.
Change-Id: I12c0a2e0200f3d839dfd74650724391e54ac3534
2014-09-19 17:45:18 -07:00
Christopher Ferris 6bcc4acc6f Use the correct debuggerd given the tid.
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.

This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.

Bug: 17487122

(cherry picked from commit a9fa7b87f1)

Change-Id: I3c9e0212c8720877a6af092071a3695df2a36df8
2014-09-13 16:22:17 -07:00
Christopher Ferris 07bb3f1e0b am 07dda6b5: Merge "Use the correct debuggerd given the tid." into lmp-dev
* commit '07dda6b57c6a476177b68ad42966f24cbbdb04c1':
  Use the correct debuggerd given the tid.
2014-09-13 22:54:00 +00:00
Christopher Ferris a9fa7b87f1 Use the correct debuggerd given the tid.
On 64 bit systems, calling dump_backtrace_to_file will automatically
call debuggerd64. If the process to dump is actually 32 bit, this
creates an unrecognizable dump backtrace. Modify the code to check the
type of the process and connect to the appropriate debuggerd process.

This change refactors both the tombstone and backtrace functionality to
allow both to work properly on 64 bit systems when dealing with mixed
processes.

Bug: 17487122
Change-Id: Icf123a6f4508b1aeec073663aa1a0ceae5380aa1
2014-09-12 20:12:11 -07:00
Mark Salyzyn abc75368a8 am e70851f8: am f9b9693b: Merge "liblog: logcat: colored output."
* commit 'e70851f8a8aa4c9dfaa442abf812c283ba8d8b6f':
  liblog: logcat: colored output.
2014-09-12 20:08:47 +00:00
Pierre Zurek ead88fca6e liblog: logcat: colored output.
This patch adds a new '-v color' option to logcat so that the output is
colored similar to the ones in DDMS. Simply type "adb logcat -v color"
to use it. Works well with bash in gnome-terminal. NO GUARANTEE IT WILL
WORK ON A NON xterm STYLE TERMINAL.

Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I9189c5f27fed991579edbcbc6834536eb8112152
2014-09-11 19:04:17 -07:00
Jon Eklund 5c9f25da9c am fcfa8640: audio.h: Add "safe speaker" device for limited-loudness use cases
* commit 'fcfa86403e206e2caa519299939480cb45deb8ba':
  audio.h: Add "safe speaker" device for limited-loudness use cases
2014-09-11 18:30:51 +00:00
Jon Eklund fcfa86403e audio.h: Add "safe speaker" device for limited-loudness use cases
Bug: 17319721
Change-Id: Ie1af5b73258f8a0009c3bc3cecb3e0e8b2262ed7
2014-09-10 15:51:48 -07:00
Sreeram Ramachandran 18d5aa4d5a am 69052994: Merge "Support resetting connections tied to any nonexistent address." into lmp-dev
* commit '69052994fd21f2b594295f62e2f867e911e8468d':
  Support resetting connections tied to any nonexistent address.
2014-09-10 00:51:22 +00:00
Sreeram Ramachandran 69052994fd Merge "Support resetting connections tied to any nonexistent address." into lmp-dev 2014-09-09 23:24:45 +00:00
Sreeram Ramachandran 17622d09d5 Support resetting connections tied to any nonexistent address.
Bug: 15414453
Change-Id: Ibf1f052e12b88838a328148e25817a96f10d50f5
2014-09-08 23:35:52 -07:00
Andreas Gampe 41df668c7b NativeBridge: Refactor for new initialization flow
Setup becomes Load, have explicit Initialize and Unload.

(cherry picked from commit 035bd7541e)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-08 11:12:13 -07:00
Andreas Gampe 4f65030e0c am 8e10bfd9: am 88d1bc0e: Merge "NativeBridge: Refactor for new initialization flow"
* commit '8e10bfd9cc543fdec8fec26c320f649f72b15e3b':
  NativeBridge: Refactor for new initialization flow
2014-09-04 23:22:29 +00:00
Andreas Gampe 035bd7541e NativeBridge: Refactor for new initialization flow
Setup becomes Load, have explicit Initialize and Unload.

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-04 12:57:54 -07:00
Hans Boehm cad56b6ad3 Remove android_... store_barriers and 64-bit atomics.
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses.  All users should move
to C11 or C++11 atomics.

(Resolved conflicts in atomic-...64.h with uniprocessor support
removal as in AOSP.)

Bug:16880454

Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
(cherry picked from commit 9959ed9530)
2014-09-02 17:08:38 -07:00
Brian Carlstrom 68e0d185f4 am 24d2adba: am 188d4396: Merge "Change /dalvik-cache to be owned by root."
* commit '24d2adba7a2f9caa82a88be70ad2fe7397ab310a':
  Change /dalvik-cache to be owned by root.
2014-08-29 11:39:17 +00:00
Alex Light c692410e16 Change /dalvik-cache to be owned by root.
Bug: 16875245

(cherry picked from commit 3878ebd724)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-28 16:56:36 -07:00
Brian Carlstrom 188d4396b8 Merge "Change /dalvik-cache to be owned by root." 2014-08-28 23:17:06 +00:00
Alex Light 3878ebd724 Change /dalvik-cache to be owned by root.
Bug: 16875245

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-27 15:42:19 -07:00
Hans Boehm d034eb1171 am 424eaece: am 69001e08: Merge "Remove android_... store_barriers and 64-bit atomics."
* commit '424eaece64e3649082a3972a8eebf76a6b403494':
  Remove android_... store_barriers and 64-bit atomics.
2014-08-27 22:09:03 +00:00
Hans Boehm 9959ed9530 Remove android_... store_barriers and 64-bit atomics.
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses.  All users should move
to C11 or C++11 atomics.

Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
2014-08-27 14:15:09 -07:00
Andreas Gampe 049249ce7a NativeBridge: Tighten security on libnativebridge
Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669

(cherry picked from commit cd2ef4c1af)

Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Andreas Gampe c029f9d225 am 4089cda0: Merge "NativeBridge: Tighten security on libnativebridge" into lmp-dev
* commit '4089cda0ae73e71adb787e595c747846e30730ee':
  NativeBridge: Tighten security on libnativebridge
2014-08-22 05:13:50 +00:00
Andreas Gampe cd2ef4c1af NativeBridge: Tighten security on libnativebridge
Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669
Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-21 14:33:44 -07:00
Elliott Hughes 176fe9005d am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."
* commit '4592d73e18684b8ba2addb97433eed4cf389e386':
  Only the Mac doesn't have open_memstream.
2014-08-21 03:16:26 +00:00
Elliott Hughes a59b6ac697 Merge "Only the Mac doesn't have open_memstream." 2014-08-21 00:11:41 +00:00
Elliott Hughes 3ff8888f66 Only the Mac doesn't have open_memstream.
We should probably move this into art, since they're the only people using it.

Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes 3601abb810 am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
* commit 'f7e88e51b31e64e085b3a564f4b1baa8334d63f1':
  There's no non-SMP LP64.
2014-08-20 20:49:36 +00:00
Elliott Hughes 901c900ce6 There's no non-SMP LP64.
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Elliott Hughes 10cce72c4b am 3859029a: am 7fb0ee0c: Merge "Remove androidGetTid."
* commit '3859029a48aa78150fa61eb4988214f8632b33ce':
  Remove androidGetTid.
2014-08-18 19:34:23 +00:00
Piotr Jastrzebski c77755f139 am f81da073: am c0879ee9: Merge "Replace char* with ZipEntryName in ziparchive API."
* commit 'f81da073dab8c6eba0a86975f4d94eae5dc461cf':
  Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:13:07 +00:00
Piotr Jastrzebski c0879ee9d3 Merge "Replace char* with ZipEntryName in ziparchive API." 2014-08-16 04:31:31 +00:00
Elliott Hughes b7659613b2 Remove androidGetTid.
Bug: 17048545
Change-Id: I93cbb2d7bd18d506b5f5f7f262dd9ac0fca053b4
2014-08-18 10:47:37 -07:00
Jeff Brown 84a248ce27 am 69d68b69: Merge "Add trace tag for power management." into lmp-dev
* commit '69d68b69e5341124c1947f3110c67aa8836e3437':
  Add trace tag for power management.
2014-08-16 03:14:32 +00:00
Jeff Brown 69d68b69e5 Merge "Add trace tag for power management." into lmp-dev 2014-08-15 18:45:09 +00:00
Calin Juravle 62de21e148 am 5ed25acd: am 25a7d5f8: Merge "Move native bridge library in system/core"
* commit '5ed25acd4ab7c606986c77892c07c2914f8df8f2':
  Move native bridge library in system/core
2014-08-15 12:42:36 +00:00
Piotr Jastrzebski ecccc5ad93 Replace char* with ZipEntryName in ziparchive API.
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.

Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle 4914fcd91b Move native bridge library in system/core
Bug: 16884833

(cherry picked from commit 961ae12dea)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
2014-08-15 12:40:45 +01:00
Calin Juravle 25a7d5f892 Merge "Move native bridge library in system/core" 2014-08-15 04:45:59 +00:00
Jeff Brown de4d921192 Add trace tag for power management.
Bug: 17004602
Change-Id: Iecd79e6e0417c02b902cde468b0e842f9348b386
2014-08-14 19:24:30 -07:00
Piotr Jastrzebski d5d04be07f am fa412127: am b242ad40: Merge "Revert "Make sure that names of all entries have the same encoding.""
* commit 'fa41212789a068827edc9fd1eac7b6a988cba0a5':
  Revert "Make sure that names of all entries have the same encoding."
2014-08-13 10:02:23 +00:00
Piotr Jastrzebski 8b4a58e1df am b720c8d6: am b0206765: Merge "Make sure that names of all entries have the same encoding."
* commit 'b720c8d601cebbc9f48ef8e51c23fd6d190305f7':
  Make sure that names of all entries have the same encoding.
2014-08-13 09:09:36 +00:00
Calin Juravle 961ae12dea Move native bridge library in system/core
Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Piotr Jastrzebski bd0a74854e Revert "Make sure that names of all entries have the same encoding."
This reverts commit 6a7f4bb79d.

Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
2014-08-13 09:49:25 +00:00
Piotr Jastrzebski 6a7f4bb79d Make sure that names of all entries have the same encoding.
Add new public method to allow checkisc if an archive has entry names encoded in
UTF-8. If not then they will be encoded in IBM PC character encoding.

Bug: 16162465
Change-Id: I4468d76accca8a9b0b31cae8d43399ffc22cad42
2014-08-13 09:58:16 +01:00
Piotr Jastrzebski 6a993053c8 am 6871f937: am 400e7372: Merge "Add EndIteration method to free memory allocated"
* commit '6871f937f93c2a37344b928203ec613559584d33':
  Add EndIteration method to free memory allocated
2014-08-11 09:57:52 +00:00
Rachad 9cf963d61e am cc2566f1: Merge "Tunneled Video Playback support" into lmp-dev
* commit 'cc2566f12760d66837b52213e5ffd2cb30cce19e':
  Tunneled Video Playback support
2014-08-09 05:07:13 +00:00
Rachad cc2566f127 Merge "Tunneled Video Playback support" into lmp-dev 2014-08-09 00:51:24 +00:00
Piotr Jastrzebski 79c8b34f36 Add EndIteration method to free memory allocated
in StartIteration. This method should always be called when the
iteration is over to make sure that we don't leak memory.

Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
2014-08-11 07:58:00 +01:00
Elliott Hughes aab3b34cd7 am 4c818dc8: am 56b28f6b: Merge "RefBase: make Renamer destructor virtual"
* commit '4c818dc800d97e2fdee0337a0e9736099d90cc47':
  RefBase: make Renamer destructor virtual
2014-08-06 22:48:30 +00:00
Eric Laurent c85cce96af am fb2343da: Merge "audio: add defines for audio HW sync source" into lmp-dev
* commit 'fb2343da60bdf56205a29ec11db5e3bdd87d9651':
  audio: add defines for audio HW sync source
2014-08-06 20:30:22 +00:00
Eric Laurent d91e6df901 audio: add defines for audio HW sync source
Bug: 16132368.
Change-Id: I4008c315f2cba9c6027998be92f4af649359bcce
2014-08-05 15:02:57 -07:00
Elliott Hughes a613844e13 am e07a6e63: am 6d9a5ac3: Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6"
* commit 'e07a6e6337a959c45ab71acf6ff1fad8a8ac5dfd':
  [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
2014-08-05 21:43:16 +00:00
Eric Laurent 3b1215c374 Merge "sound_trigger HAL update" into lmp-dev 2014-08-05 17:41:31 +00:00
Elliott Hughes 6d9a5ac394 Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6" 2014-08-05 17:41:26 +00:00
Christopher Ferris dda47b7868 Allow getting an uncached process map.
(cherry picked from commit f02593b0e6)

Change-Id: I2012bf2dc553ebc663345b9eac6d794e80df9c00
2014-08-04 19:21:23 -07:00
Elliott Hughes 56b28f6b2c Merge "RefBase: make Renamer destructor virtual" 2014-08-05 00:30:25 +00:00
Ukri Niemimuukko 00e56a248d RefBase: make Renamer destructor virtual
This patch makes the Renamer class destructor virtual and fixes
the incorrect constructor initialization list ordering.

These issues and related compiler warnings have been suppressed
by the build system which uses the gcc –isystem command
line option, unless a project explicitly adds the include the path
system/core/include to Android.mk and uses the templates.

Change-Id: Iff76a655eb8bd547adfe994c7315a005e98aed41
Signed-off-by: Ukri Niemimuukko <ukri.niemimuukko@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
2014-08-06 00:12:06 -07:00
Christopher Ferris f02593b0e6 Allow getting an uncached process map.
Change-Id: I58d7e90a7b5c4476a4b9f51640c54d13748ac220
2014-08-04 17:17:57 -07:00
Rachad d6d4c61a93 Tunneled Video Playback support
Added native_window_set_sideband_stream() method to window.h

Bug: 16132368
Change-Id: Iff5770cb2e2d27176bee37edacaed7b783bbce2a
2014-08-04 21:57:37 +00:00
Eric Laurent 3fc434e9c1 sound_trigger HAL update
Indicate if trigger capture is returned with
recognition event in implementation properties
Add coarse confidence level to keyphrase recognition event.
Add capture format to recognition event

Bug: 12378680.

Change-Id: I52303ce2e46b9ebfb9993e47d153799921f9f8e7
2014-08-03 17:52:10 -07:00
Duane Sand 734f50c2fe [MIPSR6] Skip pixelflinger, memset assembler code on mips32r6
Temporarily use generic C-coded libpixelflinger & memset on mips32r6.

Change-Id: I629b11ba955eaba323cba1df96c39f75f4d24d62
2014-07-31 16:21:16 -07:00
Eric Laurent 1e92ed5e83 audio: define type for unique audio Ids.
Define a type for unique audio Ids allocated by AudioFLinger
for use as session Ids or I/O handles.

Bug: 12378680.
Change-Id: Ic9019fff97a1227b60e48c88c57d25dbbdcd7d1e
2014-07-28 14:31:58 -07:00
Eric Laurent a768c306b2 audio: add audio device address helper function
Add helper function to derive set_parameter command
string from device type and address.

14815883

Change-Id: Icf47218f1809f567ef93bdd99d6308475886b298
2014-07-28 19:24:50 +00:00
Eric Laurent 0a381a379d audio: move struct audio_config definition to audio.h
struct audio_config definition moved from hardware/audio.h to
system/audio.h for use inside the framework and not only at the HAL.

Added frame_count field to struct audio_config.

Bug: 14815883.

Change-Id: Ib0e99a60234b8e5302eb882b89e5a021a94ec2cb
2014-07-28 19:18:39 +00:00
Jean-Michel Trivi c3dbe121be Define new audio attribute flag: beacon
Flag AUDIO_FLAG_BEACON characterizes streams where the system
  ensures that the playback of the sound will be compatible
  with its use as a broadcast for surrounding people
  and/or devices. Ensures audibility with no or minimal
  post-processing applied.

Bug 15415971

Change-Id: I1df9dc50e3fcc973a0709a55df5b3bd95f81eb58
2014-07-27 14:09:00 -07:00
Zhijun He c73b73a3c9 graphics: update raw10 to allow padding between rows
Change-Id: Ied1f42bb977212d9e5f3b2b2b3caa9c8c2caac5d
2014-07-25 11:42:38 -07:00
Elliott Hughes 2befa73f68 Remove <cutils/tztime.h>.
(cherry picked from commit f2e4b411e6)

Bug: 15765976
Change-Id: I758acdb18d75ea601a06d02b53f1df9f1ad17a26
2014-07-24 16:16:59 -07:00
Elliott Hughes f2e4b411e6 Remove <cutils/tztime.h>.
Change-Id: I043c6686361bda9e85b82408511bf241a42b9229
2014-07-24 16:13:39 -07:00
Sreeram Ramachandran eec232603d Put back some deleted code.
http://ag/507249 removed a bunch of supposedly dead (unused) code. It turns out
at least ifc_disable() is being used in some protected partner branches. Put
back that as well as ifc_enable() to keep it symmetric.

Bug: 15413389
Change-Id: Ibec83a66e5d9079876ccf36d250b95b7c0294c03
2014-07-23 09:30:53 -07:00
Sreeram Ramachandran a723689eca Cleanup: Delete dead code.
Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
2014-07-22 15:00:21 -07:00
Hans Boehm b14f65cb50 Do not typedef char16_t if it is a keyword.
Don't define char16_t on platforms where char16_t is a keyword, as
C11 and C++11 define it to be.

(cherry picked from commit dfdbe61d28)
Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a
2014-07-18 17:53:02 -07:00
Hans Boehm dfdbe61d28 Do not typedef char16_t if it is a keyword.
Don't define char16_t on platforms where char16_t is a keyword, as
C11 and C++11 define it to be.

Change-Id: I6717bc2133c1363ecd85861f3869e1eabd2ce96a
2014-07-16 16:09:37 -07:00
Jungshik Jang cadd5bb70e Add force usage and config type for HDMI-CEC system audio mode.
New Usage Type: AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO
New Config Type: AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED
When HDMI-CEC system audio mode is enabled, AudioService will
call
 setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
          AUDIO_POLICY_FORCE_HDMI_SYSTEM_AUDIO_ENFORCED);
in order to notify enabled system audio mode, so that
audio policy manager chooses proper output.
When it turns into off, AudioService will call
 setForceUse(AUDIO_POLICY_FORCE_FOR_HDMI_SYSTEM_AUDIO,
          AUDIO_POLICY_FORCE_NONE);

Along with it, add new audio output devic type,
AUDIO_DEVICE_OUT_AUX_LINE, in order to distinguish
line out for headphone and aux output of av device.

Bug: 16305986
Bug: 16002150
Change-Id: Idecdf626737f6635ea3cda638c343260b1661c77
2014-07-16 09:21:04 +09:00
Ruben Brunk a5e65d86a2 Allow sticky transform to be set in ANativeWindow.
Bug: 15116722

- Adds methods to set the sticky transform field.

Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
2014-07-14 22:14:49 +00:00
Hans Boehm 5af7877950 Add comment to discourage use of cutils/atomic.h.
Change-Id: Ib05c745158fdf5a11fd4697c3665a6370ffc04f5
2014-07-11 18:30:13 -07:00
Glenn Kasten e60eb62384 Merge "Representation of channel masks for position assignment and index assignment" 2014-07-11 16:34:41 +00:00
Hans Boehm 4b9f899bf1 am e6b0c566: am 981dcd79: Merge "Add comment to discourage use of cutils/atomic.h."
* commit 'e6b0c566762dbea1c45198d15ecc5e8a59378d73':
  Add comment to discourage use of cutils/atomic.h.
2014-07-12 19:36:58 +00:00
Glenn Kasten 432b7c6da2 Representation of channel masks for position assignment and index assignment
Bug: 16245854
Change-Id: I76c7c39c7d4f8d5035016653aa91fa7c1e749bbd
2014-07-12 13:23:57 +00:00
aarti jadhav-gaikwad 923e740879 audio: add definitions for aac sub formats
add definitions for aac sub formats

Change-Id: I610caa510dfc7347f7c98e19359545423edd76b3
2014-07-11 18:26:00 +00:00
Jungshik Jang 6fe316102a Merge "Fix size of "values" fields of audio_gain_config." 2014-07-10 21:52:20 +00:00
Jungshik Jang f7e5aeadb7 Fix size of "values" fields of audio_gain_config.
It should be sizeof(audio_channel_mask_t) * 8 not
sizeof(audio_channel_mask_t) alone.

Change-Id: I3523dd4d44a0900ba1845b3675a22451f1fc2f3c
2014-07-11 03:37:42 +00:00
Jungshik Jang 2c7cfc10f5 Remove forced usage types for HDMI-CEC system audio mode.
Change-Id: Ice8aab76281aa62a42665d7c86df1041c7f64ab9
2014-07-11 03:36:28 +00:00
Terry Heo a916e260db Merge "audio: add definition for new audio loopback input device" 2014-07-02 19:52:36 +00:00
Terry Heo b63dd8a005 audio: add definition for new audio loopback input device
Bug: 15437484
Change-Id: I62da0596d405c3bb5e00b461f7d4fd11627ed391
2014-07-08 14:52:51 +00:00