drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
209,676 Commits 1 Branch 0 Tags
Commit Graph

9902 Commits

Author SHA1 Message Date
Ronghua Wu
7c86f4df71 am cdd81636: am 29bac774: am 9090d3c3: am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 
* commit 'cdd81636e1938e7c9053648a13e6ccebd2ba9d2f':
  media: fix estimateFrameRatesFor to use correct ratio
 2015-07-29 02:12:38 +00:00
Ronghua Wu
4ef977c08f media: fix estimateFrameRatesFor to use correct ratio 
Bug: 22504214
Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
 2015-07-28 15:08:08 -07:00
Jean-Michel Trivi
78aedaf5f6 am dc9fcc3a: am 938e8e30: am 9f4b7a47: am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev 
* commit 'dc9fcc3a55e734b2aab1e4754db3b588e1fbfc80':
  MediaPlayer subtitle controller: use debug log instead of warning
 2015-07-24 04:07:18 +00:00
Jean-Michel Trivi
6045865d02 am 5be1cdea: am 2ea36877: am 09c4eaf7: am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev 
* commit '5be1cdea1c3ba40edc3e85d66e86370a56726d06':
  RingtoneManager: query results depend on caller permission
 2015-07-24 04:04:41 +00:00
Jae Seo
c109f2212b am e47e3b19: am 8d121cf3: am d8162e47: am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 
* commit 'e47e3b19021627e62f017c7b8fcca6d91a1fef18':
  TIF: Enable hardware acceleration on overlay
 2015-07-24 04:02:50 +00:00
Jean-Michel Trivi
cab361c9bb MediaPlayer subtitle controller: use debug log instead of warning 
Don't use warning log for debug message.

Bug 22698299

Change-Id: Ibe3526fffffc9a7bdcda83c02fd745325db1238b
 2015-07-23 23:03:45 +00:00
Jean-Michel Trivi
13ceb54a19 RingtoneManager: query results depend on caller permission 
When querying for ringtones, only look for ringtones on external
  storage when the caller has READ_EXTERNAL_STORAGE.
Document this behavior in the javadoc of the affected methods.

Bug 22545684

Change-Id: Iae9c9a4ccaf635da8af2ac289b6b4df1b16c5d11
 2015-07-22 15:48:06 -07:00
Jae Seo
345af96677 TIF: Enable hardware acceleration on overlay 
Bug: 18162541
Change-Id: If57fb26ae88ca6ef701f01cce0e5dfd9c6eb1f0e
 2015-07-22 12:34:17 -07:00
Todd Kennedy
a52d960bc4 am 09395e5e: am 8e0ab997: am 548871f2: am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 
* commit '09395e5e18d506432dbfdcb4b076af941c1170e1':
  Use RingtonePlayer to get ringtone title
 2015-07-21 19:04:09 +00:00
Todd Kennedy
f2805bcbe1 Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 2015-07-21 18:11:19 +00:00
Terry Heo
b5f8055788 am 26fae7e1: am 00869af8: am aaf67d95: am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev 
* commit '26fae7e181b20b471cddc6378fd75b73521d2893':
  TIF: Use copied track list for onTracksChanged() callback
 2015-07-21 01:00:09 +00:00
Todd Kennedy
68de157b78 Use RingtonePlayer to get ringtone title 
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.

Bug: 22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
 2015-07-20 17:24:15 -07:00
Terry Heo
e95af4ab8b Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev 2015-07-20 23:57:31 +00:00
Jeff Sharkey
c591b0c454 am 37a8e0e0: am f14e4435: am 0fa2a56c: am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit '37a8e0e0ae3b920a1b272eaa0fa24fc4c7340288':
  Better logging of MediaPlayer failure reason.
 2015-07-20 19:26:07 +00:00
Jeff Sharkey
4fa85b7cad Better logging of MediaPlayer failure reason. 
Otherwise exception details are dropped on the floor, making it
hard to debug.

Bug: 22525550
Change-Id: I6ab9eb8461a23b9d9b8a0ea6dd1ae8ee2495dd01
 2015-07-20 09:38:02 -07:00
Terry Heo
5a3ef42422 TIF: Use copied track list for onTracksChanged() callback 
In notifyTracksChanged(), the calling onTracksChanged() could be delayed.
To prevent race condition on tracks, we should use the copy of tracks.

Bug: 22436933
Change-Id: I0c595df9d06d5f7bda4a9f8c21a661f7aa7db71f
 2015-07-20 01:29:44 +00:00
Lajos Molnar
1b7808348e am 99dea349: am 1eb690c2: am 9628568a: am e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 
* commit '99dea349513e307081622f6d11c3b40ee3dcce82':
  MediaSync: fix flush handling and deadlock
 2015-07-17 14:17:06 +00:00
Lajos Molnar
e6b407b4be Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 2015-07-17 13:24:27 +00:00
Jae Seo
4d2fb09571 am 8e099647: am 7a93b5de: am 25cb2b99: am d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev 
* commit '8e0996476b9313c0dea81dedffb9cd7c7fa3252d':
  TIF: Avoid generating locale dependent input IDs
 2015-07-17 01:54:47 +00:00
Jae Seo
2ac1fd3c9d TIF: Avoid generating locale dependent input IDs 
Bug: 22519551
Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25
 2015-07-16 17:48:55 -07:00
Lajos Molnar
d08debcf42 MediaSync: fix flush handling and deadlock 
- clear pending video frames
- flush audio track
- reset clock
- restart audio track after flush
- don't hold lock during callback

Bug: 22234976
Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
 2015-07-16 17:09:20 -07:00
Eric Laurent
3cfd131c58 am e6392988: am a29bcca2: am c2db03b0: am bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev 
* commit 'e6392988f41dee7addc0077cdd3a16a5b19ade07':
  AudioManager: fix audio device callback list access
 2015-07-15 02:21:41 +00:00
Eric Laurent
bd874b8be7 Merge "AudioManager: fix audio device callback list access" into mnc-dev 2015-07-15 01:31:47 +00:00
Eric Laurent
1691f73de5 AudioManager: fix audio device callback list access 
Bug: 22470616.
Change-Id: Ic59e8499557395dabe789b5fec9cb7c86c13d10c
 2015-07-14 16:27:54 -07:00
Narayan Kamath
fc5e0ba625 am b9f170ff: am b4db7923: Merge "Delete some obsolete test code." 
* commit 'b9f170ff99a3ad25623bf20c77eb4f6173577c98':
  Delete some obsolete test code.
 2015-07-14 20:27:48 +00:00
Ronghua Wu
0e1fc6bd9d am 63488bc7: am 16567cf2: am 70250d35: am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 
* commit '63488bc788ac03adccc168f173337a51c0a86a6e':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
 2015-07-14 18:15:19 +00:00
Ronghua Wu
148c7c5c17 Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 2015-07-14 15:21:34 +00:00
Narayan Kamath
b9f170ff99 am b4db7923: Merge "Delete some obsolete test code." 
* commit 'b4db7923818393c5c839dba0d43bec36da98759c':
  Delete some obsolete test code.
 2015-07-14 11:05:07 +00:00
Narayan Kamath
85bdaae347 Delete some obsolete test code. 
- Get rid of obsolete annotations in MediaInserterTest.

- Drop support for @BrokenTest and @SideEffect. Nobody uses
  SideEffect and none of the tests that use this test runner
  (vm-tests-tf, essentially) use @BrokenTest.

Change-Id: Id73c4d4eda8031689f9263c85b563c29e635d446
 2015-07-09 18:23:53 +01:00
Kenny Guy
2dd56526a6 am f6db3a2f: am f25062d4: am 084a716d: am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev 
* commit 'f6db3a2f311f7f188b66e0b41b0fc6d1df49cba1':
  Mute correct user from device policy manager.
 2015-07-09 10:57:27 +00:00
Kenny Guy
7d170797ac Merge "Mute correct user from device policy manager." into mnc-dev 2015-07-09 10:06:25 +00:00
Jeff Sharkey
608114f966 am e232afca: am 95661575: am 612aac4e: am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit 'e232afca8240e3b8bbbd9696a210aed5b14b9b79':
  Generate stable MTP storage IDs.
 2015-07-08 22:44:19 +00:00
Jeff Sharkey
c66b90fecd Merge "Generate stable MTP storage IDs." into mnc-dev 2015-07-08 21:55:15 +00:00
Kenny Guy
70e0c58c22 Mute correct user from device policy manager. 
Add per user versions of mute methods so
device policy manager can mute the correct
user.
Just persist change if the calling user
isn't the current user.
Treat calls to audio manager coming from uid
1000 as if they were coming from current user
rather than user 0 so that the correct user's
user restriction is checked.

Bug: 21782066
Bug: 21778905
Change-Id: I51469b741096d8a2ffdc520eaf5b3fd754f2c819
 2015-07-08 19:33:13 +01:00
Eric Laurent
0cd064335c am 373a0b5c: am dfea212b: am 070df444: am c0344a80: Merge "audio: add definitions for devices connected over IP" into mnc-dev 
* commit '373a0b5c602c5826cc0ab6642446981ccb52883c':
  audio: add definitions for devices connected over IP
 2015-07-08 18:20:33 +00:00
Eric Laurent
c0344a80fd Merge "audio: add definitions for devices connected over IP" into mnc-dev 2015-07-08 17:24:23 +00:00
Chien-Yu Chen
32ade1ab7b am 1ae0a7d3: am dd21689b: am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 
* commit '1ae0a7d39bfe87d0857268070cbf0ff7fa666e37':
  ImageWriter: Exception when Surface is abandoned
 2015-07-08 01:37:52 +00:00
Dongwon Kang
d3b2dee0d5 am 476fa150: am 2cc782a6: am bcdae81a: am 7a64e976: Merge "MediaSessionManager: make the binder implementation static" into mnc-dev 
* commit '476fa150518684a9c8f2b954cb410a018eb13937':
  MediaSessionManager: make the binder implementation static
 2015-07-08 01:37:46 +00:00
Jeff Tinker
2405899eff am c1e0e38e: am 5ece42b9: am 105633d9: am 6826b25c: Merge "Report specific exception type on decrypt with invalid session" into mnc-dev 
* commit 'c1e0e38ea84cf850d25e0051a9792efc87ac5e3a':
  Report specific exception type on decrypt with invalid session
 2015-07-08 01:37:19 +00:00
Jeff Sharkey
5af1835d67 Generate stable MTP storage IDs. 
It ends up that MediaProvider is persisting MTP storage IDs in its
database, so we need to make sure we generate stable IDs over time,
otherwise we can end up looking into a black hole.

Bug: 22256092
Change-Id: I6a75c239aac1b71fd5f6df0df69b24971079a086
 2015-07-07 17:46:16 -07:00
Ronghua Wu
75c4824bf6 media: Implement getAchievableFrameRatesFor with measured frame rate. 
Bug: 20507129
Change-Id: I4751ea0f8d4f1173ace18d397b59e9cd6c70688f
 2015-07-07 16:01:53 -07:00
Chien-Yu Chen
69421363c6 Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev 2015-07-07 22:16:10 +00:00
Dongwon Kang
7a64e9769f Merge "MediaSessionManager: make the binder implementation static" into mnc-dev 2015-07-07 22:10:23 +00:00
Jeff Tinker
6826b25c22 Merge "Report specific exception type on decrypt with invalid session" into mnc-dev 2015-07-07 21:19:13 +00:00
Dongwon Kang
d2ed690187 MediaSessionManager: make the binder implementation static 
Removing references to application resources on unregistering so that they
can be GCed as ealry as possible.

Bug: https://code.google.com/p/android/issues/detail?id=161398
Change-Id: Icc083f4a58bb5e738aa662247dc83d021a9dc5c3
 2015-07-07 11:40:51 -07:00
Zhijun He
c52366fb8d am c16cd2ad: am 6c7dc58f: am 1f67e4c8: am 1f52fce6: Merge "ImageUtils: fix image copy issue" into mnc-dev 
* commit 'c16cd2ad66e2a94b300dfe9b81b68352375109d3':
  ImageUtils: fix image copy issue
 2015-07-07 01:58:29 +00:00
Chien-Yu Chen
e0ee63046a ImageWriter: Exception when Surface is abandoned 
Throw IllegalStateException when queueing or dequeueing an
image if the input surface is already abandoned by the consumer.

Also fix a crash when planes are not initialized when closing
ImageWriter.

Bug: 22279111
Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
 2015-07-06 18:26:28 -07:00
Jean-Michel Trivi
6c7e0d4b8f am a95ff42f: am fe1b7ad0: am 87d3d893: am 760b1409: Merge "Ringtone: add support for volume control and looping" into mnc-dev 
* commit 'a95ff42fbc03f448b08591cd13ef9781fef85c32':
  Ringtone: add support for volume control and looping
 2015-07-07 01:17:39 +00:00
Zhijun He
1f52fce6b9 Merge "ImageUtils: fix image copy issue" into mnc-dev 2015-07-07 01:07:17 +00:00
Jean-Michel Trivi
760b1409bc Merge "Ringtone: add support for volume control and looping" into mnc-dev 2015-07-06 23:07:26 +00:00