Commit Graph

6149 Commits

Author SHA1 Message Date
Jeff Tinker
1747ff12ca Minor comment and formatting cleanup
No functional changes

Change-Id: Ifb0969620f150947c533444664e3e0cd6a3d8004
2017-11-03 17:00:22 -07:00
TreeHugger Robot
f8a6f1da8f Merge "Add AudioRouting interface in MediaPlayer" 2017-11-03 19:54:39 +00:00
TreeHugger Robot
416a66cd6c Merge "Fix exception on MediaDrm invalid property access" 2017-11-03 07:52:50 +00:00
Jeff Tinker
eb13c764c6 Fix exception on MediaDrm invalid property access
Accessing an invalid MediaDrm property would result in
an IllegalStateException.  This change causes
IllegalArgumentException to be thrown instead, which
is more appropriate.

Test: android.media.cts.ClearKeySystemTest passes
  and it fails prior to this CL.

bug:68765217
Change-Id: I858575dc8fe643a88381da49b543c5cc0d266e02
2017-11-02 18:13:02 +00:00
jiabin
6e5a628ab6 Add AudioRouting interface in MediaPlayer
Bug: b/64038649
Test: Run cts in RoutingTest
      && switch output device when using MediaPlayer playing music/video

Change-Id: I48dcfd40c3a6ce01c818f6268cc86ed02b7eaa58
2017-11-01 09:53:17 -07:00
Chong Zhang
869d1234d6 ExifInterface: prefer metadata from image track
If the file has both image and video, prefer image info over
video info. App querying ExifInterface is most likely using
the bitmap path which picks the image first.

bug: 63633199

Test:
tested querying the rotation info in own test app.

Change-Id: I955b27c2ad699d4895e171053ea27b62e779db2b
2017-10-31 12:28:22 -07:00
Chong Zhang
4342f08fab heif: support heif image sequence and dual-function files
- Add a few methods to MediaMetadataRetriever to get still
  images and frames by index.

- Declare keys in MediaFormat related to heif still images.

bug: 63633199

test:
cts-tradefed run cts-dev --module CtsMediaTestCases --compatibility:module-arg CtsMediaTestCases:include-annotation:android.platform.test.annotations.RequiresDevice

Change-Id: I9556b27f7395a163aadd01e979930061878994d0
2017-10-30 19:59:43 +00:00
Jaesung Chung
ff50e248e5 Make media projection permission dialog configurable
This CL introduces the new config_mediaProjectPermissionDialogComponent
symbol to specify the dialog component of media project permission
dialog. With this CL, IoT devices will be able to use the other dialog
in the IoT system UI app instead of the default dialog in the system UI
app.

Bug: 65864256
Test: android.view.cts.SurfaceViewSyncTest
Change-Id: I0684372757a00ddf173fc16e4a29f1e181cc1e8f
2017-10-20 15:44:57 +09:00
TreeHugger Robot
2f072ad2a4 Merge "mididocs: clarify direction and add BLE-MIDI link" 2017-10-19 23:20:52 +00:00
Jerry Zhang
008585f7d5 Merge "Add storageId to moveObjects" am: 1f4f6d2a18 am: 18abf57e99 am: 59ff05a59f
am: 3b997d0773

Change-Id: I93d06954ceb4942e3efdbd9e5ce2ddb25dee8ab7
2017-10-19 18:48:11 +00:00
Jerry Zhang
3b997d0773 Merge "Add storageId to moveObjects" am: 1f4f6d2a18 am: 18abf57e99
am: 59ff05a59f

Change-Id: I024be0c75e20e58152dbe0c81e5548d70f06a925
2017-10-19 18:36:22 +00:00
Jerry Zhang
18abf57e99 Merge "Add storageId to moveObjects"
am: 1f4f6d2a18

Change-Id: Id4f53fc283850d8f93cde7e67581355dc50e595e
2017-10-19 18:11:49 +00:00
Jerry Zhang
1f4f6d2a18 Merge "Add storageId to moveObjects" 2017-10-19 17:55:34 +00:00
Tobias Thierer
301bf35e2d resolve merge conflicts of 5c9e47d28b to oc-mr1-dev-plus-aosp
Test: This merge conflict was automatically resolved by meld.
      The automatic resolution of the same merge conflict by meld
      from cherrypicking this CL into internal-master has passed
      Treehugger (and was already submitted).
Exempt-From-Owner-Approval: Resolving merge conflicts with no deltas
Change-Id: I61f15aeb79c1ad26cc7c51be2af59ecb7b672a7b
2017-10-19 15:33:17 +00:00
Tobias Thierer
07efe116b1 Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os"
am: 5f04db96b3

Change-Id: If85216d03022708787a7218e494434453d5548e3
2017-10-19 14:25:12 +00:00
Joachim Sauer
208f0970d5 Merge "Framework: Prefer android.system.Os over libcore.io.Libcore.os" 2017-10-19 11:48:58 +00:00
Tobias Thierer
6217e37d30 Framework: Prefer android.system.Os over libcore.io.Libcore.os
This is a pure refactoring with no a behavior change other than
that these calls now go through android.system.Os, which immediately
delegates to Libcore.os.

This is a first step towards separating framework (via
android.system.Os) vs. libcore (via Libcore.os) clients of these
low level APIs. Separating these is a prerequisite towards moving
the API parts of android.system into framework, and moving the
rest into a different package in libcore.

Test: Treehugger
Bug: 67901714

Change-Id: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
Merged-In: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
2017-10-18 14:53:57 +01:00
Tobias Thierer
96aac9b375 Framework: Prefer android.system.Os over libcore.io.Libcore.os
This is a pure refactoring with no a behavior change other than
that these calls now go through android.system.Os, which immediately
delegates to Libcore.os.

This is a first step towards separating framework (via
android.system.Os) vs. libcore (via Libcore.os) clients of these
low level APIs. Separating these is a prerequisite towards moving
the API parts of android.system into framework, and moving the
rest into a different package in libcore.

Test: Treehugger
Bug: 67901714

Change-Id: Ifd8349ec5416e5693f40dba48fdf2bef651b7d81
2017-10-18 10:35:22 +01:00
Jerry Zhang
def7b19300 Add storageId to moveObjects
When moving between different storages, the storageId
must be changed as well.

Bug: 67028892
Test: Move between storages with virtual sdcard.
Change-Id: Ie82aa8d53686bfffb7c26b46a49524a00f2f0214
2017-10-17 15:27:03 -07:00
TreeHugger Robot
4689dad9ba Merge "Remove libmedia and libstagefright dependency from extractors" 2017-10-17 22:11:52 +00:00
Hangyu Kuang
e76ee40093 Merge "recorder: Change the file read/write mode to be rw." 2017-10-13 18:11:19 +00:00
Dongwon Kang
70d2ba3c06 Remove libmedia and libstagefright dependency from extractors
- MediaSource, DataSource and MediaExtractor are moved to
  libmediaextractor so that they can be used by extractor
  implementations without depending on libmedia and libstagefright.
- XXXFactory classes has been added in order not to expose CreateXXX
  methods in libmediaextractor.
- avc_utils is moved to libstagefright_foundation since most of
  extractor implementations are relying on that.

Test: build
Bug: 65851881

Change-Id: Idba410c3dc0abbfb4d73c186d44b5069cdb5780f
2017-10-12 21:44:30 -07:00
Hangyu Kuang
404802c001 recorder: Change the file read/write mode to be rw.
Bug: 64608451
Test: Video Recording
Change-Id: Ie250726a7d482130e3357b8c99049280183558c5
2017-10-12 14:12:15 -07:00
Beverly Tai
1e26cacc71 Merge "Add alarm + media/other to NotifManager.Policy" 2017-10-12 13:20:51 +00:00
Phil Burk
9d30e11936 mididocs: clarify direction and add BLE-MIDI link
The explanation of input vs output was confusing.
Added link to apps in test procedure page.

Test: checked using Chrome browser
Change-Id: I363c32e3b43c9d4b91c07842b6101702b035870c
2017-10-10 11:21:37 -07:00
Shubang
15985cbafa Remove dispatchKeyEventToHdmi()
Bug: 62270867
Test: cts
Change-Id: I9aad52ee0c8605cc23ac3640d77d7d51d6a55991
2017-10-09 14:28:39 -07:00
Beverly
0421687f0c Add alarm + media/other to NotifManager.Policy
Alarm and media/system/other policies added to be able to toggle
filtering of alarm and media sounds for ZenMode/DND.

Bug: 63077372
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/ZenModeHelperTest.java
Change-Id: I256782af00ad736c1aebdb96f9400d66ebb64a15
2017-10-09 15:10:04 -04:00
Chong Zhang
7a5469865b Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev am: 106aeb324d
am: 0764ce28cf

Change-Id: I59a84542c4cfc2cb48627396642dd2d4bbdc2291
2017-10-06 05:39:50 +00:00
Chong Zhang
0764ce28cf Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev
am: 106aeb324d

Change-Id: I5d7bbd0a3fb5f291f79a2e9009319eb4e57848a4
2017-10-06 05:29:43 +00:00
TreeHugger Robot
106aeb324d Merge "Use rotation from MediaMetadataRetriever directly" into oc-mr1-dev 2017-10-06 05:20:14 +00:00
Chong Zhang
9af92dadc9 Use rotation from MediaMetadataRetriever directly
MediaMetadataRetriever now reports rotation in clockwise,
no longer need to translate.

bug: 67470228

Test: verified rotation using test app attached in bug
Change-Id: Ifebcf25ea302477818e2e03db1e55525db985e67
2017-10-05 15:13:54 -07:00
Eric Laurent
cc78a9b636 Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev am: 77ee4f2ff2
am: 8916db215f

Change-Id: Ie7fc5c28a0a6de7309f065a3b001bdd8190fa95e
2017-10-04 15:14:59 +00:00
Eric Laurent
8916db215f Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev
am: 77ee4f2ff2

Change-Id: Ib39341f455b82750ef357dbf41d8815fb303844d
2017-10-04 14:56:26 +00:00
Eric Laurent
77ee4f2ff2 Merge "Fix Cell broadcast sound in total silence" into oc-mr1-dev 2017-10-04 14:45:01 +00:00
Wonsik Kim
a9361e9115 Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b am: 4c2bbbf552 am: b7079d6381
am: ce29a4c77a

Change-Id: Ia99a5f14249a5f3cbcc6543533f5af128fe2ae85
2017-10-03 21:57:22 +00:00
Wonsik Kim
ce29a4c77a Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b am: 4c2bbbf552
am: b7079d6381

Change-Id: Ia0627f67855e56487818043b974953a33baf701f
2017-10-03 21:42:14 +00:00
Wonsik Kim
4c2bbbf552 Merge "fix AmrInputStream.read() hang"
am: 5b6a02eb8b

Change-Id: I7aff9043ec95d2f41e5d3301b01707f5dff4bef2
2017-10-03 21:18:10 +00:00
Treehugger Robot
5b6a02eb8b Merge "fix AmrInputStream.read() hang" 2017-10-03 20:37:36 +00:00
Kweku Adams
62b4224757 incidentd: Adding RankingHelper data to NotificationManager proto output.
BUG: 65750824
Test: flash on device and look at incident.proto output
Change-Id: I9323cc109d96715b2114aa405eda79ae4c109c14
2017-10-03 12:35:48 -07:00
Jerry Zhang
c8d44372e6 Merge "Add moveObject method to change object's path and parent." am: 33a200e572 am: 0f09ac317d am: f9696617bd
am: 3a13ab1fd3

Change-Id: I58a1ca9b3b5e63e73eb4db58ac3588f6bf9e3249
2017-10-03 00:44:23 +00:00
Wonsik Kim
e1b8b7bf0f fix AmrInputStream.read() hang
Test: AmrInputStream.read() no longer hangs
Change-Id: I5b3e1c7667891ce250e447c32213511077c5b5df
2017-10-02 17:44:02 -07:00
Jerry Zhang
3a13ab1fd3 Merge "Add moveObject method to change object's path and parent." am: 33a200e572 am: 0f09ac317d
am: f9696617bd

Change-Id: Ia6ba6d0cf89879914894d35a0dbf110d905966ac
2017-10-03 00:33:02 +00:00
Jerry Zhang
0f09ac317d Merge "Add moveObject method to change object's path and parent."
am: 33a200e572

Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d
2017-10-03 00:04:03 +00:00
TreeHugger Robot
72a23105c9 Merge "Reduce time consuming when a lot of audio port event happen continually." 2017-10-02 23:58:51 +00:00
Jerry Zhang
952558d4e5 Add moveObject method to change object's path and parent.
This is needed to implement the MTP MOVE_OBJECT operation.

Bug: 66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f
2017-10-02 11:48:38 -07:00
Marco Nelissen
e93e6c5ef1 Merge "AmrInputStream is not a public API" am: c3b1442d52 am: fa55320f5d am: 9bda8fddf2
am: 14d8ba7736

Change-Id: I869b0944ad119d9adc83ec21e15ae791294d7230
2017-09-29 20:32:10 +00:00
Marco Nelissen
14d8ba7736 Merge "AmrInputStream is not a public API" am: c3b1442d52 am: fa55320f5d
am: 9bda8fddf2

Change-Id: Ib6e7f401af259e422aee6ca7d18703f380ef08f6
2017-09-29 20:21:30 +00:00
Marco Nelissen
fa55320f5d Merge "AmrInputStream is not a public API"
am: c3b1442d52

Change-Id: Iee0e6dfa9907dc70fcf5dae7fcbcf14b8bcb9ffb
2017-09-29 20:04:54 +00:00
Marco Nelissen
323d2a56ec AmrInputStream is not a public API
and nobody should be using it. Add some warnings to that effect.

Change-Id: I8029ccd665fd147b4708a68f61c6aa055004a5c1
2017-09-29 10:15:34 -07:00
Sungsoo Lim
f143ca9f16 Merge "Make RoutInfo.select() called in app's main thread" into oc-mr1-dev am: 6e326268c1
am: aee660bb47

Change-Id: Idc830072c057861c9c6498d190a5b4aafaa3f1cb
2017-09-29 09:22:28 +00:00