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

9920 Commits

Author SHA1 Message Date
Glenn Kasten
30981ed54f am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev 
* commit '37f559be42ef7a765c671cc0852289a9d7e047cc':
  Improve getTimestamp documentation
 2015-07-31 18:10:39 +00:00
Glenn Kasten
37f559be42 Merge "Improve getTimestamp documentation" into mnc-dev 2015-07-31 18:04:16 +00:00
Dianne Hackborn
f2269f0454 Change MNC codename to just M. 
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
 2015-07-31 17:19:03 +00:00
Dianne Hackborn
c1836bb0f1 Merge "Change MNC codename to just M." into mnc-dev 2015-07-31 17:11:58 +00:00
Ronghua Wu
db29b8943d am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev 
* commit 'e8b7febd62f899ed8920cbd484e18dea64b3a7ee':
  media: use blocks number to find closest size
 2015-07-31 02:40:30 +00:00
Ronghua Wu
e8b7febd62 Merge "media: use blocks number to find closest size" into mnc-dev 2015-07-31 02:32:53 +00:00
Phil Burk
1742d9261d am 2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 
* commit '2f1a08e601f4fa24e589fc61ea38f80eb264a8f4':
  MIDI docs BTLE: how to open BTLE MIDI devices
 2015-07-30 21:41:33 +00:00
Phil Burk
f661537640 am fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 
* commit 'fdcd82164f95699c36e044f90a12b9aa1c4f662f':
  MIDI package doc: add hasSystemFeature() call
 2015-07-30 21:41:26 +00:00
Phil Burk
0f1014aee1 am 559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev 
* commit '559a2420d396ef7a7c7bcab012bef379ad864bff':
  MidiDevice: document that opens can return nulls
 2015-07-30 21:41:19 +00:00
Phil Burk
2f1a08e601 Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev 2015-07-30 21:27:47 +00:00
Phil Burk
fdcd82164f Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev 2015-07-30 21:27:25 +00:00
Phil Burk
559a2420d3 Merge "MidiDevice: document that opens can return nulls" into mnc-dev 2015-07-30 21:26:48 +00:00
Ronghua Wu
e595268e98 media: use blocks number to find closest size 
Bug: 22504214
Change-Id: I056e19ac5fdbdff2c5d297b600210c07ae5ed4f4
 2015-07-30 13:01:20 -07:00
Glenn Kasten
00908b6c69 Improve getTimestamp documentation 
Bug: 18977548
Change-Id: Ia3c2620b27a173ed1a15268ca43c28e6f4e31965
 2015-07-30 10:07:34 -07:00
Phil Burk
3cc1bdbc6e MIDI docs BTLE: how to open BTLE MIDI devices 
Adds crucial information including required permissions,
MIDI UUID, and call to openBluetoothDevice().

Bug: 22606182
Change-Id: I47393bd0ecc2601906f6e50075d694c9cc17c993
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-29 16:47:12 -07:00
Dianne Hackborn
0e3de6caca Change MNC codename to just M. 
Change-Id: I4281d200ff6560791c47cf9073ceea1cb509361e
 2015-07-29 15:20:21 -07:00
Phil Burk
44d535aaf2 MIDI package doc: add hasSystemFeature() call 
Bug: 22800792
Change-Id: Ib4b3e16e8167191505c31522bbccd521a9807528
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-29 14:00:09 -07:00
Phil Burk
645a0b2bfe MidiDevice: document that opens can return nulls 
Bug: 22800792
Change-Id: I8d7ca1976e9a8abbabc011d3b2391ad7fe646f83
Signed-off-by: Phil Burk <philburk@google.com>
 2015-07-29 13:39:01 -07:00
Ronghua Wu
da0b2ce39c am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev 
* commit '02022b70bef7d6964bc8043385531d1aa97fb15b':
  media: fix estimateFrameRatesFor to use correct ratio
 2015-07-29 01:02:01 +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
e14a2f3355 am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev 
* commit '7b9968538b122225bb321de9995a8f55d3de4455':
  MediaPlayer subtitle controller: use debug log instead of warning
 2015-07-24 01:02:48 +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
9e4253f144 am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev 
* commit '7f9e9012f4bbcdd880e16212be9d90b50607c74d':
  RingtoneManager: query results depend on caller permission
 2015-07-23 18:59:54 +00:00
Jae Seo
ffdc6a5018 am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev 
* commit 'eec3d9e368328d6ca6942ae2fbd94711ecd7adc8':
  TIF: Enable hardware acceleration on overlay
 2015-07-23 18:58:16 +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
5ec1e24469 am f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 
* commit 'f2805bcbe1c99ce806448a2d8c0f12b142c7cece':
  Use RingtonePlayer to get ringtone title
 2015-07-21 18:22:26 +00:00
Todd Kennedy
f2805bcbe1 Merge "Use RingtonePlayer to get ringtone title" into mnc-dev 2015-07-21 18:11:19 +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
81c68d7e50 am e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev 
* commit 'e95af4ab8bda68ee80bf4d444356e0c1afb1fe99':
  TIF: Use copied track list for onTracksChanged() callback
 2015-07-21 00:08:05 +00: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
461031f622 am 71780e79: Merge "Better logging of MediaPlayer failure reason." into mnc-dev 
* commit '71780e79846d0ccc2aef2214041657410a8a14c2':
  Better logging of MediaPlayer failure reason.
 2015-07-20 18:04:12 +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
90f2b9daa3 am e6b407b4: Merge "MediaSync: fix flush handling and deadlock" into mnc-dev 
* commit 'e6b407b4be0b9c8240d34259b14e324da4d6832b':
  MediaSync: fix flush handling and deadlock
 2015-07-17 13:36:10 +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
9cd77be151 am d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev 
* commit 'd19ed4c16d0c11bb68dd3a7aab0fb1845814dac8':
  TIF: Avoid generating locale dependent input IDs
 2015-07-17 01:10:43 +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
336fde349e am bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev 
* commit 'bd874b8be717110148e2b284f35d166b11c1fe7d':
  AudioManager: fix audio device callback list access
 2015-07-15 01:43:10 +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
74b04315c4 am b9f170ff: am b4db7923: Merge "Delete some obsolete test code." 
* commit 'b9f170ff99a3ad25623bf20c77eb4f6173577c98':
  Delete some obsolete test code.
 2015-07-14 22:53:14 +00:00
Ronghua Wu
8609263113 am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev 
* commit '148c7c5c1794a9e306660f22c7cbbbc9906e5f5e':
  media: Implement getAchievableFrameRatesFor with measured frame rate.
 2015-07-14 15:33:31 +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
937fc8d4dc am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev 
* commit '7d170797ac844124b013b77cc220ccf115db12b7':
  Mute correct user from device policy manager.
 2015-07-09 10:18:05 +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
51c94eeedd am c66b90fe: Merge "Generate stable MTP storage IDs." into mnc-dev 
* commit 'c66b90fecd06691535157e6b00088de61b51dc41':
  Generate stable MTP storage IDs.
 2015-07-08 22:01:22 +00:00