summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera3Device: Support batch requests" into mnc-dr-devChien-Yu Chen2015-09-048-199/+387
|\
| * Camera3Device: Support batch requestsChien-Yu Chen2015-09-038-199/+387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor request threadLoop to three parts: waiting for next batch of requests, preparing HAL requests and output buffers for next batch of requests, and submitting the batch of requests to HAL. Set the batch size to the size of the request list if it's a video recording request in a high speed video configuration. Add a flush lock so that HAL's flush() won't be called while submitting a batch of requests. Bug: 23360060 Change-Id: Icd395b1f955a9b336eec6fa5aff6b17741ce08c7
* | CameraService: Treat TOP_SLEEPING same as TOP for priority.Eino-Ville Talvala2015-09-032-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When arbitrating between camera clients, treat processes in the TOP_SLEEPING state with the same high priority as processes in the TOP state. This resolves race conditions during lock screen handoffs between clients such as face unlock (a bound foreground process) and a secure camera app (the topmost activity, but transitioning from TOP_SLEEPING to TOP asynchronously from the activity lifecycle callbacks). Bug: 23731720 Change-Id: I92c3f8f561c7725627826c0ba3dc926e99af746c
* | am e6eeff25: am 4abb48c3: am 898e8575: am 72b0abdf: Merge "Zero out return ↵Robert Shih2015-09-031-1/+1
|\ \ | | | | | | | | | | | | | | | | | | values in audio binder calls" into lmp-mr1-dev * commit 'e6eeff25562cecb668110b446d6114098e27370d': Zero out return values in audio binder calls
| * \ am 4abb48c3: am 898e8575: am 72b0abdf: Merge "Zero out return values in ↵Robert Shih2015-09-031-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | audio binder calls" into lmp-mr1-dev * commit '4abb48c30cd7821f3397ccd7de8deb3eb645b385': Zero out return values in audio binder calls
| | * \ am 898e8575: am 72b0abdf: Merge "Zero out return values in audio binder ↵Robert Shih2015-09-031-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calls" into lmp-mr1-dev * commit '898e857594b738f88be4de5addc8ca296dfabd74': Zero out return values in audio binder calls
| | | * \ am 72b0abdf: Merge "Zero out return values in audio binder calls" into ↵Robert Shih2015-09-031-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '72b0abdf56c655aae3052f7f762f5e6d8168a154': Zero out return values in audio binder calls
| | | | * \ Merge "Zero out return values in audio binder calls" into lmp-mr1-devRobert Shih2015-09-031-1/+1
| | | | |\ \
| | | | | * | Zero out return values in audio binder callsRobert Shih2015-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More specifically when handling GET_OUTPUT_FOR_ATTR in IAudioPolicyService. This prevents leaking a uninitialized `output` across binder if getOutputForAttr were to encounter errors. Bug: 23756261 Change-Id: Ibff8a1249a4e8a3c89a33a540dda428b10d6ca82
* | | | | | | am f9156653: Merge "libstagefright: sanity check size before dereferencing ↵Wei Jia2015-09-031-8/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointer in Utils.cpp" into mnc-dev * commit 'f9156653832ddb8ad0888004cb555bcb4ce88269': libstagefright: sanity check size before dereferencing pointer in Utils.cpp
| * | | | | | Merge "libstagefright: sanity check size before dereferencing pointer in ↵Wei Jia2015-09-031-8/+28
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Utils.cpp" into mnc-dev
| | * | | | | | libstagefright: sanity check size before dereferencing pointer in Utils.cppWei Jia2015-09-011-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove some CHECK's. Bug: 23680780 Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
* | | | | | | | Merge "NuPlayerRenderer: avoid divison by zero when sample rate is 0." into ↵Wei Jia2015-09-031-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | | | | | NuPlayerRenderer: avoid divison by zero when sample rate is 0.Wei Jia2015-09-031-0/+5
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also close AudioSink when failing to set playback rate. Bug: 23624664 Change-Id: I5bf8bcca4a21c26fb52821db597d61f7f1273d5c
* | | | | | | | am 2ccf27d1: am ac774d53: am eda49b16: am 3f79dbfc: am d77786c6: am ↵Wonsik Kim2015-09-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6c650a9: am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding * commit '2ccf27d1e4b78abacdc04128555a9fcf7f86e86c': Ogg: avoid size_t overflow in base64 decoding
| * | | | | | | am ac774d53: am eda49b16: am 3f79dbfc: am d77786c6: am a6c650a9: am ↵Wonsik Kim2015-09-030-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decoding * commit 'ac774d53fff5a580b9fe41ac4a7c6bb96b5137ef': Ogg: avoid size_t overflow in base64 decoding
| | * | | | | | am eda49b16: am 3f79dbfc: am d77786c6: am a6c650a9: am 436b32d1: am ↵Wonsik Kim2015-09-031-5/+15
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2605273: Ogg: avoid size_t overflow in base64 decoding * commit 'eda49b160b0d730140f0ab48cf7a4013f2d97f30': Ogg: avoid size_t overflow in base64 decoding
| | | * | | | | am 3f79dbfc: am d77786c6: am a6c650a9: am 436b32d1: am d2605273: Ogg: avoid ↵Wonsik Kim2015-09-031-5/+15
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size_t overflow in base64 decoding * commit '3f79dbfcb1a62c28094b403ba954ab4543d709f7': Ogg: avoid size_t overflow in base64 decoding
| | | | * | | | am d77786c6: am a6c650a9: am 436b32d1: am d2605273: Ogg: avoid size_t ↵Wonsik Kim2015-09-031-5/+15
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow in base64 decoding * commit 'd77786c699c3f846b57b8a8ea00f20749f550960': Ogg: avoid size_t overflow in base64 decoding
| | | | | * | | am a6c650a9: am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 ↵Wonsik Kim2015-09-031-5/+15
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoding * commit 'a6c650a9e7927c7d640828cea66fc96e0bf762ce': Ogg: avoid size_t overflow in base64 decoding
| | | | | | * \ \ am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '436b32d1eb75cf20d09776549bd7f7a11fa569a1': Ogg: avoid size_t overflow in base64 decoding
| | | | | | | * \ \ am d2605273: Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd26052738f7b095b7e318c8dde7f32db0a48450c': Ogg: avoid size_t overflow in base64 decoding
| | | | | | | | * | | Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23707088 Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
* | | | | | | | | | | am bc9ab7cd: Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-devWonsik Kim2015-09-031-5/+15
|\| | | | | | | | | | | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bc9ab7cdb3475567af390c83c64157aa7f9e2f19': Ogg: avoid size_t overflow in base64 decoding
| * | | | | | | | | Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-devWonsik Kim2015-09-031-5/+15
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23707088 Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
* | | | | | | | | | Merge "nuplayer: let non-offload AudioSink to handle the reconnect when ↵Ronghua Wu2015-09-021-1/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there's video." into mnc-dr-dev
| * | | | | | | | | | nuplayer: let non-offload AudioSink to handle the reconnect when there's video.Ronghua Wu2015-09-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23707144 Change-Id: Ie0e2db8dc91a78f82fb935d165aa11abe73697a3
* | | | | | | | | | | am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before ↵Lajos Molnar2015-09-021-4/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first track" into mnc-dev * commit 'd35955dd6ccdb4aecdf8217f708b9f8015fc9957': stagefright: MPEG4Extractor: allow 'hdlr' box before first track
| * | | | | | | | | | Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" ↵Lajos Molnar2015-09-021-4/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| | * | | | | | | | | | stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-08-311-4/+3
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21725583 Change-Id: I799c1967759c7e49fb50281a1708188450caac77
* | | | | | | | | | | am fe751bea: Camera: Fix flashlight deadlockChien-Yu Chen2015-09-022-3/+5
|\| | | | | | | | | | | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fe751bea0d3eedd6e817aebf4e457425b82e7117': Camera: Fix flashlight deadlock
| * | | | | | | | | Camera: Fix flashlight deadlockChien-Yu Chen2015-09-012-3/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a dedicated mutex for torch UID map so it won't cause a deadlock after flashlight app gets killed while the torch is on. Bug: 23722318 Change-Id: I228377aa0412052d56b6b948361d9abaecbbc686
* | | | | | | | | Merge "Camera3Device: Don't hold mutex during HAL device close." into mnc-dr-devEino-Ville Talvala2015-08-301-6/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera3Device: Don't hold mutex during HAL device close.Eino-Ville Talvala2015-08-281-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HAL device shutdown will likely need to wait on various events and queues to drain, and holding the mutex will prevent, for example, error notifications from being processed. This can lead to deadlocks. Bug: 23501571 Change-Id: I873ac23ef30545adf533e7839445448573ab5048
* | | | | | | | | | am 389e7653: Merge "Fix for security vulnerability in media server" into mnc-devJeff Tinker2015-08-281-1/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | | | | | | | | | * commit '389e765394a950b9697bba49c1998f2029bd58b4': Fix for security vulnerability in media server
| * | | | | | | | Merge "Fix for security vulnerability in media server" into mnc-devJeff Tinker2015-08-281-1/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix for security vulnerability in media serverJeff Tinker2015-08-271-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 23540426 Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
* | | | | | | | | | am 909318b3: am dbf995ce: am 6b203f06: am 66b24004: am 0ea9e276: am ↵Andy Hung2015-08-280-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev * commit '909318b3c7e5d80c8a79f8a37200e797a287c061': libmedia: clear reply data for IEffect command
| * | | | | | | | | am dbf995ce: am 6b203f06: am 66b24004: am 0ea9e276: am 184ad88d: am ↵Andy Hung2015-08-280-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev * commit 'dbf995cecdbfcb74437cf2b6b123b10821371f82': libmedia: clear reply data for IEffect command
| | * | | | | | | | am 6b203f06: am 66b24004: am 0ea9e276: am 184ad88d: am fba72ab0: am ↵Andy Hung2015-08-281-2/+2
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev * commit '6b203f06b969ba92181dbf781544b40cc2c41b7c': libmedia: clear reply data for IEffect command
| | | * | | | | | | am 66b24004: am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge ↵Andy Hung2015-08-281-2/+2
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "libmedia: clear reply data for IEffect command" into klp-dev * commit '66b24004345ff8a688e8548409b0b7d5a8902232': libmedia: clear reply data for IEffect command
| | | | * | | | | | am 0ea9e276: am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear ↵Andy Hung2015-08-281-2/+2
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reply data for IEffect command" into klp-dev * commit '0ea9e2761a04c4f592d854dbde2749395735fe56': libmedia: clear reply data for IEffect command
| | | | | * | | | | am 184ad88d: am fba72ab0: am f394f121: Merge "libmedia: clear reply data for ↵Andy Hung2015-08-281-2/+2
| | | | | |\ \ \ \ \ | | | | | | | |/ / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IEffect command" into klp-dev * commit '184ad88ddd6bbdf01e131e8e5b75bef5be67b29b': libmedia: clear reply data for IEffect command
| | | | | | * | | | am fba72ab0: am f394f121: Merge "libmedia: clear reply data for IEffect ↵Andy Hung2015-08-281-2/+2
| | | | | | |\ \ \ \ | | | | | | | | |/ / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command" into klp-dev * commit 'fba72ab0fcf7298492dcd9e3045913435d30d3a9': libmedia: clear reply data for IEffect command
| | | | | | | * | | am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
| | | | | | | |\ \ \ | | | | | | | | | |/ | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'f394f12167fddbc755855d06b615509517c99f14': libmedia: clear reply data for IEffect command
| | | | | | | | * | Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
| | | | | | | | |\ \
| | | | | | | | | * | libmedia: clear reply data for IEffect commandAndy Hung2015-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23540907 Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
* | | | | | | | | | | am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is ↵Wei Jia2015-08-281-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still in shutdown process." into mnc-dev * commit '5d76e54d2f3b02b52be035e37681fde0caf15eaa': NuPlayer: do not create audio decoder if the player is still in shutdown process.
| * | | | | | | | | | Merge "NuPlayer: do not create audio decoder if the player is still in ↵Wei Jia2015-08-281-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shutdown process." into mnc-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 11:23:42 +0000