Chih-hung Hsieh
3169eaa60a
Merge "Fix compiler warnings." am: 8ef5c3d274
...
am: c6b02f7802
Change-Id: I100ebf1d7aecc903fd19a7cb871a34d149f35224
7 years ago
Chih-hung Hsieh
74277cb6f9
Merge "Fix format string warnings" am: b50a7dcded
...
am: b210ec3fea
Change-Id: Ie1b30a4c0397655ea574265a7fb3f78f21f5fe87
7 years ago
Chih-hung Hsieh
c6b02f7802
Merge "Fix compiler warnings."
...
am: 8ef5c3d274
Change-Id: I7fea2dbd584e7827286d3f17de33e96e8ff5faa4
7 years ago
Chih-hung Hsieh
b210ec3fea
Merge "Fix format string warnings"
...
am: b50a7dcded
Change-Id: I1d730ddbce865daca6160b2542b12a2b1f54daaa
7 years ago
Chih-hung Hsieh
8ef5c3d274
Merge "Fix compiler warnings."
7 years ago
Chih-hung Hsieh
b50a7dcded
Merge "Fix format string warnings"
7 years ago
Chih-Hung Hsieh
b0a0235b76
Fix compiler warnings.
...
* Comment out unused parameters.
* Remove unused local constants.
* Use both unsigned/signed values for EXPECT_EQ.
Bug: 66996870
Test: normal build.
Change-Id: Ia396e5ba1f57e547ac731bd7cdb3e6ff4290b52a
7 years ago
Chih-Hung Hsieh
a58ea94498
Fix format string warnings
...
MockCasPlugin.cpp: These are printing out `size_t`s, so we should be
using %zu.
ClearKeyFetcher.cpp: asset_.id() is an `unsigned long long`, so we
can't use PRIu64 for it.
Bug: None
Test: mma. Warnings are gone.
Merged-In: Ie34acb274696dea999f6309fb914b39ef00f4d77
(cherry picked from commit 843328ff13
)
Change-Id: I7be4fff7d3fd603b7ab64397a6a05c28f7a34ace
7 years ago
Pawin Vongmasa
0889cc7d3d
Prevent MediaPlayerService::Client's use-after-free am: 028cf0973f
am: 45ff66df1b
...
am: ede9ead9e7
Change-Id: Idcb724463c4cd8bf4afff78044986803d3417175
7 years ago
Pawin Vongmasa
ede9ead9e7
Prevent MediaPlayerService::Client's use-after-free am: 028cf0973f
...
am: 45ff66df1b
Change-Id: I59170b5482e31d81739dc4db9bf5622a08a0e9d9
7 years ago
Pawin Vongmasa
45ff66df1b
Prevent MediaPlayerService::Client's use-after-free
...
am: 028cf0973f
Change-Id: Ifb469a4173a8f650715ceb5fed174c0c4ce6c4ba
7 years ago
Pawin Vongmasa
028cf0973f
Prevent MediaPlayerService::Client's use-after-free
...
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Bug: 70546581
Merged-In: Ia142a7735c6685eb67b2c00917c0ed5ea7e0da9e
Change-Id: Ia142a7735c6685eb67b2c00917c0ed5ea7e0da9e
(cherry picked from commit d27ad6bae3
)
7 years ago
Jiyong Park
9d5b41ac3e
Merge "android.hardware.media.omx@1.0-service is not using libgui" am: aba76c0dbd
...
am: d6285f6bf4
Change-Id: Ide74203d4a844e06c6f1e7720b4a15e8f9363746
7 years ago
Marco Nelissen
d4fec5bea9
Merge "Remove old h264 decoder" am: 52b4df3292
...
am: dc0f545763
Change-Id: I4f3f2e54f2abcb38806adb0b2930dce8154fa90e
7 years ago
Jiyong Park
d6285f6bf4
Merge "android.hardware.media.omx@1.0-service is not using libgui"
...
am: aba76c0dbd
Change-Id: Ife6501f466171fe5b1e05effa0527210e1bdb3e5
7 years ago
Treehugger Robot
aba76c0dbd
Merge "android.hardware.media.omx@1.0-service is not using libgui"
7 years ago
Marco Nelissen
dc0f545763
Merge "Remove old h264 decoder"
...
am: 52b4df3292
Change-Id: I85f7d082f6168670108c158ebd00eac6e621ee4a
7 years ago
Treehugger Robot
52b4df3292
Merge "Remove old h264 decoder"
7 years ago
Marco Nelissen
fcb1bc90f9
Remove old h264 decoder
...
It hasn't been used in a long time.
Bug: 69351196
Test: build
Change-Id: Ib9b88c94deaa1019df1e5382f9e32c2aaff50bd3
Merged-In: Ib9b88c94deaa1019df1e5382f9e32c2aaff50bd3
7 years ago
Chih-hung Hsieh
d9ad45b8a5
Merge "Use -Werror in frameworks/av/services/mediaextractor" am: 5988a68bb3
...
am: 868705c87f
Change-Id: Id59c46831b4a3b33f979315d6a640a6852de8cd3
7 years ago
Chih-hung Hsieh
e0911cb26a
Merge "Fix warnings in frameworks/av/media/libeffects/factory" am: dfd91c514f
...
am: 63d03638a6
Change-Id: I4d488a06643d8a8fb30edc395ab1af58af899789
7 years ago
Chih-hung Hsieh
868705c87f
Merge "Use -Werror in frameworks/av/services/mediaextractor"
...
am: 5988a68bb3
Change-Id: Id47a3227c34017b8b1658d19bad99543455456e1
7 years ago
Chih-hung Hsieh
63d03638a6
Merge "Fix warnings in frameworks/av/media/libeffects/factory"
...
am: dfd91c514f
Change-Id: Ib8c8a708916990cd0909db1d512b0e97b6a55165
7 years ago
Chih-hung Hsieh
5988a68bb3
Merge "Use -Werror in frameworks/av/services/mediaextractor"
7 years ago
Chih-hung Hsieh
dfd91c514f
Merge "Fix warnings in frameworks/av/media/libeffects/factory"
7 years ago
Jerry Zhang
a733e09e7f
Merge "DO NOT MERGE : Always set sys.usb.ffs.mtp.ready during configure" into oc-mr1-dev
...
am: ada6dd9ae5
-s ours
Change-Id: I3735f1d471b82cc51d303953f7a799bf5ed65374
7 years ago
TreeHugger Robot
ada6dd9ae5
Merge "DO NOT MERGE : Always set sys.usb.ffs.mtp.ready during configure" into oc-mr1-dev
7 years ago
Yin-Chia Yeh
a75526626f
Merge "CameraService: Update camera and torch state lists also at runtime" am: 900596ac1e
...
am: 5eeb6b1e43
Change-Id: Ie7decb502cbe7b0e6ac0f4aa5d8b82615d32de34
7 years ago
Yin-Chia Yeh
5eeb6b1e43
Merge "CameraService: Update camera and torch state lists also at runtime"
...
am: 900596ac1e
Change-Id: I8f0eb4c24895ee42d65c1f6ce6863ff2b60a67fa
7 years ago
Yin-Chia Yeh
900596ac1e
Merge "CameraService: Update camera and torch state lists also at runtime"
7 years ago
Guennadi Liakhovetski
151e3be07d
CameraService: Update camera and torch state lists also at runtime
...
The Camera subsystem maintains lists of camera and torch states, that
are updated during Camera Provider enumeration. These lists have to
be updated at runtime when a camera is plugged in or unplugged too.
Reuse the same code for both cases.
Also fix a bogus PRESENT callback in stopCameraOps.
Change-Id: I9028a3b25d8d983441e89d52a354bed61e3f8976
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
7 years ago
Chih-Hung Hsieh
b1d5992c47
Fix warnings in frameworks/av/media/libeffects/factory
...
* Remove unused variables.
Bug: 66996870
Test: build with WITH_TIDY=1
Change-Id: Ifd522c4f34c164a591ae0a51aea1cb48455c8c22
7 years ago
Xin Li
3ede362624
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f325208b4d
-s ours
...
am: d47aaaf98d
Change-Id: I2bc8e3f0d3f0d0d9e0f6a85bfe8462b061dd28a5
7 years ago
Xin Li
d47aaaf98d
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
...
am: f325208b4d
-s ours
Change-Id: Ife6238e2aec9a053e68fe4af0064e5f850b23461
7 years ago
Xin Li
4049c79dcd
DO NOT MERGE: Merge Oreo MR1 into master am: 3b4a1d7e44
-s ours
...
am: 534ecbd327
Change-Id: Ia222f029fb804cb6d2bdd48f46063d9d0fca96f4
7 years ago
Dongwon Kang
88bbec25fc
Merge "DO NOT MERGE: Apply input buffer validation also to AVC and MPEG4 encoders" into lmp-mr1-dev am: fb41e97c01
-s ours am: df8c8eccea
-s ours am: 03e101cfda
-s ours am: 280f41971a
-s ours am: 8d78f41079
-s ours am: f394af84d6
-s ours am: 45ee853b29
-s ours am: ac1c3a1349
-s ours am: 1c38f4d0f4
-s ours am: 289a80ec4f
-s ours am: 97eb375c51
-s ours am: e4f5e4f946
-s ours
...
am: 094cdb131b
-s ours
Change-Id: I0bf0459bc824e8b2c91e815dbff649097f88e0af
7 years ago
Dongwon Kang
af747dc373
Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into mnc-dev am: ec99046603
am: 616b039f43
am: 57a9404439
am: 349264d82b
am: 4d65e3c2c0
am: 222b40ee7a
am: bd5d9a0171
am: 9e85bf3d6e
am: 22624512eb
am: 746cf013de
am: 4472284462
-s ours
...
am: 82c2700a1a
-s ours
Change-Id: I50fc7ec4d7f352b21ddaabbabc79556964a4ca9d
7 years ago
Dongwon Kang
094cdb131b
Merge "DO NOT MERGE: Apply input buffer validation also to AVC and MPEG4 encoders" into lmp-mr1-dev am: fb41e97c01
-s ours am: df8c8eccea
-s ours am: 03e101cfda
-s ours am: 280f41971a
-s ours am: 8d78f41079
-s ours am: f394af84d6
-s ours am: 45ee853b29
-s ours am: ac1c3a1349
-s ours am: 1c38f4d0f4
-s ours am: 289a80ec4f
-s ours am: 97eb375c51
-s ours
...
am: e4f5e4f946
-s ours
Change-Id: Ie1969595752b8789b5c5bf48e7b649be0eb6e7b4
7 years ago
Dongwon Kang
82c2700a1a
Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into mnc-dev am: ec99046603
am: 616b039f43
am: 57a9404439
am: 349264d82b
am: 4d65e3c2c0
am: 222b40ee7a
am: bd5d9a0171
am: 9e85bf3d6e
am: 22624512eb
am: 746cf013de
...
am: 4472284462
-s ours
Change-Id: I1f73c519ba650524ac8e970f064f38469ef3de3c
7 years ago
Dongwon Kang
e4f5e4f946
Merge "DO NOT MERGE: Apply input buffer validation also to AVC and MPEG4 encoders" into lmp-mr1-dev am: fb41e97c01
-s ours am: df8c8eccea
-s ours am: 03e101cfda
-s ours am: 280f41971a
-s ours am: 8d78f41079
-s ours am: f394af84d6
-s ours am: 45ee853b29
-s ours am: ac1c3a1349
-s ours am: 1c38f4d0f4
-s ours am: 289a80ec4f
-s ours
...
am: 97eb375c51
-s ours
Change-Id: Id81c8ce0a651603c30d64865cbfe96747679cc96
7 years ago
Dongwon Kang
4472284462
Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into mnc-dev am: ec99046603
am: 616b039f43
am: 57a9404439
am: 349264d82b
am: 4d65e3c2c0
am: 222b40ee7a
am: bd5d9a0171
am: 9e85bf3d6e
am: 22624512eb
...
am: 746cf013de
Change-Id: I7452b29c7bc79967b2364f2ab434672a0101de13
7 years ago
Dongwon Kang
97eb375c51
Merge "DO NOT MERGE: Apply input buffer validation also to AVC and MPEG4 encoders" into lmp-mr1-dev am: fb41e97c01
-s ours am: df8c8eccea
-s ours am: 03e101cfda
-s ours am: 280f41971a
-s ours am: 8d78f41079
-s ours am: f394af84d6
-s ours am: 45ee853b29
-s ours am: ac1c3a1349
-s ours am: 1c38f4d0f4
-s ours
...
am: 289a80ec4f
-s ours
Change-Id: I5d502db04a61bf3f5f756ff7cdc84310d97998c8
7 years ago
Dongwon Kang
746cf013de
Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into mnc-dev am: ec99046603
am: 616b039f43
am: 57a9404439
am: 349264d82b
am: 4d65e3c2c0
am: 222b40ee7a
am: bd5d9a0171
am: 9e85bf3d6e
...
am: 22624512eb
Change-Id: I4cf67a14d2b46daace8e4a75b71f942447041593
7 years ago
Dongwon Kang
289a80ec4f
Merge "DO NOT MERGE: Apply input buffer validation also to AVC and MPEG4 encoders" into lmp-mr1-dev am: fb41e97c01
-s ours am: df8c8eccea
-s ours am: 03e101cfda
-s ours am: 280f41971a
-s ours am: 8d78f41079
-s ours am: f394af84d6
-s ours am: 45ee853b29
-s ours am: ac1c3a1349
-s ours
...
am: 1c38f4d0f4
-s ours
Change-Id: I92495fc4f6a9a0adccc5edb42d847262cf198bb4
7 years ago
Dongwon Kang
22624512eb
Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into mnc-dev am: ec99046603
am: 616b039f43
am: 57a9404439
am: 349264d82b
am: 4d65e3c2c0
am: 222b40ee7a
am: bd5d9a0171
...
am: 9e85bf3d6e
Change-Id: Ibe7e84c330b861786f2f7d0e16c456301b5bee0f
7 years ago
Xin Li
534ecbd327
DO NOT MERGE: Merge Oreo MR1 into master
...
am: 3b4a1d7e44
-s ours
Change-Id: I91614998b06905e2b92019661a3cc941a0f8a5d8
7 years ago
Dongwon Kang
1c38f4d0f4
Merge "DO NOT MERGE: Apply input buffer validation also to AVC and MPEG4 encoders" into lmp-mr1-dev am: fb41e97c01
-s ours am: df8c8eccea
-s ours am: 03e101cfda
-s ours am: 280f41971a
-s ours am: 8d78f41079
-s ours am: f394af84d6
-s ours am: 45ee853b29
-s ours
...
am: ac1c3a1349
-s ours
Change-Id: I2beffa09ab5ca7354ea66830e12e8438a15f6bbd
7 years ago
Dongwon Kang
9e85bf3d6e
Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into mnc-dev am: ec99046603
am: 616b039f43
am: 57a9404439
am: 349264d82b
am: 4d65e3c2c0
am: 222b40ee7a
...
am: bd5d9a0171
Change-Id: I274c997b58851fe0ddd6a64b73f3fe9a5ac8752b
7 years ago
Dongwon Kang
ac1c3a1349
Merge "DO NOT MERGE: Apply input buffer validation also to AVC and MPEG4 encoders" into lmp-mr1-dev am: fb41e97c01
-s ours am: df8c8eccea
-s ours am: 03e101cfda
-s ours am: 280f41971a
-s ours am: 8d78f41079
-s ours am: f394af84d6
-s ours
...
am: 45ee853b29
-s ours
Change-Id: I86c4424e54251e006f7687529664849fdc867786
7 years ago
Dongwon Kang
bd5d9a0171
Merge "Apply input buffer validation also to AVC and MPEG4 encoders" into mnc-dev am: ec99046603
am: 616b039f43
am: 57a9404439
am: 349264d82b
am: 4d65e3c2c0
...
am: 222b40ee7a
Change-Id: I5809acd7d8c01120fc53abea98067538f1fc8f51
7 years ago