Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,654 Commits 3 Branches 0 Tags
674bedee2ec388201b0482946bd5535c419c8f21
Commit Graph

4841 Commits

Author SHA1 Message Date
Eric Laurent
bdf90a2d1c Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev 
am: dc7ce84095

* commit 'dc7ce840950398518cc116924b173eb7b7f3288a':
  AudioManager: fix isBluetoothA2dpOn()

Change-Id: I7a655431e766701b2f02c468aae163554e47ecdb
 2016-04-21 18:26:21 +00:00
Eric Laurent
dc7ce84095 Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev 2016-04-21 18:22:59 +00:00
Eric Laurent
9656df2b2e AudioManager: fix isBluetoothA2dpOn() 
Test all A2DP type variants when checking if an A2DP device is connected
in isBluetoothA2dpOn().

Bug: 28286051
Change-Id: I756d632b12d584d8a27cc1890e758d8accff7120
 2016-04-20 16:42:28 -07:00
Phil Burk
10f1740c1c Merge "MidiDevice: do not open ports on closed device" into nyc-dev 
am: 2faac0d

* commit '2faac0d74169ddc1f54f9cd356dc23b96a74c9eb':
  MidiDevice: do not open ports on closed device

Change-Id: I6f98e504d682a5902dd29f5fa54023e7a8bc9814
 2016-04-20 21:52:33 +00:00
Phil Burk
01ab4d62d9 MidiDevice: do not open ports on closed device 
Fix involves client side mIsDeviceClosed flag.

Bug: 24949216
Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
Signed-off-by: Phil Burk <philburk@google.com>
 2016-04-20 12:30:42 -07:00
Sungsoo Lim
33de4426e9 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev 
am: bfa6d23

* commit 'bfa6d239b578fabd34781c11711a5413322efa6c':
  MediaBrowserService: Provide a way to retrieve root hints

Change-Id: I632db5f48f65b189b0e21f858a7b091bb06ea102
 2016-04-18 17:31:27 +00:00
Sungsoo Lim
bfa6d239b5 Merge "MediaBrowserService: Provide a way to retrieve root hints" into nyc-dev 2016-04-18 17:21:59 +00:00
Jaesung Chung
468a0796cb Merge "ExifInterface: keep the original metadata data instead of strings" into nyc-dev 
am: 865cef4

* commit '865cef475dd4b0ffcb4df0dd62cb86d4ce65ab08':
  ExifInterface: keep the original metadata data instead of strings

Change-Id: Ie02b5ac90a8dde0389ace4bcae081f8bd4e064a0
 2016-04-16 02:46:14 +00:00
Jaesung Chung
865cef475d Merge "ExifInterface: keep the original metadata data instead of strings" into nyc-dev 2016-04-16 02:41:23 +00:00
Andreas Gampe
3bd314fe77 Merge "Frameworks/base: Fix old code in MediaPlayer" am: 17b069c 
am: f664e82

* commit 'f664e8227097b81fd641549ccd3de9c5d9a8b0e3':
  Frameworks/base: Fix old code in MediaPlayer

Change-Id: I7239d5fd2e7593047b8806bf0fdbd30fe2dd1487
 2016-04-16 00:49:07 +00:00
Andreas Gampe
17b069c0f4 Merge "Frameworks/base: Fix old code in MediaPlayer" 2016-04-16 00:40:01 +00:00
Jaesung Chung
0e7d22535d ExifInterface: keep the original metadata data instead of strings 
This CL makes ExifInterface store the tag values as the original forms
and the format validiation is added that compares the given value and
the data format specificed in EXIF specification in order to keep the
valid tag values only.

Bug: 27583378, Bug: 27614052, Bug: 28075709
Change-Id: If60bbddefe74c4b87b4ce64b5fc79e467e36a5b9
 2016-04-15 23:27:21 +00:00
Sungsoo Lim
51ccdb0f39 MediaBrowserService: Provide a way to retrieve root hints 
Bug: 28075963
Change-Id: Id8993e67732a2dda5bf75ecab6037dbbba8c8c99
 2016-04-15 14:37:36 -07:00
Jean-Michel Trivi
e0492bb53b Merge "Player superclass for handling AppOps features" into nyc-dev 
am: 4a18235

* commit '4a182358c49c1f153177e9ca8f61ff12e4395806':
  Player superclass for handling AppOps features

Change-Id: I56e418afaa0a081a1df52c32608582e86d64c823
 2016-04-15 21:11:40 +00:00
Eric Laurent
4a182358c4 Merge "Player superclass for handling AppOps features" into nyc-dev 2016-04-15 21:05:25 +00:00
Dongwon Kang
d39f94583a Merge "TIF: Specify the default implementation of onTune(Uri, Bundle)" into nyc-dev 
am: 6f8476d

* commit '6f8476dc155805f121f8236e0c81e9aa7d3cd40d':
  TIF: Specify the default implementation of onTune(Uri, Bundle)

Change-Id: I522861bcc9e21105d22af63e4444779a8c3a91b6
 2016-04-15 17:47:05 +00:00
TreeHugger Robot
6f8476dc15 Merge "TIF: Specify the default implementation of onTune(Uri, Bundle)" into nyc-dev 2016-04-15 17:39:14 +00:00
Sungsoo Lim
32a21cd4a4 Merge "Use a binder instead of a bundle in removeSubscriptionWithOptions" into nyc-dev 
am: 067f821

* commit '067f821ec84d3bcb556a8de77f3e3d3b8c042186':
  Use a binder instead of a bundle in removeSubscriptionWithOptions

Change-Id: Ie6cd52b5169c9b29d437fc04fc1cd71881eede22
 2016-04-15 16:49:22 +00:00
Sungsoo Lim
067f821ec8 Merge "Use a binder instead of a bundle in removeSubscriptionWithOptions" into nyc-dev 2016-04-15 16:42:48 +00:00
Dongwon Kang
031d7e838d TIF: Specify the default implementation of onTune(Uri, Bundle) 
Bug: 28146354
Change-Id: I3148ab4704a03c258d330c3b9a10513f950a8cfc
 2016-04-14 15:26:55 -07:00
Dongwon Kang
d52376853d Merge "TIF: Add Programs.COLUMN_RECORDING_PROHIBITED" into nyc-dev 
am: 7f5b3e5

* commit '7f5b3e59d1e35deceb1fcde9266ea826d254cd73':
  TIF: Add Programs.COLUMN_RECORDING_PROHIBITED

Change-Id: Ib5af524e0dfb6b30dc2b4270bd6e36cdadca5f32
 2016-04-14 20:24:59 +00:00
Dongwon Kang
7f5b3e59d1 Merge "TIF: Add Programs.COLUMN_RECORDING_PROHIBITED" into nyc-dev 2016-04-14 20:13:58 +00:00
Jean-Michel Trivi
3c86a343df Player superclass for handling AppOps features 
Add a new class to group media/audio player features under one
 interface. Currently only used for audio-related AppsOps
 restrictions. In the future can group routing, audio focus
 handling by the framework...
MediaPlayer inherits from PlayerBase, and overrides the methods
 that are needed to delegate the handling of the restrictions
 in a separate class.
When AppOps restrictions change (as triggered through the
 callback in PlayerBase), reset the volume to its value intended
 by the application (when unmuting) or the framework (0 when
 enforcing the restriction).

Bug 28069414

Change-Id: I2f38e4b9b3c029778836868cf78f4d15d7603247
 2016-04-14 12:49:20 -07:00
Jae Seo
ea46398b1a Merge "TIF: Update documentation on time shifting start/current position" into nyc-dev 
am: abaa339

* commit 'abaa3395e94754563fb4b07d077e5e87d41f6a17':
  TIF: Update documentation on time shifting start/current position

Change-Id: I1bffba2462cdd443860249830b4b8cf9b32df6b8
 2016-04-14 19:36:03 +00:00
Jae Seo
abaa3395e9 Merge "TIF: Update documentation on time shifting start/current position" into nyc-dev 2016-04-14 19:28:50 +00:00
Dongwon Kang
7c12cd3ae4 TIF: Add Programs.COLUMN_RECORDING_PROHIBITED 
Bug: 28039913
Change-Id: I30897f164113ceb422c8c5a16448b8b296a5a68a
 2016-04-14 11:05:07 -07:00
Jae Seo
4e3ded5561 TIF: Update documentation on time shifting start/current position 
Now that we use the same set of API for both time shifting and
recording, the descriptions should be updated to support both use cases.

Bug: 28067038
Change-Id: I036446eca373ca27005f74b008a259f27b7c5f61
 2016-04-13 17:32:52 -07:00
Jae Seo
d3e93119a0 Merge "TIF: More annotations" into nyc-dev 
am: a38b4ef

* commit 'a38b4ef93917101d1100252d88fa6779e2cdd1f1':
  TIF: More annotations

Change-Id: Ib5b844d7fe4ca9e5937af7195627c8cd632ac59f
 2016-04-14 00:08:10 +00:00
Jae Seo
cdfbc488c6 TIF: More annotations 
Bug: 20980990
Change-Id: I5bbdc19703aa15bffe2f2f900be63cbfe9f639ae
 2016-04-13 15:36:03 -07:00
Dongwon Kang
4655cdd5c3 Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev 
am: 4c3dcc0

* commit '4c3dcc0a16680b16b38ce09f1709724b42861abb':
  TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()

Change-Id: I3b259c63f6035630a6673e9d6059402c2a635eb1
 2016-04-13 00:42:43 +00:00
Andy Hung
ffc23a68f2 Merge "Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp" into nyc-dev 
am: 03abaa5

* commit '03abaa5df97d914c968c2837712fa5e6f04cf189':
  Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp

Change-Id: I3beec445a31e3fa9cdebabd4b34154858b2fe36e
 2016-04-13 00:36:41 +00:00
Dongwon Kang
4c3dcc0a16 Merge "TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra()" into nyc-dev 2016-04-13 00:36:35 +00:00
Andy Hung
03abaa5df9 Merge "Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp" into nyc-dev 2016-04-13 00:26:45 +00:00
Dongwon Kang
e9db0e1ed1 TIF: Unhide TvInputInfo.getExtra() and TvInputInfo.Builder.setExtra() 
Bug: 28078300
Change-Id: I0546c80b50475b1f05d5c5229f6d3796c7372b60
 2016-04-12 16:44:40 -07:00
Andy Hung
4c01520470 Rename AudioRecord.getTimestamp parameter from timestamp to outTimestamp 
Bug: 27952053
Change-Id: I2940de5ef1a67ec9a2ad8e294149243679f7324a
 2016-04-12 15:01:31 -07:00
Sungsoo Lim
84c462d322 Use a binder instead of a bundle in removeSubscriptionWithOptions 
Bug: 27845319
Change-Id: I0264b39940481f6571187a42ec859ecf4967ae62
 2016-04-12 16:28:33 +09:00
Marco Nelissen
e1112980d3 Merge "Add javadoc" into nyc-dev 
am: 5b6fd0f

* commit '5b6fd0fc1a3bf4ff964159080a6a21a534a52212':
  Add javadoc

Change-Id: I455d7402062c061debf16aeaa6c112053d67660f
 2016-04-12 02:41:59 +00:00
Marco Nelissen
5b6fd0fc1a Merge "Add javadoc" into nyc-dev 2016-04-12 02:33:43 +00:00
Marco Nelissen
59dcf6746b Add javadoc 
Bug: 27952005
Change-Id: Ia1b6b6a723c30979c7c7ad7c0b2c0e7e295f0831
 2016-04-11 14:49:19 -07:00
Jeff Sharkey
98646e8e5d Merge "Clean up AudioRouting API internals." into nyc-dev 
am: 0e2e780

* commit '0e2e7806b7092519a1f97364d5c7256251ad03d5':
  Clean up AudioRouting API internals.

Change-Id: I2c1758d8843fc603623cf1ac4c698823ec589111
 2016-04-11 20:46:14 +00:00
Hangyu Kuang
a20e438c8f Merge "media: update VP9 CodecProfileLevel" into nyc-dev 
am: 333c7d3

* commit '333c7d36008c43a45be9bde672b45218cb6dc707':
  media: update VP9 CodecProfileLevel

Change-Id: Icd4caa3922838bd1a5891af28a90413eeed87f52
 2016-04-11 20:35:14 +00:00
Jeff Sharkey
0e2e7806b7 Merge "Clean up AudioRouting API internals." into nyc-dev 2016-04-11 20:33:50 +00:00
Hangyu Kuang
333c7d3600 Merge "media: update VP9 CodecProfileLevel" into nyc-dev 2016-04-11 20:22:18 +00:00
shubang
009f5cd591 Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev 
am: e346335

* commit 'e346335d3c00b1e42bf90a07133d1893e0d269d0':
  TIF: Add equals() and hashCode() for comparisons

Change-Id: I633bd032d4aa69370aa99106b87da6099472316b
 2016-04-11 19:44:28 +00:00
Shubang Lu
e346335d3c Merge "TIF: Add equals() and hashCode() for comparisons" into nyc-dev 2016-04-11 19:37:25 +00:00
Hangyu Kuang
f0ef572fd0 media: update VP9 CodecProfileLevel 
Bug:27969307
Change-Id: I44f230bb691bd193c2119b399eca17da87bfbc97
 2016-04-11 12:08:03 -07:00
Jeff Sharkey
ed2edc7a8e Clean up AudioRouting API internals. 
Reuse existing OnRoutingChangedListener APIs and internal logic by
extending the new AudioRouting.OnRoutingChangedListener.  We use
new default methods to delegate incoming calls on the legacy
interfaces.

Fix a handful of locking bugs.

Bug: 27950070, 27952052, 27949198
Change-Id: Ie584108bcbeeab064d8e27d4984e541f31d36728
 2016-04-11 13:01:55 -06:00
shubang
c2215d0856 TIF: Add equals() and hashCode() for comparisons 
Bug: 21307285
Change-Id: I6afcde913b3238044fd66d5f74afe3f97a85b25e
 2016-04-11 10:53:36 -07:00
Jaesung Chung
f8c992629b Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev 
am: 6d01f0a

* commit '6d01f0af4301341975e66475758e4e5c49f95d40':
  ExifInterface: inform the developers to close their FD/streams

Change-Id: Ia3eeaef1b5f01ee1a0a2936b24c77c890f22dfb9
 2016-04-09 06:12:06 +00:00
Jaesung Chung
6d01f0af43 Merge "ExifInterface: inform the developers to close their FD/streams" into nyc-dev 2016-04-09 06:04:37 +00:00