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

12320 Commits

Author SHA1 Message Date
Wonsik Kim
7558ef1b2d Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev 
am: 52700a9795

Change-Id: I1691d29774c95fc87c1230ec85fbcf78838e6e42
 2017-08-31 03:13:34 +00:00
Wonsik Kim
e8b4c97bdf At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread 
Fixes: 65210445
Fixes: 64915666
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Change-Id: I73f1cebdd4b990e28f8d466f129e781cba2b5bbf
 2017-08-31 00:28:36 +00:00
Chong Zhang
3985765a17 Merge "Add heif format to ExifInterface" into oc-mr1-dev 
am: e034a1f5ed

Change-Id: I36fb2559b52bb778acff72954012704da8a85ff9
 2017-08-30 23:40:46 +00:00
TreeHugger Robot
e034a1f5ed Merge "Add heif format to ExifInterface" into oc-mr1-dev 2017-08-30 23:05:12 +00:00
Chong Zhang
6f80587e8b Add heif format to ExifInterface 
Get heif dimension and rotation from MediaMetadataRetriever.

Bug: 64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e
 2017-08-30 11:33:07 -07:00
Jean-Michel Trivi
60e09929e7 Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev 
am: 8da5c64628

Change-Id: I9df4f18b59ed2d8434c66754820304bd9082f9e9
 2017-08-29 22:43:19 +00:00
Jean-Michel Trivi
3120059d5b AudioService: log changes in OP_PLAY_AUDIO 
Log changes to AppOpsManager.OP_PLAY_AUDIO in live player

Test: "adb shell dumpsys audio" after entering silence mode
Bug: 62258749
Bug: 64286665
Change-Id: Ia1c202c5b8b25e14f7c2e85060a256dc69433909
 2017-08-29 11:39:56 -07:00
Jean-Michel Trivi
0453f8189c Merge "AudioService: log volume commands and origin" into oc-mr1-dev 
am: c3fcd65e61

Change-Id: I8cd88be04af0aea7bde9b10bc82b839613898eb4
 2017-08-29 16:43:44 +00:00
Jean-Michel Trivi
cf17036a21 AudioService: log volume commands and origin 
Add volume logger for volume events.
Move AudioService event definitions to separate file.

Test: change volume with volume buttons and dumpsys audio
Bug: 64470715

Change-Id: I25db849bffb4a41a737d226cfc40e2c6f7e0ecc0
 2017-08-28 16:26:52 -07:00
bokyung.kim
54238c6a10 Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c 
am: 1190da1b1e

Change-Id: I0eb5f50a6ac95d5512fbae9888b37a3c64917902
 2017-08-28 22:47:34 +00:00
bokyung.kim
148414cd2c Merge "Fixed mimetype error of PPT file" 
am: 3c28e2b280

Change-Id: I24b9dcf6506c53e26b901f74442f64bb28198611
 2017-08-28 22:27:38 +00:00
bokyung.kim
9806330b52 Fixed mimetype error of PPT file 
Change mimetype of PPT file to match MS specification.
(MimeUtils.java matched the MS specification)

Test: Check mimetype of DB after saving PPT file.

Change-Id: Ie559499ae39bc527fcc656ba37f28845af209e6c
Signed-off-by: bokyung.kim <bokyung.kim@lge.com>
 2017-08-28 13:16:35 -07:00
Ajay Panicker
8fdd245b7e Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev 
am: 619503b279

Change-Id: Id148586a545c653dc57768533da9a066c1e7a662
 2017-08-28 19:34:07 +00:00
TreeHugger Robot
619503b279 Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev 2017-08-28 19:26:41 +00:00
Jean-Michel Trivi
3be893e449 Merge "AudioManager: permission annotations" into oc-mr1-dev 
am: 72cf1a4fa2

Change-Id: I27394a0801a9d5d31d4ac18b3b773268b6d2fa10
 2017-08-28 16:38:41 +00:00
Jean-Michel Trivi
26ae15f487 AudioManager: permission annotations 
Add permission annotations on audio focus @SystemApi methods.
Ignore REQUIRE_PERMISSION error (125) for:
 - deprecated abandonAudioFocus() method: the check is on the
    request call
 - isHdmiSystemAudioSupported() method, it's not clear if it's
    being used.

Test: remove "-hide 125" in Android.mk and make, verify no errors\
    on AudioManager.java
Bug: 62343127

Change-Id: I62526db0c6dabcc34224c589506d611519de6abc
 2017-08-25 19:20:49 -07:00
Jerry Zhang
45629ed195 Merge changes from topic "mtp-user" into oc-mr1-dev 
am: 4de4655f0d

Change-Id: I82355f09a7ec31870affc089887254472ae590be
 2017-08-24 22:33:13 +00:00
Jerry Zhang
4de4655f0d Merge changes from topic "mtp-user" into oc-mr1-dev 
* changes:
  Add additional context to MtpDatabase
  Reset functions to null when user changes.
 2017-08-24 22:13:40 +00:00
Jean-Michel Trivi
87dfc5bb4e Merge "Audio event logging" into oc-mr1-dev 
am: 9961d6968e

Change-Id: I574558660e57b56a1f38b878fac8f25c84051cd7
 2017-08-24 19:21:44 +00:00
TreeHugger Robot
9961d6968e Merge "Audio event logging" into oc-mr1-dev 2017-08-24 19:04:47 +00:00
Ajay Panicker
6edb68bea6 Add equal overloads to some MediaDescription and MediaQueue objects (2/3) 
Bug: 64686424
Test: Connect to carkit and see that NowPlayingChanged only gets sent when
      the queue changes, run cts test
Change-Id: I58c9dd0bf976485a2efefd042cd667ee433e07e1
 2017-08-24 17:37:38 +00:00
Jean-Michel Trivi
011f39e7c7 Audio event logging 
New class AudioEventLogger to store a configurable number of the
  last audio events. It hosts a circular buffer of lightweight
  event objects, an abstract class whose implementations are
  event-specific, and does the heavier string manipulations
  at the time of the dump, not during normal operation.
Add logging for:
  - phone state (a.k.a. audio mode) changes
  - wired device connections
  - playback activity monitor
  - force use

Test: adb shell dumpsys audio
Bug: 64470715
Change-Id: I8dbd936e2ffec39134f1a8837191c74f5cb9fc56
 2017-08-24 09:05:20 -07:00
Jerry Zhang
5f0139d2e8 Add additional context to MtpDatabase 
MtpService has been changed to a singleton service
running in user 0, so the original context will
be that of user 0. Accesses to MediaProvider and
MediaScanner should use the new passed in user context
in order to access user data, while the broadcast
receiver for battery data will use the original context.

Bug: 64822515
Test: Use Mtp and switch users.
Change-Id: Ic181258337944db7dc6f6097c967cb104df938d3
 2017-08-23 11:10:51 -07:00
Yin-Chia Yeh
e85bbc5751 Merge "Image: fix typo" into oc-mr1-dev 
am: ad3a36b13b

Change-Id: I701cdbd6f46e88e5d0c95073a2d86a65a73c2258
 2017-08-23 01:29:29 +00:00
TreeHugger Robot
ad3a36b13b Merge "Image: fix typo" into oc-mr1-dev 2017-08-23 00:20:12 +00:00
Yin-Chia Yeh
43edf1e51d Image: fix typo 
Test: none (doc only fix)
Bug: 64648913
Change-Id: I98aa7ac1588e52e8dae0cbbda806159f378110ca
 2017-08-21 15:33:38 -07:00
Chong Zhang
3c453a4c42 Merge "heif: add new file and mime types to MediaScanner -- DO NOT MERGE" into oc-mr1-dev 
am: 1ec1ab6803

Change-Id: Iec7567b12486593631a1cb48523d1fa19382af80
 2017-08-21 05:44:38 +00:00
Chong Zhang
6e18ccee2a heif: add new file and mime types to MediaScanner -- DO NOT MERGE 
bug: 64077740
Change-Id: I6d36c2394a5ae527026c98c83786009e70b20958
 2017-08-19 00:05:06 +00:00
Lajos Molnar
1bce851e8b Merge "media: handle AVC constrained profiles" into oc-mr1-dev 
am: 794a8f9dc7

Change-Id: Iaeb27b9c5c1342e58b0feb93a29728f3ff1e3e5e
 2017-08-15 06:07:00 +00:00
Lajos Molnar
0aeb1875e4 media: handle AVC constrained profiles 
Bug: 64691727
Change-Id: I71b21c0951babccc9b4521bd5c26d35a6d62b426
 2017-08-14 15:19:52 -07:00
Jeff Sharkey
ad75c81598 Merge "Someone is still using these APIs." into oc-mr1-dev 
am: 9bb002ef79

Change-Id: I6197e014334790960e4060311d7b0e015438c953
 2017-08-12 19:55:45 +00:00
Jeff Sharkey
50421b58e5 Someone is still using these APIs. 
Which is totally lame.

Change-Id: Iaabfc1f5ac69ed99e714e89344bde116c340c376
 2017-08-12 18:23:48 +00:00
Jeff Sharkey
b2a9f55488 Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev 
am: c2e09129e0

Change-Id: I26089a2aef16845f2e2935e95810457e287bd0e1
 2017-08-12 03:25:49 +00:00
Jeff Sharkey
c2e09129e0 Merge "Remove a bunch of deprecated @SystemApi." into oc-mr1-dev 2017-08-12 03:21:01 +00:00
Cindy Kuang
b39042790c Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 
am: f125024688

Change-Id: If510d503dc91c2bfd6a7a282dbf7210cbc7f2698
 2017-08-11 21:42:58 +00:00
Cindy Kuang
c5f6633fdc Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 am: e4f02db258 
am: 51bc4b6c32

Change-Id: I2f04732899a58b64ffb820d62a53a70c1b723f8c
 2017-08-11 21:33:43 +00:00
Cindy Kuang
51bc4b6c32 Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am: dc12cb1fb2 
am: e4f02db258

Change-Id: I14c80bbd8838b6af2010463e9d1fb25cf537a167
 2017-08-11 21:20:11 +00:00
Cindy Kuang
f125024688 Merge "docs: corrected grammar mistake in Class Overview" into oc-dev 
am: dc12cb1fb2

Change-Id: I297557eb072b1fce0395c93c2a770623b5ba1642
 2017-08-11 21:14:33 +00:00
Steven Moreland
e04a0bf5c7 Merge "ScopedUtfChars: use proper nativehelper headers" 
am: 75c9e4d594

Change-Id: I170b5846981683eacee1081587c7149bab454d91
 2017-08-11 21:07:06 +00:00
Cindy Kuang
e4f02db258 Merge "docs: corrected grammar mistake in Class Overview" into oc-dev 
am: dc12cb1fb2

Change-Id: Ida5507009926a936ee247c2f43f44b439351d937
 2017-08-11 21:06:56 +00:00
Jeff Sharkey
8478911f5e Remove a bunch of deprecated @SystemApi. 
Verified that nobody should be using these APIs, and they've been
deprecated long enough that we can remove them.

Bug: 62341924, 62263907, 62264550
Test: make -j32 update-api && make
Change-Id: I9a2333ca13e4984b71374aa7ffed081e5106c67e
 2017-08-11 14:45:47 -06:00
Steven Moreland
c195af9d0c ScopedUtfChars: use proper nativehelper headers 
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using ScopedUtfChars find headers
Bug: 63762847
Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
 2017-08-10 18:08:37 -07:00
Steven Moreland
350b0ed191 Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp 
am: 1e8d712b78

Change-Id: I52b50aec4319183bebacaf7fb03e51dd6b51157a
 2017-08-11 00:50:50 +00:00
Steven Moreland
65e2ca2808 ScopedUtfChars: use proper nativehelper headers 
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.

Test: modules using ScopedUtfChars find headers
Bug: 63762847
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
 2017-08-10 23:00:10 +00:00
Shubang
5f68027506 Merge "Add permission check before setMain()" into oc-mr1-dev 
am: 67744e4696

Change-Id: I26ef67a44b8c041900958bd7a33097c6052c073a
 2017-08-10 06:47:35 +00:00
TreeHugger Robot
67744e4696 Merge "Add permission check before setMain()" into oc-mr1-dev 2017-08-10 06:39:31 +00:00
Paul Mclean
c75fe4f988 Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am: 75384f617d 
am: bca04acac5

Change-Id: I5525317d5a0a13c2f5d5291c552b76c293d0bdb2
 2017-08-09 22:23:42 +00:00
Paul Mclean
bca04acac5 Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev 
am: 75384f617d

Change-Id: I693a3cf37c55085eee470091edf5fff0bc62ece8
 2017-08-09 22:13:48 +00:00
Paul Mclean
241100cb87 Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev 
am: 75384f617d

Change-Id: I3a77ec0fe45d48715b11c27db9c1a6c2d7590c7f
 2017-08-09 22:13:37 +00:00
Cindy Kuang
2e98cc555e docs: corrected grammar mistake in Class Overview 
Test: make ds-docs

Bug: 17533073
Change-Id: Iaf22ad26794e2aac454a736efc746bca6f48eb82
 2017-08-09 14:49:19 -07:00