6775 Commits

Author SHA1 Message Date
Marco Nelissen
66dfcd465c When scanning a single file, take .nomedia into account
Make scanSingleFile behave the same way as scanMtpFile, by taking into
account whether there's a .nomedia file guarding the file being scanned.
Without this, downloaded (or otherwise explicitly scanned) images/video/music
will appear in Gallery and Music even if a .nomedia file is hiding them.

Change-Id: Ib9ad4bda1b9a942f79a37ccd8e6a54d57710f528
2013-02-27 16:53:47 -08:00
John Spurlock
aac753dcf8 DO NOT MERGE - Small documentation fix for AudioManager.java
Correct typo + copy-paste description issue.

Cherry-pick of CL Idce7cfeb7255d96aef91efc40d19f077dde3e9a5 from
master.

Change-Id: I1b6f378d58eafdd4a265672a12189273b41f72d6
2013-02-26 14:18:08 -05:00
Eino-Ville Talvala
788717ca59 Camera and MediaRecorder: Support AppOps
- Allow media processes to update AppOps state
- Pass package name to media services

Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
2013-02-25 09:27:42 -08:00
Kunter Gultekin
04c13dc26a am e72409fe: Adds vp8 profile and levels to MediaCodecInfo.
* commit 'e72409fe779f620382c5bd0b82f4a32ac91d9fe4':
  Adds vp8 profile and levels to MediaCodecInfo.
2013-02-20 09:39:08 -08:00
Kunter Gultekin
e72409fe77 Adds vp8 profile and levels to MediaCodecInfo.
In line with ongoing effort of adding vpx encoder to
stagefright (https://android-review.googlesource.com/50893)
we need to add profile and level values for VP8.

VP8 profiles and levels are defined in OMX IL 1.1.2
extension headers, which is also being added here
https://android-review.googlesource.com/51272

This alters the public API.

Change-Id: I2bbb91c0b8b522b90c3cdfadaba0d18134800408
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
related-to-bug: 8226783
2013-02-20 09:35:57 -08:00
Jeff Sharkey
2c87523084 am 81aaf87d: Merge "Open file:// Uris on client side of MediaPlayer."
* commit '81aaf87d097aae2f0a5f8bd7286f82a4d0658b77':
  Open file:// Uris on client side of MediaPlayer.
2013-02-19 15:15:44 -08:00
Jeff Sharkey
c058a380de Open file:// Uris on client side of MediaPlayer.
Bug: 7962739
Change-Id: I674b437593fa083eb66ff3ca57b898cf9bd4a3e9
2013-02-19 15:10:41 -08:00
Mathias Agopian
76f56dd598 am ceec31b7: Merge changes I5a218ca1,I853a76d9
* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split
2013-02-15 14:28:22 -08:00
Mathias Agopian
5280061794 Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
2013-02-15 12:47:40 -08:00
Mathias Agopian
163117bdad am bfcae359: Surface doens\'t have an identity anymore
# Via Mathias Agopian
* commit 'bfcae3595900b79401d635022bd6d30a5b5a6576':
  Surface doens't have an identity anymore
2013-02-14 19:58:50 -08:00
Kristian Monsen
1456758802 resolved conflicts for merge of 58a1ca66 to master-chromium
Change-Id: I06b61e6d7d52b584eae03a95220381475b8bff0e
2013-02-14 19:48:27 -08:00
Mathias Agopian
bfcae35959 Surface doens't have an identity anymore
Change-Id: Ic62c0f6ba9aae9b67335a2029a5de1caa3fc5b94
2013-02-14 15:39:04 -08:00
Mathias Agopian
3866f0d581 split Surface in two classes: SurfaceControl and Surface
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.

Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
2013-02-14 12:19:11 -08:00
Chris Craik
7c1a49f5f5 Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.

Conflicts:
	packages/SystemUI/res/values-sv/strings.xml

Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
2013-02-13 10:50:20 -08:00
Marco Nelissen
145716e7c1 am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '789e3fa052747feb72e8ffdc778d5bc19a718c06':
  Revert "use utf8_length() instead of local function, isValidUtf8()"
2013-02-12 11:16:17 -08:00
Marco Nelissen
9f03d4f921 Merge "Revert "use utf8_length() instead of local function, isValidUtf8()"" 2013-02-12 18:46:22 +00:00
Marco Nelissen
a0a73ed1e6 Revert "use utf8_length() instead of local function, isValidUtf8()"
This reverts commit 1a8b6c29aaa5a1591097daca0876808cc029cbda

Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni  check.

Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
2013-02-12 18:33:41 +00:00
Jean-Michel Trivi
679d5046f2 Add support for querying whether the music stream is active remotely
Bug 7485803

Change-Id: I554b44bd35b017fa4030a0d89779066c96594f2b
2013-02-11 10:15:47 -08:00
Eric Laurent
28ad7a8fe1 am 78c2d8b3: Merge "AudioRecord: allow front + back mic capture"
# Via Android (Google) Code Review (1) and Eric Laurent (1)
* commit '78c2d8b356029e191aec5e45de7d9bb0fca98c21':
  AudioRecord: allow front + back mic capture
2013-01-31 22:59:04 -08:00
Eric Laurent
78c2d8b356 Merge "AudioRecord: allow front + back mic capture" 2013-01-31 22:33:37 +00:00
Amith Yamasani
64a980725f am 6d2def71: am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (3) and others
* commit '6d2def71e0a7f6ed81b96444fb1cce7177251b36':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:40:36 -08:00
Amith Yamasani
6d2def71e0 am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (2) and others
* commit 'c28fde57f0c7762913615b16d651d4e7991d6175':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:33:55 -08:00
Amith Yamasani
c28fde57f0 am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Android Git Automerger (1) and others
* commit '0b515aece642283a25c6a4416f0aecdaf17bdb58':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:31:01 -08:00
Amith Yamasani
0b515aece6 am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"
# By Henrik Engström
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '3cfca67b0f1e3f464274fa5d3b2e31e5288d8f38':
  Fix possible integer overflow in MtpStorage
2013-01-28 10:28:38 -08:00
Eric Laurent
6809afe1c2 AudioRecord: allow front + back mic capture
Change-Id: Id75c9b420198092f5f5d255bd5512ec5a7a2c502
2013-01-17 17:43:35 -08:00
Dianne Hackborn
cd2216870b am a7110fd1: Merge "Fix build."
* commit 'a7110fd19aa1a2aaa1d84fdb038c02dec4ec9c50':
  Fix build.
2013-01-16 15:39:47 -08:00
Dianne Hackborn
9139625aae Fix build.
Change-Id: I068539623b3b133793fc9b8188d876eca59a8281
2013-01-16 15:34:35 -08:00
Dianne Hackborn
7ed6c6d83b am 35654b61: More work on App Ops service.
* commit '35654b61e8fe7bc85afcb076ddbb590d51c5865f':
  More work on App Ops service.
2013-01-16 12:14:53 -08:00
Dianne Hackborn
35654b61e8 More work on App Ops service.
Implemented reading and writing state to retain information
across boots, API to retrieve state from it, improved location
manager interaction to monitor both coarse and fine access
and only note operations when location data is being delivered
back to app (not when it is just registering to get the data at
some time in the future).

Also implement tracking of read/write ops on contacts and the
call log.  This involved tweaking the content provider protocol
to pass over the name of the calling package, and some
infrastructure in the ContentProvider transport to note incoming
calls with the app ops service.  The contacts provider and call
log provider turn this on for themselves.

This also implements some of the mechanics of being able to ignore
incoming provider calls...  all that is left are some new APIs for
the real content provider implementation to be involved with
providing the correct behavior for query() (return an empty
cursor with the right columns) and insert() (need to figure out
what URI to return).

Change-Id: I36ebbcd63dee58264a480f3d3786891ca7cbdb4c
2013-01-16 12:11:01 -08:00
Jean-Michel Trivi
7d6f2c945b am 26bf4d90: Merge "Optimize media button stack traversal for remote volume"
* commit '26bf4d9020dcb16327e91044cda78b3baef723b5':
  Optimize media button stack traversal for remote volume
2013-01-11 11:33:55 -08:00
Jean-Michel Trivi
26bf4d9020 Merge "Optimize media button stack traversal for remote volume" 2013-01-11 11:30:30 -08:00
Fabrice Di Meglio
c6a207c67b am 9003007d: Merge "Fix Volume icons for RTL languages"
* commit '9003007d35c6ae1cdeac4ca831a036292b7089e9':
  Fix Volume icons for RTL languages
2013-01-11 11:16:49 -08:00
Fabrice Di Meglio
9003007d35 Merge "Fix Volume icons for RTL languages" 2013-01-11 11:10:00 -08:00
Fabrice Di Meglio
8c02884c8c Fix Volume icons for RTL languages
- add mirrored version of the icons
- make VolumePanel respond to layout direction changes
- make AudioService propagate layout direction changes to the VolumePanel

Change-Id: Ibb884ab81641c319a9b7bea1381066f3f19581f0
2013-01-09 18:25:20 -08:00
Jason Noguchi
aefc63bb3d am ceea8857: am 68ba8b91: am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus e
* commit 'ceea88578ce53bdee96c561cd5fa5dae725f9a7b':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-09 11:59:12 -08:00
Jason Noguchi
ceb38fce56 am 9964fd37: am 8d73c043: am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '9964fd37a6d7f30ce96f854f8e67df192f4213be':
  Adding camera scene mode stress test.
2013-01-09 11:59:09 -08:00
Jason Noguchi
ceea88578c am 68ba8b91: am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the
* commit '68ba8b919f8659711b85d8c5bd8a5cb013f441bc':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-09 11:53:55 -08:00
Jason Noguchi
9964fd37a6 am 8d73c043: am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '8d73c043c8c4fe5af8963bbe5c29a47a3dff2677':
  Adding camera scene mode stress test.
2013-01-09 11:53:51 -08:00
Marco Nelissen
5a259ec2c6 am b102fb8e: Merge "Fix media scan NPE"
* commit 'b102fb8ed5acdfa5f47e60b7d9fef7b5d74bd9fd':
  Fix media scan NPE
2013-01-09 09:52:29 -08:00
Marco Nelissen
299942002b Fix media scan NPE
b/7966288

Change-Id: I066bc9f00bccf070332d87d6f1bf3d6054b31136
2013-01-09 09:46:54 -08:00
Henrik Engström
6393b07134 Fix possible integer overflow in MtpStorage
When converting the MB value MtpReserveSpace value to bytes there is a
possible integer overflow since 3 integer values are multiplied, even
though the result is stored in a long variable. This would be visible when
the value is more than 2 GB. This is solved by making the constants
longs instead of ints.

Change-Id: I799129f7076a6e331cece17b5c05aed210499648
2013-01-09 09:27:59 +01:00
Jason Noguchi
68ba8b919f am e71bb772: am f9719d11: am daf9b7d1: am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record durati
* commit 'e71bb7722b26ba2ada948ce3dbd626f14aabeb68':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-07 19:22:03 -08:00
Jason Noguchi
daf9b7d138 am 3f72bf32: Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev
* commit '3f72bf323f977b367ceaee5ace321098cb7b74f4':
  Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute.
2013-01-07 19:15:16 -08:00
Jason Noguchi
3f72bf323f Merge "Refactoring the media recorder stress test. Added test cases for: - record & playback @ 1080p - record & playback @ 720p - record & playback @ 480p - record & playback @ custom Plus extending the record duration to a full minute." into jb-mr1-dev 2013-01-07 19:12:11 -08:00
Jason Noguchi
8d73c043c8 am be6ff0b8: am 66480258: am ba5fd35e: am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit 'be6ff0b83659dffa0c7c290c520474eda70bee07':
  Adding camera scene mode stress test.
2013-01-07 18:48:46 -08:00
Jason Noguchi
ba5fd35e24 am 7b4e597f: Merge "Adding camera scene mode stress test." into jb-mr1-dev
* commit '7b4e597faff3c469bdd5e7837155a5fc5ea036bc':
  Adding camera scene mode stress test.
2013-01-07 18:43:18 -08:00
Jean-Michel Trivi
5df0e6ad26 Optimize media button stack traversal for remote volume
Iterate over entries in the media button stack from the top
 for remote volume-related operations as the stack entry being
 looked for is more likely at the top of the stack.

Change-Id: Iaa2685ebb297d2184dd2c63498d7bd2b811ce744
2013-01-07 12:07:06 -08:00
Jason Noguchi
ca6a5eee8f Refactoring the media recorder stress test.
Added test cases for:
- record & playback @ 1080p
- record & playback @ 720p
- record & playback @ 480p
- record & playback @ custom
Plus extending the record duration to a full minute.

Change-Id: I294714811606c1ae57907d6ef6a7052044b6247c
2013-01-03 12:27:48 -08:00
Jean-Michel Trivi
045ad18fa5 am e0c93e08: Merge "Use playback state to update remote control stack"
* commit 'e0c93e085ff79b0adedfb7c316c395b9e06581f9':
  Use playback state to update remote control stack
2013-01-03 11:17:37 -08:00
Jason Noguchi
bac8666893 Adding camera scene mode stress test.
Change-Id: I3f9afef4edc6ea1f659263bf2dbd8ca247039ce0
2013-01-02 20:28:34 -08:00